From 0dd7f7c297b67301c455f53febfba1d90cd7fdb5 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Fri, 26 Dec 2025 15:08:13 +0100 Subject: [PATCH 1/4] Issue #17487: Add `UseVarForPrimitive` --- rewrite.yml => config/rewrite.yml | 16 +- pom.xml | 105 +++++++----- .../base/AbstractIndentationTestSupport.java | 20 +-- .../base/AbstractItModuleTestSupport.java | 14 +- .../AbstractXpathTestSupport.java | 4 +- .../XpathRegressionAnonInnerLengthTest.java | 3 +- .../checkstyle/AstTreeStringPrinter.java | 2 +- .../AuditEventDefaultFormatter.java | 4 +- .../puppycrawl/tools/checkstyle/Checker.java | 8 +- ...SuppressionFileGeneratorAuditListener.java | 4 +- .../tools/checkstyle/ConfigurationLoader.java | 10 +- .../tools/checkstyle/DetailAstImpl.java | 10 +- .../DetailNodeTreeStringPrinter.java | 2 +- .../tools/checkstyle/JavaAstVisitor.java | 18 +- .../checkstyle/JavadocCommentsAstVisitor.java | 8 +- .../checkstyle/JavadocDetailNodeParser.java | 8 +- .../JavadocPropertiesGenerator.java | 6 +- .../com/puppycrawl/tools/checkstyle/Main.java | 16 +- .../tools/checkstyle/PropertyCacheFile.java | 4 +- .../tools/checkstyle/SarifLogger.java | 10 +- .../checkstyle/SuppressionsStringPrinter.java | 4 +- .../tools/checkstyle/TreeWalker.java | 6 +- .../tools/checkstyle/XMLLogger.java | 10 +- .../tools/checkstyle/XmlLoader.java | 2 +- .../tools/checkstyle/api/AbstractCheck.java | 4 +- .../checkstyle/api/AbstractFileSetCheck.java | 4 +- .../api/AbstractViolationReporter.java | 2 +- .../api/BeforeExecutionFileFilterSet.java | 2 +- .../tools/checkstyle/api/Comment.java | 10 +- .../tools/checkstyle/api/FileContents.java | 12 +- .../tools/checkstyle/api/FileText.java | 10 +- .../tools/checkstyle/api/FilterSet.java | 2 +- .../tools/checkstyle/api/FullIdent.java | 14 +- .../checks/ArrayTypeStyleCheck.java | 8 +- .../AvoidEscapedUnicodeCharactersCheck.java | 10 +- .../checks/DescendantTokenCheck.java | 12 +- .../checks/FinalParametersCheck.java | 2 +- .../checks/NewlineAtEndOfFileCheck.java | 4 +- .../checks/OrderedPropertiesCheck.java | 10 +- .../checks/SuppressWarningsHolder.java | 28 ++-- .../checkstyle/checks/TranslationCheck.java | 4 +- .../checks/UncommentedMainCheck.java | 4 +- .../checks/UniquePropertiesCheck.java | 6 +- .../annotation/AnnotationUseStyleCheck.java | 4 +- .../annotation/MissingDeprecatedCheck.java | 8 +- .../annotation/MissingOverrideCheck.java | 4 +- .../annotation/PackageAnnotationCheck.java | 2 +- .../checks/blocks/EmptyBlockCheck.java | 16 +- .../checks/blocks/EmptyCatchBlockCheck.java | 6 +- .../checks/blocks/NeedBracesCheck.java | 12 +- .../checks/blocks/RightCurlyCheck.java | 10 +- .../checks/coding/AbstractSuperCheck.java | 6 +- .../AvoidDoubleBraceInitializationCheck.java | 2 +- .../checks/coding/DefaultComesLastCheck.java | 2 +- .../checks/coding/EqualsAvoidNullCheck.java | 12 +- .../coding/ExplicitInitializationCheck.java | 6 +- .../checks/coding/FallThroughCheck.java | 10 +- .../coding/FinalLocalVariableCheck.java | 16 +- .../coding/IllegalInstantiationCheck.java | 4 +- .../coding/MissingNullCaseInSwitchCheck.java | 10 +- .../coding/MultipleStringLiteralsCheck.java | 6 +- .../MultipleVariableDeclarationsCheck.java | 2 +- .../checks/coding/NoFinalizerCheck.java | 2 +- .../coding/OneStatementPerLineCheck.java | 4 +- .../OverloadMethodsDeclarationOrderCheck.java | 10 +- .../coding/PackageDeclarationCheck.java | 2 +- .../coding/ParameterAssignmentCheck.java | 4 +- .../checks/coding/RequireThisCheck.java | 38 ++--- .../checks/coding/ReturnCountCheck.java | 2 +- .../TextBlockGoogleStyleFormattingCheck.java | 4 +- ...necessaryNullCheckWithInstanceOfCheck.java | 2 +- ...edLambdaParameterShouldBeUnnamedCheck.java | 2 +- .../coding/UnusedLocalVariableCheck.java | 30 ++-- ...VariableDeclarationUsageDistanceCheck.java | 24 +-- .../checks/coding/WhenShouldBeUsedCheck.java | 8 +- .../checks/design/FinalClassCheck.java | 14 +- .../checks/design/InterfaceIsTypeCheck.java | 2 +- .../checks/design/MutableExceptionCheck.java | 2 +- .../checks/design/OneTopLevelClassCheck.java | 2 +- .../SealedShouldHavePermitsListCheck.java | 4 +- .../checks/design/ThrowsCountCheck.java | 4 +- .../design/VisibilityModifierCheck.java | 10 +- .../checkstyle/checks/header/HeaderCheck.java | 2 +- .../header/MultiFileRegexpHeaderCheck.java | 6 +- .../checks/header/RegexpHeaderCheck.java | 10 +- .../imports/AvoidStaticImportCheck.java | 4 +- .../checks/imports/IllegalImportCheck.java | 4 +- .../checks/imports/ImportControlLoader.java | 14 +- .../checks/imports/ImportOrderCheck.java | 28 ++-- .../checks/imports/PkgImportControl.java | 2 +- .../checks/imports/RedundantImportCheck.java | 2 +- .../checks/imports/UnusedImportsCheck.java | 34 ++-- .../AbstractExpressionHandler.java | 26 +-- .../AnnotationArrayInitHandler.java | 12 +- .../checks/indentation/ArrayInitHandler.java | 14 +- .../indentation/BlockParentHandler.java | 4 +- .../checks/indentation/ClassDefHandler.java | 4 +- .../indentation/CommentsIndentationCheck.java | 26 +-- .../checks/indentation/HandlerFactory.java | 2 +- .../checks/indentation/ImportHandler.java | 2 +- .../checks/indentation/IndentLevel.java | 4 +- .../checks/indentation/LambdaHandler.java | 12 +- .../indentation/LineWrappingHandler.java | 22 +-- .../checks/indentation/MemberDefHandler.java | 2 +- .../checks/indentation/MethodCallHandler.java | 4 +- .../checks/indentation/MethodDefHandler.java | 2 +- .../checks/indentation/NewHandler.java | 10 +- .../checks/indentation/PackageDefHandler.java | 2 +- .../checks/indentation/SlistHandler.java | 2 +- .../checks/indentation/SwitchHandler.java | 6 +- .../checks/indentation/TryHandler.java | 4 +- .../checks/indentation/YieldHandler.java | 2 +- .../checks/javadoc/AbstractJavadocCheck.java | 4 +- .../checks/javadoc/AtclauseOrderCheck.java | 8 +- .../checkstyle/checks/javadoc/HtmlTag.java | 4 +- .../javadoc/JavadocBlockTagLocationCheck.java | 2 +- .../javadoc/JavadocContentLocationCheck.java | 10 +- .../JavadocLeadingAsteriskAlignCheck.java | 2 +- .../checks/javadoc/JavadocMethodCheck.java | 34 ++-- .../JavadocMissingLeadingAsteriskCheck.java | 2 +- ...ocMissingWhitespaceAfterAsteriskCheck.java | 6 +- .../checks/javadoc/JavadocPackageCheck.java | 2 +- .../checks/javadoc/JavadocParagraphCheck.java | 6 +- .../checks/javadoc/JavadocStyleCheck.java | 16 +- ...avadocTagContinuationIndentationCheck.java | 6 +- .../checks/javadoc/JavadocTagInfo.java | 38 ++--- .../checks/javadoc/JavadocTypeCheck.java | 10 +- .../checks/javadoc/JavadocVariableCheck.java | 2 +- .../javadoc/MissingJavadocPackageCheck.java | 4 +- .../javadoc/MissingJavadocTypeCheck.java | 2 +- ...uireEmptyLineBeforeBlockTagGroupCheck.java | 4 +- .../javadoc/SingleLineJavadocCheck.java | 2 +- .../checks/javadoc/SummaryJavadocCheck.java | 14 +- .../checkstyle/checks/javadoc/TagParser.java | 16 +- .../checks/javadoc/WriteTagCheck.java | 6 +- .../checks/javadoc/utils/BlockTagUtil.java | 10 +- .../checks/javadoc/utils/InlineTagUtil.java | 2 +- .../metrics/AbstractClassCouplingCheck.java | 8 +- .../BooleanExpressionComplexityCheck.java | 2 +- .../checks/metrics/JavaNCSSCheck.java | 22 +-- .../checks/metrics/NPathComplexityCheck.java | 26 +-- .../checks/modifier/ModifierOrderCheck.java | 8 +- .../naming/AbbreviationAsWordInNameCheck.java | 20 +-- .../AbstractAccessControlNameCheck.java | 8 +- .../checks/naming/ConstantNameCheck.java | 4 +- .../naming/LambdaParameterNameCheck.java | 2 +- .../naming/LocalFinalVariableNameCheck.java | 2 +- .../checks/naming/LocalVariableNameCheck.java | 4 +- .../checks/naming/MemberNameCheck.java | 2 +- .../checks/naming/ParameterNameCheck.java | 4 +- .../naming/StaticVariableNameCheck.java | 4 +- .../checks/regexp/DetectorOptions.java | 2 +- .../checks/regexp/MultilineDetector.java | 2 +- .../checkstyle/checks/regexp/RegexpCheck.java | 16 +- .../checks/regexp/RegexpOnFilenameCheck.java | 2 +- .../checks/regexp/SinglelineDetector.java | 10 +- .../checks/sizes/AnonInnerLengthCheck.java | 2 +- .../sizes/ExecutableStatementCountCheck.java | 2 +- .../checks/sizes/LambdaBodyLengthCheck.java | 2 +- .../checks/sizes/MethodLengthCheck.java | 8 +- .../checks/sizes/ParameterNumberCheck.java | 2 +- .../sizes/RecordComponentNumberCheck.java | 2 +- .../whitespace/AbstractParenPadCheck.java | 8 +- .../whitespace/EmptyLineSeparatorCheck.java | 40 ++--- .../whitespace/FileTabCharacterCheck.java | 6 +- .../whitespace/GenericWhitespaceCheck.java | 16 +- .../whitespace/MethodParamPadCheck.java | 2 +- .../whitespace/NoWhitespaceAfterCheck.java | 12 +- ...WhitespaceBeforeCaseDefaultColonCheck.java | 2 +- .../whitespace/NoWhitespaceBeforeCheck.java | 8 +- .../checks/whitespace/OperatorWrapCheck.java | 2 +- .../checks/whitespace/ParenPadCheck.java | 6 +- .../checks/whitespace/SeparatorWrapCheck.java | 8 +- .../whitespace/WhitespaceAfterCheck.java | 6 +- .../checkstyle/filters/CsvFilterElement.java | 10 +- .../filters/SeverityMatchFilter.java | 2 +- .../SuppressWithNearbyCommentFilter.java | 16 +- .../filters/SuppressWithNearbyTextFilter.java | 12 +- .../SuppressWithPlainTextCommentFilter.java | 8 +- .../filters/SuppressionCommentFilter.java | 12 +- .../filters/SuppressionXpathFilter.java | 2 +- .../grammar/CrAwareLexerSimulator.java | 4 +- .../tools/checkstyle/gui/BaseCellEditor.java | 4 +- .../gui/ListToTreeSelectionModelWrapper.java | 6 +- .../tools/checkstyle/gui/MainFrame.java | 4 +- .../checkstyle/gui/ParseTreeTableModel.java | 2 +- .../gui/ParseTreeTablePresentation.java | 10 +- .../tools/checkstyle/gui/TreeTable.java | 18 +- .../tools/checkstyle/meta/XmlMetaReader.java | 10 +- .../tools/checkstyle/meta/XmlMetaWriter.java | 2 +- .../checkstyle/site/AllCheckSummaries.java | 24 +-- ...assAndPropertiesSettersJavadocScraper.java | 4 +- .../tools/checkstyle/site/ExampleMacro.java | 2 +- .../site/ModuleJavadocParsingUtil.java | 8 +- .../checkstyle/site/PropertiesMacro.java | 2 +- .../tools/checkstyle/site/SiteUtil.java | 12 +- .../checkstyle/utils/AnnotationUtil.java | 2 +- .../utils/BlockCommentPosition.java | 4 +- .../checkstyle/utils/ChainedPropertyUtil.java | 4 +- .../tools/checkstyle/utils/CheckUtil.java | 24 +-- .../tools/checkstyle/utils/CodePointUtil.java | 4 +- .../tools/checkstyle/utils/CommonUtil.java | 40 ++--- .../tools/checkstyle/utils/JavadocUtil.java | 14 +- .../utils/ModuleReflectionUtil.java | 2 +- .../tools/checkstyle/utils/ParserUtil.java | 10 +- .../tools/checkstyle/utils/ScopeUtil.java | 10 +- .../tools/checkstyle/utils/TokenUtil.java | 6 +- .../tools/checkstyle/utils/XpathUtil.java | 4 +- .../checkstyle/xpath/AbstractElementNode.java | 6 +- .../checkstyle/xpath/XpathQueryGenerator.java | 4 +- .../checkstyle/AbstractGuiTestSupport.java | 2 +- .../checkstyle/AbstractModuleTestSupport.java | 6 +- .../checkstyle/AbstractXmlTestSupport.java | 4 +- .../tools/checkstyle/CheckerTest.java | 34 ++-- .../checkstyle/ConfigurationLoaderTest.java | 10 +- .../tools/checkstyle/DefaultLoggerTest.java | 4 +- .../tools/checkstyle/DetailAstImplTest.java | 24 +-- ...TrailingCommentsVerticalAlignmentTest.java | 10 +- .../tools/checkstyle/JavaAstVisitorTest.java | 4 +- .../JavadocPropertiesGeneratorTest.java | 10 +- .../puppycrawl/tools/checkstyle/MainTest.java | 8 +- .../checkstyle/PropertyCacheFileTest.java | 6 +- .../tools/checkstyle/SarifLoggerTest.java | 4 +- .../SuppressionsStringPrinterTest.java | 10 +- .../tools/checkstyle/TreeWalkerTest.java | 8 +- .../tools/checkstyle/XMLLoggerTest.java | 4 +- .../checkstyle/ant/CheckstyleAntTaskTest.java | 20 +-- .../checkstyle/api/AbstractCheckTest.java | 2 +- .../tools/checkstyle/api/LineColumnTest.java | 10 +- .../tools/checkstyle/api/ViolationTest.java | 4 +- .../checkstyle/bdd/InlineConfigParser.java | 60 +++---- ...voidEscapedUnicodeCharactersCheckTest.java | 8 +- .../checks/coding/HiddenFieldCheckTest.java | 2 +- .../coding/IllegalTokenTextCheckTest.java | 2 +- ...ableDeclarationUsageDistanceCheckTest.java | 4 +- .../checks/design/FinalClassCheckTest.java | 2 +- .../design/VisibilityModifierCheckTest.java | 2 +- .../imports/ImportControlLoaderTest.java | 2 +- .../indentation/IndentationCheckTest.java | 28 ++-- .../checks/javadoc/JavadocNodeImplTest.java | 2 +- .../checks/javadoc/WriteTagCheckTest.java | 8 +- .../BooleanExpressionComplexityCheckTest.java | 4 +- ...ClassDataAbstractionCouplingCheckTest.java | 2 +- .../CyclomaticComplexityCheckTest.java | 2 +- .../metrics/NPathComplexityCheckTest.java | 6 +- .../AbbreviationAsWordInNameCheckTest.java | 48 +++--- .../regexp/RegexpMultilineCheckTest.java | 2 +- .../ExecutableStatementCountCheckTest.java | 4 +- .../checks/sizes/MethodCountCheckTest.java | 2 +- .../checks/sizes/MethodLengthCheckTest.java | 8 +- .../sizes/OuterTypeNumberCheckTest.java | 2 +- .../sizes/RecordComponentNumberCheckTest.java | 12 +- .../SuppressWithNearbyTextFilterTest.java | 22 +-- ...uppressWithPlainTextCommentFilterTest.java | 2 +- .../filters/SuppressionCommentFilterTest.java | 12 +- .../filters/SuppressionFilterTest.java | 26 +-- .../filters/SuppressionXpathFilterTest.java | 8 +- .../filters/SuppressionsLoaderTest.java | 6 +- .../grammar/GeneratedJavaTokenTypesTest.java | 8 +- ...eneratedJavadocCommentsTokenTypesTest.java | 4 +- .../gui/CodeSelectorPresentationTest.java | 6 +- .../checkstyle/gui/MainFrameModelTest.java | 2 +- .../tools/checkstyle/gui/MainTest.java | 4 +- .../gui/ParseTreeTableModelTest.java | 44 ++--- .../gui/ParseTreeTablePresentationTest.java | 44 ++--- .../checkstyle/internal/AllChecksTest.java | 2 +- .../checkstyle/internal/AllTestsTest.java | 18 +- .../internal/CommitValidationTest.java | 4 +- .../checkstyle/internal/ImmutabilityTest.java | 4 +- .../internal/XdocsCategoryIndexTest.java | 14 +- .../XdocsExamplesAstConsistencyTest.java | 22 +-- .../internal/XdocsJavaDocsTest.java | 30 ++-- .../internal/XdocsMobileWrapperTest.java | 2 +- .../checkstyle/internal/XdocsPagesTest.java | 100 ++++++------ .../VerifyPositionAfterLastTabFileSet.java | 4 +- .../internal/utils/AuditEventUtFormatter.java | 2 +- .../checkstyle/internal/utils/CheckUtil.java | 10 +- .../checkstyle/internal/utils/TestUtil.java | 4 +- .../checkstyle/internal/utils/XdocUtil.java | 2 +- .../checkstyle/utils/AnnotationUtilTest.java | 6 +- .../utils/BlockCommentPositionTest.java | 6 +- .../tools/checkstyle/utils/CheckUtilTest.java | 4 +- .../checkstyle/utils/CommonUtilTest.java | 4 +- .../checkstyle/utils/JavadocUtilTest.java | 6 +- .../tools/checkstyle/utils/ScopeUtilTest.java | 2 +- .../tools/checkstyle/utils/TokenUtilTest.java | 32 ++-- .../checkstyle/xpath/ElementNodeTest.java | 6 +- .../checkstyle/xpath/XpathMapperTest.java | 4 +- .../xpath/XpathQueryGeneratorTest.java | 154 +++++++++--------- .../iterators/ReverseListIteratorTest.java | 2 +- 290 files changed, 1436 insertions(+), 1412 deletions(-) rename rewrite.yml => config/rewrite.yml (77%) diff --git a/rewrite.yml b/config/rewrite.yml similarity index 77% rename from rewrite.yml rename to config/rewrite.yml index 8139c1e90626..9fdaebd847f4 100644 --- a/rewrite.yml +++ b/config/rewrite.yml @@ -4,11 +4,19 @@ name: org.checkstyle.AllAutoFixes displayName: Auto Fixes description: List of auto fixes from different providers. recipeList: - - org.checkstyle.autofix.CheckstyleAutoFix: - violationReportPath: "target/cs_errors.xml" - configurationPath: "config/checkstyle-checks.xml" - propertiesPath: "config/openrewrite-recipes-checkstyle.properties" +# - org.checkstyle.autofix.CheckstyleAutoFix: +# violationReportPath: "target/cs_errors.xml" +# configurationPath: "config/checkstyle-checks.xml" +# propertiesPath: "config/openrewrite-recipes-checkstyle.properties" - org.openrewrite.java.RemoveUnusedImports + # - org.openrewrite.java.migrate.lang.var.UseVarForGenericsConstructors + - org.openrewrite.java.migrate.lang.var.UseVarForPrimitive + # - org.openrewrite.staticanalysis.NoDoubleBraceInitialization fixme: important! + # - org.openrewrite.gradle.UpdateGradleWrapper + # - org.openrewrite.java.migrate.lang.var.UseVarForGenericMethodInvocations # bug + # - org.openrewrite.java.migrate.lang.var.UseVarForObject # bug + # - org.openrewrite.java.testing.junit.JupiterBestPractices + # - org.openrewrite.java.testing.junit5.CleanupAssertions - org.openrewrite.java.format.NormalizeFormat - org.openrewrite.java.format.NormalizeLineBreaks - org.openrewrite.java.format.RemoveTrailingWhitespace diff --git a/pom.xml b/pom.xml index 91ad63779c9f..3d15e4c670a1 100644 --- a/pom.xml +++ b/pom.xml @@ -610,8 +610,10 @@ 3.1.0 + + config/spotless/import.order @@ -624,6 +626,59 @@ + + org.openrewrite.maven + rewrite-maven-plugin + 6.26.0 + + config/rewrite.yml + true + true + + org.checkstyle.AllAutoFixes + + + **.ci-temp** + **CheckstyleAntTask.java + **DesignForExtensionCheck.java + **HexLiteralCaseCheck.java + **NonEmptyAtclauseDescriptionCheckTest.java + **resources-noncompilable** + **src/it/resources** + **src/test/resources** + **xdocs-examples** + + + **/*.groovy + **/*.xml + **/*.yml + **/resources-noncompilable/** + **/resources/** + + + + + com.puppycrawl.tools + checkstyle-openrewrite-recipes + ${checkstyle.openrewrite.version} + + + org.openrewrite.recipe + rewrite-migrate-java + 3.22.0 + + + org.openrewrite.recipe + rewrite-static-analysis + 2.24.0 + + + org.openrewrite.recipe + rewrite-rewrite + 0.17.0 + + + org.apache.maven.plugins maven-pmd-plugin @@ -784,6 +839,10 @@ com.diffplug.spotless spotless-maven-plugin + + org.openrewrite.maven + rewrite-maven-plugin + org.codehaus.plexus plexus-component-metadata @@ -1913,6 +1972,7 @@ openrewrite-recipes-checkstyle.properties org.eclipse.jdt.core.prefs projects-to-test/** + rewrite.yml signatures-test.txt signatures.txt spotless/import.order @@ -5446,54 +5506,9 @@ checkstyle-autofix - org.openrewrite.maven rewrite-maven-plugin - 6.26.0 - - true - true - - org.checkstyle.AllAutoFixes - - - **.ci-temp** - **/resources-noncompilable/** - **src/it/resources** - **src/test/resources** - **xdocs-examples** - - - **/*.xml - **/*.yml - **/*.groovy - **/resources/** - **/resources-noncompilable/** - - - - - com.puppycrawl.tools - checkstyle-openrewrite-recipes - ${checkstyle.openrewrite.version} - - - org.openrewrite.recipe - rewrite-migrate-java - 3.22.0 - - - org.openrewrite.recipe - rewrite-static-analysis - 2.24.0 - - - org.openrewrite.recipe - rewrite-rewrite - 0.17.0 - - 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 bb50eeaec4dd..31b9fb040553 100644 --- a/src/it/java/com/google/checkstyle/test/base/AbstractIndentationTestSupport.java +++ b/src/it/java/com/google/checkstyle/test/base/AbstractIndentationTestSupport.java @@ -74,13 +74,13 @@ private static Integer[] getLinesWithWarnAndCheckComments(String aFileName, throws IOException { final List result = new ArrayList<>(); try (BufferedReader br = Files.newBufferedReader(Path.of(aFileName))) { - int lineNumber = 1; + var lineNumber = 1; for (String line = br.readLine(); line != null; line = br.readLine()) { final Matcher match = LINE_WITH_COMMENT_REGEX.matcher(line); if (match.matches()) { final String comment = match.group(1); - final int indentInComment = getIndentFromComment(comment); - final int actualIndent = getLineStart(line, tabWidth); + final var indentInComment = getIndentFromComment(comment); + final var actualIndent = getLineStart(line, tabWidth); if (actualIndent != indentInComment) { throw new IllegalStateException(String.format(Locale.ROOT, @@ -149,8 +149,8 @@ private static boolean isWarnComment(String comment) { * @throws IllegalStateException if cannot determine that comment is consistent(default case). */ private static boolean isCommentConsistent(String comment) { - final int indentInComment = getIndentFromComment(comment); - final boolean isWarnComment = isWarnComment(comment); + final var indentInComment = getIndentFromComment(comment); + final var isWarnComment = isWarnComment(comment); final CommentType type = getCommentType(comment); return switch (type) { case MULTILEVEL -> @@ -178,7 +178,7 @@ private static boolean isNonStrictCommentConsistent(String comment, int indentInComment, boolean isWarnComment) { final Matcher nonStrictLevelMatch = NON_STRICT_LEVEL_COMMENT_REGEX.matcher(comment); nonStrictLevelMatch.matches(); - final int expectedMinimalIndent = Integer.parseInt(nonStrictLevelMatch.group(1)); + final var expectedMinimalIndent = Integer.parseInt(nonStrictLevelMatch.group(1)); return indentInComment >= expectedMinimalIndent && !isWarnComment || indentInComment < expectedMinimalIndent && isWarnComment; @@ -196,7 +196,7 @@ private static boolean isSingleLevelCommentConsistent(String comment, int indentInComment, boolean isWarnComment) { final Matcher singleLevelMatch = SINGLE_LEVEL_COMMENT_REGEX.matcher(comment); singleLevelMatch.matches(); - final int expectedLevel = Integer.parseInt(singleLevelMatch.group(1)); + final var expectedLevel = Integer.parseInt(singleLevelMatch.group(1)); return expectedLevel == indentInComment && !isWarnComment || expectedLevel != indentInComment && isWarnComment; @@ -216,7 +216,7 @@ private static boolean isMultiLevelCommentConsistent(String comment, multilevelMatch.matches(); final String[] levels = multilevelMatch.group(1).split(","); final String indentInCommentStr = String.valueOf(indentInComment); - final boolean containsActualLevel = + final var containsActualLevel = Arrays.asList(levels).contains(indentInCommentStr); return containsActualLevel && !isWarnComment @@ -260,8 +260,8 @@ private static CommentType getCommentType(String comment) { * @return starting position of given line. */ private static int getLineStart(String line, final int tabWidth) { - int lineStart = 0; - for (int index = 0; index < line.length(); ++index) { + var lineStart = 0; + for (var index = 0; index < line.length(); ++index) { if (!Character.isWhitespace(line.charAt(index))) { lineStart = CommonUtil.lengthExpandedTabs(line, index, tabWidth); break; diff --git a/src/it/java/org/checkstyle/base/AbstractItModuleTestSupport.java b/src/it/java/org/checkstyle/base/AbstractItModuleTestSupport.java index 075650bea5f8..f887960c40e3 100644 --- a/src/it/java/org/checkstyle/base/AbstractItModuleTestSupport.java +++ b/src/it/java/org/checkstyle/base/AbstractItModuleTestSupport.java @@ -216,7 +216,7 @@ private static String getProperty(Configuration config, String name) * @return {@code true} if the ID is in the list. */ private static boolean isIn(String find, String... list) { - boolean found = false; + var found = false; for (String item : list) { if (find.equals(item)) { @@ -415,15 +415,15 @@ protected final void verify(Checker checker, Collections.addAll(theFiles, processedFiles); final List theWarnings = new ArrayList<>(); Collections.addAll(theWarnings, warnsExpected); - final int errs = checker.process(theFiles); + final var errs = checker.process(theFiles); // process each of the lines try (ByteArrayInputStream inputStream = new ByteArrayInputStream(stream.toByteArray()); LineNumberReader lnr = new LineNumberReader( new InputStreamReader(inputStream, StandardCharsets.UTF_8))) { - int previousLineNumber = 0; - for (int index = 0; index < expected.length; index++) { + var previousLineNumber = 0; + for (var index = 0; index < expected.length; index++) { final String expectedResult = messageFileName + ":" + expected[index]; final String actual = lnr.readLine(); assertWithMessage("Error message at position %s of 'expected' does " @@ -434,7 +434,7 @@ protected final void verify(Checker checker, String parseInt = removeDeviceFromPathOnWindows(actual); parseInt = parseInt.substring(parseInt.indexOf(':') + 1); parseInt = parseInt.substring(0, parseInt.indexOf(':')); - final int lineNumber = Integer.parseInt(parseInt); + final var lineNumber = Integer.parseInt(parseInt); assertWithMessage( "input file is expected to have a warning comment on line number %s", lineNumber) @@ -542,7 +542,7 @@ private static void verifyViolations(String file, List testI assertWithMessage("Violation lines for %s differ.", file) .that(actualViolationLines) .isEqualTo(expectedViolationLines); - for (int index = 0; index < actualViolations.size(); index++) { + for (var index = 0; index < actualViolations.size(); index++) { assertWithMessage("Actual and expected violations differ.") .that(actualViolations.get(index)) .matches(testInputViolations.get(index).toRegex()); @@ -615,7 +615,7 @@ private static String removeDeviceFromPathOnWindows(String path) { protected Integer[] getLinesWithWarn(String fileName) throws IOException { final List result = new ArrayList<>(); try (BufferedReader br = Files.newBufferedReader(Path.of(fileName))) { - int lineNumber = 1; + var lineNumber = 1; while (true) { final String line = br.readLine(); if (line == null) { diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/AbstractXpathTestSupport.java b/src/it/java/org/checkstyle/suppressionxpathfilter/AbstractXpathTestSupport.java index 7a3b8df71598..f7bd68142531 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/AbstractXpathTestSupport.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/AbstractXpathTestSupport.java @@ -174,8 +174,8 @@ private static ViolationPosition extractLineAndColumnNumber(String... expectedVi final Matcher matcher = LINE_COLUMN_NUMBER_REGEX.matcher(expectedViolations[0]); if (matcher.find()) { - final int violationLineNumber = Integer.parseInt(matcher.group(1)); - final int violationColumnNumber = Integer.parseInt(matcher.group(2)); + final var violationLineNumber = Integer.parseInt(matcher.group(1)); + final var violationColumnNumber = Integer.parseInt(matcher.group(2)); violation = new ViolationPosition(violationLineNumber, violationColumnNumber); } return violation; diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/sizes/XpathRegressionAnonInnerLengthTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/sizes/XpathRegressionAnonInnerLengthTest.java index 7155916673d2..9af08b61f772 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/sizes/XpathRegressionAnonInnerLengthTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/sizes/XpathRegressionAnonInnerLengthTest.java @@ -1,3 +1,4 @@ + /////////////////////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code and other text files for adherence to a set of rules. // Copyright (C) 2001-2025 the original author or authors. @@ -75,7 +76,7 @@ public void testDefault() throws Exception { @Test public void testMaxLength() throws Exception { - final int maxLen = 5; + final var maxLen = 5; final File fileToProcess = new File(getPath("InputXpathAnonInnerLength.java")); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.java b/src/main/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.java index c4399a98a4f4..2fd08fbc7ca7 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.java @@ -195,7 +195,7 @@ private static String getNodeInfo(DetailAST node) { * @return the indentation in String format. */ private static String getIndentation(DetailAST ast) { - final boolean isLastChild = ast.getNextSibling() == null; + final var isLastChild = ast.getNextSibling() == null; DetailAST node = ast; final StringBuilder indentation = new StringBuilder(1024); while (node.getParent() != null) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.java b/src/main/java/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.java index f731e2405ded..9ae1c8ee14ba 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.java @@ -87,7 +87,7 @@ public String format(AuditEvent event) { */ private static StringBuilder initStringBuilderWithOptimalBuffer(AuditEvent event, String severityLevelName) { - final int bufLen = LENGTH_OF_ALL_SEPARATORS + event.getFileName().length() + final var bufLen = LENGTH_OF_ALL_SEPARATORS + event.getFileName().length() + event.getMessage().length() + severityLevelName.length() + getCheckShortName(event).length(); return new StringBuilder(bufLen); @@ -103,7 +103,7 @@ private static String getCheckShortName(AuditEvent event) { final String checkFullName = event.getSourceName(); String checkShortName = checkFullName.substring(checkFullName.lastIndexOf('.') + 1); if (checkShortName.endsWith(SUFFIX)) { - final int endIndex = checkShortName.length() - SUFFIX.length(); + final var endIndex = checkShortName.length() - SUFFIX.length(); checkShortName = checkShortName.substring(0, endIndex); } return checkShortName; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java b/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java index 7b0a5a6232c8..f4a0c838c38b 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java @@ -233,7 +233,7 @@ public int process(List files) throws CheckstyleException { // It may also log!!! fileSetChecks.forEach(FileSetCheck::destroy); - final int errorCount = counter.getCount(); + final var errorCount = counter.getCount(); fireAuditFinished(); return errorCount; } @@ -288,7 +288,7 @@ private void processFiles(List files) throws CheckstyleException { final String filePath = file.getPath(); try { fileName = file.getAbsolutePath(); - final long timestamp = file.lastModified(); + final var timestamp = file.lastModified(); if (cacheFile != null && cacheFile.isInCache(fileName, timestamp) || !acceptFileStarted(fileName)) { continue; @@ -404,7 +404,7 @@ public void fireFileStarted(String fileName) { @Override public void fireErrors(String fileName, SortedSet errors) { final String stripped = relativizePathWithCatch(fileName); - boolean hasNonFilteredViolations = false; + var hasNonFilteredViolations = false; for (final Violation element : errors) { final AuditEvent event = new AuditEvent(this, stripped, element); if (filters.accept(event)) { @@ -552,7 +552,7 @@ public final void addListener(AuditListener listener) { public final void setFileExtensions(String... extensions) { if (extensions != null) { fileExtensions = new String[extensions.length]; - for (int i = 0; i < extensions.length; i++) { + for (var i = 0; i < extensions.length; i++) { final String extension = extensions[i]; if (extension.startsWith(EXTENSION_SEPARATOR)) { fileExtensions[i] = extension; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ChecksAndFilesSuppressionFileGeneratorAuditListener.java b/src/main/java/com/puppycrawl/tools/checkstyle/ChecksAndFilesSuppressionFileGeneratorAuditListener.java index ea74ac140203..16f5f90b2570 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/ChecksAndFilesSuppressionFileGeneratorAuditListener.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/ChecksAndFilesSuppressionFileGeneratorAuditListener.java @@ -148,7 +148,7 @@ public void addError(AuditEvent event) { * {@code false} otherwise. */ private boolean isFileAndCheckNamePresent(Path fileName, String checkName) { - boolean isPresent = false; + var isPresent = false; final Set checks = filesAndChecksCollector.get(fileName); if (checks != null) { isPresent = checks.contains(checkName); @@ -166,7 +166,7 @@ private boolean isFileAndCheckNamePresent(Path fileName, String checkName) { * {@code false} otherwise. */ private boolean isFileAndModuleIdPresent(Path fileName, String moduleIdName) { - boolean isPresent = false; + var isPresent = false; final Set moduleIds = filesAndModuleIdCollector.get(fileName); if (moduleIds != null) { isPresent = moduleIds.contains(moduleIdName); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java index 5a89bedc8f4b..5e4bd5bab157 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java @@ -295,7 +295,7 @@ public static Configuration loadConfiguration(InputSource configSource, ThreadModeSettings threadModeSettings) throws CheckstyleException { try { - final boolean omitIgnoreModules = ignoredModulesOptions == IgnoredModulesOptions.OMIT; + final var omitIgnoreModules = ignoredModulesOptions == IgnoredModulesOptions.OMIT; final ConfigurationLoader loader = new ConfigurationLoader(overridePropsResolver, omitIgnoreModules, threadModeSettings); @@ -431,9 +431,9 @@ private static void parsePropertyString(String value, Collection fragments, Collection propertyRefs) throws CheckstyleException { - int prev = 0; + var prev = 0; // search for the next instance of $ from the 'prev' position - int pos = value.indexOf(DOLLAR_SIGN, prev); + var pos = value.indexOf(DOLLAR_SIGN, prev); while (pos >= 0) { // if there was any text before this, add it as a fragment if (pos > 0) { @@ -447,7 +447,7 @@ private static void parsePropertyString(String value, } else if (value.charAt(pos + 1) == '{') { // property found, extract its name or bail on a typo - final int endName = value.indexOf('}', pos); + final var endName = value.indexOf('}', pos); if (endName == -1) { throw new CheckstyleException("Syntax error in property: " + value); @@ -568,7 +568,7 @@ public void endElement(String uri, // omit this module if these should be omitted and the module // has the severity 'ignore' - final boolean omitModule = omitIgnoredModules + final var omitModule = omitIgnoredModules && level == SeverityLevel.IGNORE; if (omitModule && !configStack.isEmpty()) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java b/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java index eb962b156791..ea0a12488280 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java @@ -194,7 +194,7 @@ public int getChildCount() { @Override public int getChildCount(int tokenType) { - int count = 0; + var count = 0; for (DetailAST ast = firstChild; ast != null; ast = ast.getNextSibling()) { if (ast.getType() == tokenType) { count++; @@ -252,7 +252,7 @@ public void setType(int type) { @Override public int getLineNo() { - int resultNo = -1; + var resultNo = -1; if (lineNo == NOT_INITIALIZED) { // an inner AST that has been initialized @@ -281,7 +281,7 @@ public void setLineNo(int lineNo) { @Override public int getColumnNo() { - int resultNo = -1; + var resultNo = -1; if (columnNo == NOT_INITIALIZED) { // an inner AST that has been initialized @@ -324,7 +324,7 @@ public DetailAST getLastChild() { * @return Column number if non-comment node exists, -1 otherwise. */ private static int findColumnNo(DetailAST ast) { - int resultNo = -1; + var resultNo = -1; DetailAST node = ast; while (node != null) { // comment node can't be start of any java statement/definition @@ -346,7 +346,7 @@ private static int findColumnNo(DetailAST ast) { * @return Line number if non-comment node exists, -1 otherwise. */ private static int findLineNo(DetailAST ast) { - int resultNo = -1; + var resultNo = -1; DetailAST node = ast; while (node != null) { // comment node can't be start of any java statement/definition diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.java b/src/main/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.java index 69350e542dd0..ca037589fb58 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.java @@ -133,7 +133,7 @@ public static String printTree(DetailNode ast, String rootPrefix, String prefix) * @return the indentation in String format. */ private static String getIndentation(DetailNode node) { - final boolean isLastChild = node.getNextSibling() == null; + final var isLastChild = node.getNextSibling() == null; DetailNode currentNode = node; final StringBuilder indentation = new StringBuilder(1024); while (currentNode.getParent() != null) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java index a8f8fc0c8a27..f2f58020bd48 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java @@ -131,7 +131,7 @@ public JavaAstVisitor(CommonTokenStream tokenStream) { public DetailAstImpl visitCompilationUnit(JavaLanguageParser.CompilationUnitContext ctx) { final DetailAstImpl compilationUnit; // 'EOF' token is always present; therefore if we only have one child, we have an empty file - final boolean isEmptyFile = ctx.children.size() == 1; + final var isEmptyFile = ctx.children.size() == 1; if (isEmptyFile) { compilationUnit = null; } @@ -173,7 +173,7 @@ public DetailAstImpl visitImportDec(JavaLanguageParser.ImportDecContext ctx) { } // Handle star imports - final boolean isStarImport = ctx.STAR() != null; + final var isStarImport = ctx.STAR() != null; if (isStarImport) { final DetailAstImpl dot = create(ctx.DOT()); dot.addChild(visit(ctx.qualifiedName())); @@ -1416,7 +1416,7 @@ public DetailAstImpl visitNewExp(JavaLanguageParser.NewExpContext ctx) { @Override public DetailAstImpl visitPrefix(JavaLanguageParser.PrefixContext ctx) { - final int tokenType = switch (ctx.prefix.getType()) { + final var tokenType = switch (ctx.prefix.getType()) { case JavaLanguageLexer.PLUS -> TokenTypes.UNARY_PLUS; case JavaLanguageLexer.MINUS -> TokenTypes.UNARY_MINUS; default -> ctx.prefix.getType(); @@ -1646,7 +1646,7 @@ public DetailAstImpl visitMethodCall(JavaLanguageParser.MethodCallContext ctx) { public DetailAstImpl visitTypeCastParameters( JavaLanguageParser.TypeCastParametersContext ctx) { final DetailAstImpl typeType = visit(ctx.typeType(0)); - for (int i = 0; i < ctx.BAND().size(); i++) { + for (var i = 0; i < ctx.BAND().size(); i++) { addLastSibling(typeType, create(TokenTypes.TYPE_EXTENSION_AND, (Token) ctx.BAND(i).getPayload())); addLastSibling(typeType, visit(ctx.typeType(i + 1))); @@ -1684,7 +1684,7 @@ public DetailAstImpl visitMultiLambdaParams(JavaLanguageParser.MultiLambdaParams final DetailAstImpl parameters = createImaginary(TokenTypes.PARAMETERS); parameters.addChild(createLambdaParameter(ctx.id(0))); - for (int i = 0; i < ctx.COMMA().size(); i++) { + for (var i = 0; i < ctx.COMMA().size(); i++) { parameters.addChild(create(ctx.COMMA(i))); parameters.addChild(createLambdaParameter(ctx.id(i + 1))); } @@ -1789,7 +1789,7 @@ public DetailAstImpl visitArrayCreatorRest(JavaLanguageParser.ArrayCreatorRestCo final JavaLanguageParser.ExpressionContext expression = ctx.expression(); final TerminalNode rbrack = ctx.RBRACK(); // child[0] is LBRACK - for (int i = 1; i < ctx.children.size(); i++) { + for (var i = 1; i < ctx.children.size(); i++) { if (ctx.children.get(i) == rbrack) { arrayDeclarator.addChild(create(rbrack)); } @@ -1866,7 +1866,7 @@ public DetailAstImpl visitTypeArgumentsTypeList( final DetailAstImpl firstTypeArgument = createImaginary(TokenTypes.TYPE_ARGUMENT); firstTypeArgument.addChild(firstIdent); - for (int i = 0; i < ctx.COMMA().size(); i++) { + for (var i = 0; i < ctx.COMMA().size(); i++) { addLastSibling(firstTypeArgument, create(ctx.COMMA(i))); final DetailAstImpl ident = visit(ctx.typeType(i + 1)); final DetailAstImpl typeArgument = createImaginary(TokenTypes.TYPE_ARGUMENT); @@ -1970,7 +1970,7 @@ public DetailAstImpl visitPattern(JavaLanguageParser.PatternContext ctx) { final JavaLanguageParser.InnerPatternContext innerPattern = ctx.innerPattern(); final ParserRuleContext primaryPattern = innerPattern.primaryPattern(); final ParserRuleContext recordPattern = innerPattern.recordPattern(); - final boolean isSimpleTypePattern = primaryPattern != null + final var isSimpleTypePattern = primaryPattern != null && primaryPattern.getChild(0) instanceof JavaLanguageParser.TypePatternContext; final DetailAstImpl pattern; @@ -2137,7 +2137,7 @@ private DetailAstImpl create(int tokenType, Token startToken) { * @return new DetailAstImpl of given type */ private DetailAstImpl create(Token token) { - final int tokenIndex = token.getTokenIndex(); + final var tokenIndex = token.getTokenIndex(); final List tokensToLeft = tokens.getHiddenTokensToLeft(tokenIndex, JavaLanguageLexer.COMMENTS); final List tokensToRight = diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocCommentsAstVisitor.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocCommentsAstVisitor.java index 26e4ea25be8c..3d2c0098c476 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocCommentsAstVisitor.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocCommentsAstVisitor.java @@ -152,7 +152,7 @@ public JavadocNodeImpl visitBlockTag(JavadocCommentsParser.BlockTagContext ctx) if (tag instanceof ParserRuleContext context) { final Token tagName = (Token) context.getChild(1).getPayload(); - final int tokenType = tagName.getType(); + final var tokenType = tagName.getType(); final JavadocNodeImpl specificTagNode = switch (tokenType) { case JavadocCommentsLexer.AUTHOR -> @@ -282,7 +282,7 @@ public JavadocNodeImpl visitInlineTag(JavadocCommentsParser.InlineTagContext ctx if (tagContent instanceof ParserRuleContext context) { final Token tagName = (Token) context.getChild(0).getPayload(); - final int tokenType = tagName.getType(); + final var tokenType = tagName.getType(); final JavadocNodeImpl specificTagNode = switch (tokenType) { case JavadocCommentsLexer.CODE -> @@ -636,10 +636,10 @@ private static boolean isTextToken(Token token) { * @param parent the parent node to which hidden tokens are added */ private void addHiddenTokensToTheLeft(Token token, JavadocNodeImpl parent) { - final boolean alreadyProcessed = !processedTokenIndices.add(token.getTokenIndex()); + final var alreadyProcessed = !processedTokenIndices.add(token.getTokenIndex()); if (!alreadyProcessed) { - final int tokenIndex = token.getTokenIndex(); + final var tokenIndex = token.getTokenIndex(); final List hiddenTokens = tokens.getHiddenTokensToLeft(tokenIndex); if (hiddenTokens != null) { accumulator.flushTo(parent); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java index 37de183a21fc..03f4b05fa37e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java @@ -75,7 +75,7 @@ public class JavadocDetailNodeParser { * the error message (if parsing failed) */ public ParseStatus parseJavadocComment(DetailAST javadocCommentAst) { - final int blockCommentLineNumber = javadocCommentAst.getLineNo(); + final var blockCommentLineNumber = javadocCommentAst.getLineNo(); final String javadocComment = JavadocUtil.getJavadocCommentContent(javadocCommentAst); final ParseStatus result = new ParseStatus(); @@ -116,7 +116,7 @@ public ParseStatus parseJavadocComment(DetailAST javadocCommentAst) { try { final JavadocCommentsParser.JavadocContext javadoc = parser.javadoc(); - final int javadocColumnNumber = javadocCommentAst.getColumnNo() + final var javadocColumnNumber = javadocCommentAst.getColumnNo() + JAVADOC_START.length(); final JavadocCommentsAstVisitor visitor = new JavadocCommentsAstVisitor( @@ -189,14 +189,14 @@ public void syntaxError( Recognizer recognizer, Object offendingSymbol, int line, int charPositionInLine, String msg, RecognitionException ex) { - final int lineNumber = offset + line; + final var lineNumber = offset + line; final String target; if (recognizer instanceof JavadocCommentsLexer lexer) { target = lexer.getPreviousToken().getText(); } else { - final int ruleIndex = ex.getCtx().getRuleIndex(); + final var ruleIndex = ex.getCtx().getRuleIndex(); final String ruleName = recognizer.getRuleNames()[ruleIndex]; target = convertUpperCamelToUpperUnderscore(ruleName); } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.java index 84c957d127a9..a042dca70612 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.java @@ -161,7 +161,7 @@ private static DetailAST getClassBody(DetailAST top) { * @return {@code true} if matches; {@code false} otherwise */ private static boolean isPublicStaticFinalIntField(DetailAST ast) { - boolean result = ast.getType() == TokenTypes.VARIABLE_DEF; + var result = ast.getType() == TokenTypes.VARIABLE_DEF; if (result) { final DetailAST type = ast.findFirstToken(TokenTypes.TYPE); final DetailAST arrayDeclarator = type.getFirstChild().getNextSibling(); @@ -264,7 +264,7 @@ else if (node.getType() == JavadocCommentsTokenTypes.JAVADOC_INLINE_TAG) { */ private static void formatInlineCodeTag(StringBuilder builder, DetailNode inlineTag) throws CheckstyleException { - final int tagType = inlineTag.getFirstChild().getType(); + final var tagType = inlineTag.getFirstChild().getType(); if (tagType != JavadocCommentsTokenTypes.LITERAL_INLINE_TAG && tagType != JavadocCommentsTokenTypes.CODE_INLINE_TAG) { @@ -272,7 +272,7 @@ private static void formatInlineCodeTag(StringBuilder builder, DetailNode inline + JavadocUtil.getTokenName(tagType)); } - final boolean wrapWithCodeTag = tagType == JavadocCommentsTokenTypes.CODE_INLINE_TAG; + final var wrapWithCodeTag = tagType == JavadocCommentsTokenTypes.CODE_INLINE_TAG; for (DetailNode node = inlineTag.getFirstChild().getFirstChild(); node != null; node = node.getNextSibling()) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java index a51225b9551c..2e83d25e9162 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java @@ -116,8 +116,8 @@ public static void main(String... args) throws IOException { commandLine.setCaseInsensitiveEnumValuesAllowed(true); // provide proper exit code based on results. - int exitStatus = 0; - int errorCounter = 0; + var exitStatus = 0; + var errorCounter = 0; try { final ParseResult parseResult = commandLine.parseArgs(args); if (parseResult.isVersionHelpRequested()) { @@ -197,7 +197,7 @@ private static int execute(ParseResult parseResult, CliOptions options) // return error if something is wrong in arguments final List filesToProcess = getFilesToProcess(options); final List messages = options.validateCli(parseResult, filesToProcess); - final boolean hasMessages = !messages.isEmpty(); + final var hasMessages = !messages.isEmpty(); if (hasMessages) { messages.forEach(System.out::println); exitStatus = EXIT_WITH_INVALID_USER_INPUT_CODE; @@ -266,7 +266,7 @@ else if (node.isFile()) { * @return True if the directory/file matches one of the patterns. */ private static boolean isPathExcluded(String path, Iterable patternsToExclude) { - boolean result = false; + var result = false; for (Pattern pattern : patternsToExclude) { if (pattern.matcher(path).find()) { @@ -292,8 +292,8 @@ private static boolean isPathExcluded(String path, Iterable patternsToE */ private static int runCli(CliOptions options, List filesToProcess) throws IOException, CheckstyleException { - int result = 0; - final boolean hasSuppressionLineColumnNumber = options.suppressionLineColumnNumber != null; + var result = 0; + final var hasSuppressionLineColumnNumber = options.suppressionLineColumnNumber != null; // create config helper object if (options.printAst) { @@ -841,8 +841,8 @@ private List getExclusions() { // -@cs[CyclomaticComplexity] Breaking apart will damage encapsulation private List validateCli(ParseResult parseResult, List filesToProcess) { final List result = new ArrayList<>(); - final boolean hasConfigurationFile = configurationFile != null; - final boolean hasSuppressionLineColumnNumber = suppressionLineColumnNumber != null; + final var hasConfigurationFile = configurationFile != null; + final var hasSuppressionLineColumnNumber = suppressionLineColumnNumber != null; if (filesToProcess.isEmpty()) { result.add("Files to process must be specified, found 0."); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java b/src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java index 779889e92c10..ec9a3cb01254 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java @@ -313,7 +313,7 @@ private static byte[] toByteArray(InputStream stream) throws IOException { final ByteArrayOutputStream content = new ByteArrayOutputStream(); while (true) { - final int size = stream.read(BUFFER); + final var size = stream.read(BUFFER); if (size == -1) { break; } @@ -341,7 +341,7 @@ private boolean areExternalResourcesChanged(Set resources) { * @return true if resource is changed. */ private boolean isResourceChanged(ExternalResource resource) { - boolean changed = false; + var changed = false; if (isResourceLocationInCache(resource.location)) { final String contentHashSum = resource.contentHashSum; final String cachedHashSum = details.getProperty(resource.location); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/SarifLogger.java b/src/main/java/com/puppycrawl/tools/checkstyle/SarifLogger.java index a2197c00da5c..7b8e9078982e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/SarifLogger.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/SarifLogger.java @@ -300,7 +300,7 @@ private static Map getMessages(ModuleDetails moduleDetails) { final String fullQualifiedName = moduleDetails.getFullQualifiedName(); final Map result = new LinkedHashMap<>(); try { - final int lastDot = fullQualifiedName.lastIndexOf('.'); + final var lastDot = fullQualifiedName.lastIndexOf('.'); final String packageName = fullQualifiedName.substring(0, lastDot); final String bundleName = packageName + ".messages"; final Class moduleClass = Class.forName(fullQualifiedName); @@ -466,10 +466,10 @@ private static String renderSeverityLevel(SeverityLevel severityLevel) { * @return the escaped value if necessary. */ public static String escape(String value) { - final int length = value.length(); + final var length = value.length(); final StringBuilder sb = new StringBuilder(length); - for (int i = 0; i < length; i++) { - final char chr = value.charAt(i); + for (var i = 0; i < length; i++) { + final var chr = value.charAt(i); final String replacement = switch (chr) { case '"' -> "\\\""; case '\\' -> TWO_BACKSLASHES; @@ -519,7 +519,7 @@ public static String readResource(String name) throws IOException { throw new IOException("Cannot find the resource " + name); } final byte[] buffer = new byte[BUFFER_SIZE]; - int length = 0; + var length = 0; while (length != -1) { result.write(buffer, 0, length); length = inputStream.read(buffer); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.java b/src/main/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.java index 158d386c3fcf..dac0b1b4d030 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.java @@ -75,8 +75,8 @@ public static String printSuppressions(File file, String suppressionLineColumnNu final FileText fileText = new FileText(file, System.getProperty("file.encoding")); final DetailAST detailAST = JavaParser.parseFileText(fileText, JavaParser.Options.WITH_COMMENTS); - final int lineNumber = Integer.parseInt(matcher.group(1)); - final int columnNumber = Integer.parseInt(matcher.group(2)); + final var lineNumber = Integer.parseInt(matcher.group(1)); + final var columnNumber = Integer.parseInt(matcher.group(2)); return generate(fileText, detailAST, lineNumber, columnNumber, tabWidth); } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java index f8e8df0ac5a5..6ad1be6f32ef 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java @@ -187,7 +187,7 @@ protected void processFiltered(File file, FileText fileText) throws CheckstyleEx final FileContents contents = getFileContents(); DetailAST rootAST = null; // whether skip the procedure after parsing Java files. - boolean skip = false; + var skip = false; try { rootAST = JavaParser.parse(contents); } @@ -267,7 +267,7 @@ private void registerCheck(AbstractCheck check) throws CheckstyleException { final int[] acceptableTokens = check.getAcceptableTokens(); Arrays.sort(acceptableTokens); for (String token : checkTokens) { - final int tokenId = TokenUtil.getTokenId(token); + final var tokenId = TokenUtil.getTokenId(token); if (Arrays.binarySearch(acceptableTokens, tokenId) >= 0) { registerCheck(tokenId, check); } @@ -420,7 +420,7 @@ private void notifyLeave(DetailAST ast, AstState astState) { */ private Collection getListOfChecks(DetailAST ast, AstState astState) { final Collection visitors; - final int tokenId = ast.getType(); + final var tokenId = ast.getType(); if (astState == AstState.WITH_COMMENTS) { visitors = tokenToCommentChecks.get(tokenId); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java b/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java index 6e6d54e28e96..aeaf419f20ac 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java @@ -264,8 +264,8 @@ private void writeException(Throwable throwable) { */ public static String encode(String value) { final StringBuilder sb = new StringBuilder(256); - for (int i = 0; i < value.length(); i++) { - final char chr = value.charAt(i); + for (var i = 0; i < value.length(); i++) { + final var chr = value.charAt(i); switch (chr) { case '<': sb.append("<"); @@ -311,14 +311,14 @@ public static String encode(String value) { * @return whether the given argument a character or entity reference */ public static boolean isReference(String ent) { - boolean reference = false; + var reference = false; if (ent.charAt(0) == '&' && ent.endsWith(";")) { if (ent.charAt(1) == '#') { // prefix is "&#" - int prefixLength = 2; + var prefixLength = 2; - int radix = BASE_10; + var radix = BASE_10; if (ent.charAt(2) == 'x') { prefixLength++; radix = BASE_16; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java index efb2baf17f3a..cee11c912878 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java @@ -161,7 +161,7 @@ private LoadExternalDtdFeatureProvider() { public static void setFeaturesBySystemProperty(SAXParserFactory factory) throws SAXException, ParserConfigurationException { - final boolean enableExternalDtdLoad = Boolean.parseBoolean( + final var enableExternalDtdLoad = Boolean.parseBoolean( System.getProperty(ENABLE_EXTERNAL_DTD_LOAD, "false")); factory.setFeature(LOAD_EXTERNAL_DTD, enableExternalDtdLoad); 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 b3cf56dfc48a..1db4d9b2b016 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractCheck.java @@ -242,7 +242,7 @@ public final void log(int line, String key, Object... args) { @Override public final void log(int lineNo, int colNo, String key, Object... args) { - final int col = 1 + CommonUtil.lengthExpandedTabs( + final var col = 1 + CommonUtil.lengthExpandedTabs( getLines()[lineNo - 1], colNo, tabWidth); context.get().violations.add( new Violation( @@ -272,7 +272,7 @@ public final void log(DetailAST ast, String key, Object... args) { // from 1, that is why result of the method CommonUtil.lengthExpandedTabs // is increased by one. - final int col = 1 + CommonUtil.lengthExpandedTabs( + final var col = 1 + CommonUtil.lengthExpandedTabs( getLines()[ast.getLineNo() - 1], ast.getColumnNo(), tabWidth); context.get().violations.add( new Violation( 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 9ccc5b9142db..02dcb3126a61 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java @@ -175,7 +175,7 @@ public void setFileExtensions(String... extensions) { } fileExtensions = new String[extensions.length]; - for (int i = 0; i < extensions.length; i++) { + for (var i = 0; i < extensions.length; i++) { final String extension = extensions[i]; if (extension.startsWith(EXTENSION_SEPARATOR)) { fileExtensions[i] = extension; @@ -230,7 +230,7 @@ public final void log(int line, String key, Object... args) { public final void log(int lineNo, int colNo, String key, Object... args) { final FileContext fileContext = context.get(); - final int col = 1 + CommonUtil.lengthExpandedTabs( + final var col = 1 + CommonUtil.lengthExpandedTabs( fileContext.fileContents.getLine(lineNo - 1), colNo, tabWidth); fileContext.violations.add( new Violation(lineNo, 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 25e702a4431a..758dac78106e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.java @@ -137,7 +137,7 @@ protected String getMessageBundle() { */ private static String getMessageBundle(final String className) { final String messageBundle; - final int endIndex = className.lastIndexOf('.'); + final var endIndex = className.lastIndexOf('.'); final String messages = "messages"; if (endIndex == -1) { messageBundle = messages; 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 8ab5ed9bad5c..a82adb84c31c 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSet.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSet.java @@ -68,7 +68,7 @@ public String toString() { @Override public boolean accept(String uri) { - boolean result = true; + var result = true; for (BeforeExecutionFileFilter filter : beforeExecutionFileFilters) { if (!filter.accept(uri)) { result = false; 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 9fb906721d67..74872004758a 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/Comment.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/Comment.java @@ -89,11 +89,11 @@ public boolean intersects(int startLine, int startCol, int endLine, int endCol) { // compute a single number for start and end // to simplify conditional logic - final long multiplier = Integer.MAX_VALUE; - final long thisStart = startLineNo * multiplier + startColNo; - final long thisEnd = endLineNo * multiplier + endColNo; - final long inStart = startLine * multiplier + startCol; - final long inEnd = endLine * multiplier + endCol; + final var multiplier = Integer.MAX_VALUE; + final var thisStart = startLineNo * multiplier + startColNo; + final var thisEnd = endLineNo * multiplier + endColNo; + final var inStart = startLine * multiplier + startCol; + final var inEnd = endLine * multiplier + endCol; return thisEnd >= inStart && inEnd >= thisStart; } 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 053127f1cac5..2a60c7662e2b 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java @@ -183,7 +183,7 @@ private String[] extractBlockComment(int startLineNo, int startColNo, else { returnValue = new String[endLineNo - startLineNo + 1]; returnValue[0] = line(startLineNo - 1).substring(startColNo); - for (int i = startLineNo; i < endLineNo; i++) { + for (var i = startLineNo; i < endLineNo; i++) { returnValue[i - startLineNo + 1] = line(i); } returnValue[returnValue.length - 1] = line(endLineNo - 1).substring(0, @@ -214,7 +214,7 @@ private String line(int lineNo) { **/ public TextBlock getJavadocBefore(int lineNoBefore) { // Lines start at 1 to the callers perspective, so need to take off 2 - int lineNo = lineNoBefore - 2; + var lineNo = lineNoBefore - 2; // skip blank lines and comments while (lineNo > 0 && (lineIsBlank(lineNo) || lineIsComment(lineNo) @@ -251,9 +251,9 @@ private boolean lineInsideBlockComment(int lineNo) { * @return {@code true} line is in block comment, {@code false} otherwise */ private boolean isLineBlockComment(int lineNo, TextBlock comment) { - final boolean lineInSideBlockComment = lineNo >= comment.getStartLineNo() + final var lineInSideBlockComment = lineNo >= comment.getStartLineNo() && lineNo <= comment.getEndLineNo(); - boolean lineHasOnlyBlockComment = true; + var lineHasOnlyBlockComment = true; final String startLine = line(comment.getStartLineNo() - 1).trim(); if (!startLine.startsWith("/*")) { lineHasOnlyBlockComment = false; @@ -332,9 +332,9 @@ private boolean hasIntersectionWithBlockComment(int startLineNo, int startColNo, */ private boolean hasIntersectionWithSingleLineComment(int startLineNo, int startColNo, int endLineNo, int endColNo) { - boolean hasIntersection = false; + var hasIntersection = false; // Check CPP comments (line searching is possible) - for (int lineNumber = startLineNo; lineNumber <= endLineNo; + for (var lineNumber = startLineNo; lineNumber <= endLineNo; lineNumber++) { final TextBlock comment = cppComments.get(lineNumber); if (comment != null && comment.intersects(startLineNo, startColNo, 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 87bcebe969cd..539ccb757d09 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FileText.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FileText.java @@ -201,7 +201,7 @@ private static String readFile(final File inputFile, final CharsetDecoder decode try (Reader reader = new InputStreamReader(stream, decoder)) { final char[] chars = new char[READ_BUFFER_SIZE]; while (true) { - final int len = reader.read(chars); + final var len = reader.read(chars); if (len == -1) { break; } @@ -269,14 +269,14 @@ public String[] toLinesArray() { */ public LineColumn lineColumn(int pos) { final int[] lineBreakPositions = findLineBreaks(); - int lineNo = Arrays.binarySearch(lineBreakPositions, pos); + var lineNo = Arrays.binarySearch(lineBreakPositions, pos); if (lineNo < 0) { // we have: lineNo = -(insertion point) - 1 // we want: lineNo = (insertion point) - 1 lineNo = -lineNo - 2; } - final int startOfLine = lineBreakPositions[lineNo]; - final int columnNo = pos - startOfLine; + final var startOfLine = lineBreakPositions[lineNo]; + final var columnNo = pos - startOfLine; // now we have lineNo and columnNo, both starting at zero. return new LineColumn(lineNo + 1, columnNo); } @@ -290,7 +290,7 @@ private int[] findLineBreaks() { if (lineBreaks == null) { final int[] lineBreakPositions = new int[size() + 1]; lineBreakPositions[0] = 0; - int lineNo = 1; + var lineNo = 1; final Matcher matcher = LINE_TERMINATOR.matcher(fullText); while (matcher.find()) { lineBreakPositions[lineNo] = matcher.end(); 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 eeea4a82c87e..9c8f795a876d 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FilterSet.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FilterSet.java @@ -68,7 +68,7 @@ public String toString() { @Override public boolean accept(AuditEvent event) { - boolean result = true; + var result = true; for (Filter filter : filters) { if (!filter.accept(event)) { result = false; 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 e89811ec2fed..8cc15768b0dd 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FullIdent.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FullIdent.java @@ -80,20 +80,20 @@ public static FullIdent createFullIdent(DetailAST ast) { private static void extractFullIdent(FullIdent full, DetailAST ast) { final Deque identStack = new ArrayDeque<>(); pushToIdentStack(identStack, ast); - boolean bracketsExist = false; - int dotCounter = 0; + var bracketsExist = false; + var dotCounter = 0; while (!identStack.isEmpty()) { final DetailAST currentAst = identStack.pop(); final DetailAST nextSibling = currentAst.getNextSibling(); // Here we want type declaration, but not initialization - final boolean isArrayTypeDeclarationStart = nextSibling != null + final var isArrayTypeDeclarationStart = nextSibling != null && (nextSibling.getType() == TokenTypes.ARRAY_DECLARATOR || nextSibling.getType() == TokenTypes.ANNOTATIONS) && isArrayTypeDeclaration(nextSibling); - final int typeOfAst = currentAst.getType(); + final var typeOfAst = currentAst.getType(); bracketsExist = bracketsExist || isArrayTypeDeclarationStart; final DetailAST firstChild = currentAst.getFirstChild(); @@ -124,7 +124,7 @@ else if (typeOfAst == TokenTypes.DOT) { */ private static int appendToFull(FullIdent full, DetailAST ast, int dotCounter, boolean bracketsExist, boolean isArrayTypeDeclarationStart) { - int result = dotCounter; + var result = dotCounter; if (isArrayTypeDeclarationStart) { full.append(ast); appendBrackets(full, ast); @@ -180,9 +180,9 @@ private static boolean isArrayTypeDeclaration(DetailAST arrayDeclarator) { * @param ast the type ast we are building a {@code FullIdent} for */ private static void appendBrackets(FullIdent full, DetailAST ast) { - final int bracketCount = + final var bracketCount = ast.getParent().getChildCount(TokenTypes.ARRAY_DECLARATOR); - for (int i = 0; i < bracketCount; i++) { + for (var i = 0; i < bracketCount; i++) { full.append("[]"); } } 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 e0e6dcd952fc..6c8a928e602d 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.java @@ -76,13 +76,13 @@ public void visitToken(DetailAST ast) { final DetailAST identAst = typeAST.getNextSibling(); // If identAst is null, we have a 'LITERAL_NEW' expression, i.e. 'new int[2][2]' if (identAst != null) { - final boolean isMethod = typeAST.getParent().getType() == TokenTypes.METHOD_DEF; - final boolean isJavaStyle = identAst.getLineNo() > ast.getLineNo() + final var isMethod = typeAST.getParent().getType() == TokenTypes.METHOD_DEF; + final var isJavaStyle = identAst.getLineNo() > ast.getLineNo() || identAst.getColumnNo() - ast.getColumnNo() > -1; // force all methods to be Java style (see note in top Javadoc) - final boolean isMethodViolation = isMethod && !isJavaStyle; - final boolean isVariableViolation = !isMethod + final var isMethodViolation = isMethod && !isJavaStyle; + final var isVariableViolation = !isMethod && isJavaStyle != javaStyle; if (isMethodViolation || isVariableViolation) { 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 e733bbbb6fc6..9718aa9b9e17 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.java @@ -293,9 +293,9 @@ private static boolean hasUnicodeChar(String literal) { * @return true, if String literal contains Unicode control chars. */ private static boolean isOnlyUnicodeValidChars(String literal, Pattern pattern) { - final int unicodeMatchesCounter = + final var unicodeMatchesCounter = countMatches(UNICODE_REGEXP, literal); - final int unicodeValidMatchesCounter = + final var unicodeValidMatchesCounter = countMatches(pattern, literal); return unicodeMatchesCounter - unicodeValidMatchesCounter == 0; } @@ -307,14 +307,14 @@ private static boolean isOnlyUnicodeValidChars(String literal, Pattern pattern) * @return true if trail comment is present after ast token. */ private boolean hasTrailComment(DetailAST ast) { - int lineNo = ast.getLineNo(); + var lineNo = ast.getLineNo(); // Since the trailing comment in the case of text blocks must follow the """ delimiter, // we need to look for it after TEXT_BLOCK_LITERAL_END. if (ast.getType() == TokenTypes.TEXT_BLOCK_CONTENT) { lineNo = ast.getNextSibling().getLineNo(); } - boolean result = false; + var result = false; if (singlelineComments.containsKey(lineNo)) { result = true; } @@ -350,7 +350,7 @@ private static boolean isTrailingBlockComment(TextBlock comment, int... codePoin * @return count of regexp matches. */ private static int countMatches(Pattern pattern, String target) { - int matcherCounter = 0; + var matcherCounter = 0; final Matcher matcher = pattern.matcher(target); while (matcher.find()) { matcherCounter++; 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 cd79c9daef3e..7bbd635171f2 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.java @@ -138,7 +138,7 @@ private void logAsSeparated(DetailAST ast) { final String name = TokenUtil.getTokenName(ast.getType()); for (int element : limitedTokens) { - final int tokenCount = counts[element - 1]; + final var tokenCount = counts[element - 1]; if (tokenCount < minimumNumber) { final String descendantName = TokenUtil.getTokenName(element); @@ -177,7 +177,7 @@ private void logAsTotal(DetailAST ast) { // name of this token final String name = TokenUtil.getTokenName(ast.getType()); - int total = 0; + var total = 0; for (int element : limitedTokens) { total += counts[element - 1]; } @@ -211,13 +211,13 @@ private void countTokens(DetailAST ast, int depth) { if (depth <= maximumDepth) { // update count if (depth >= minimumDepth) { - final int type = ast.getType(); + final var type = ast.getType(); if (type <= counts.length) { counts[type - 1]++; } } DetailAST child = ast.getFirstChild(); - final int nextDepth = depth + 1; + final var nextDepth = depth + 1; while (child != null) { countTokens(child, nextDepth); child = child.getNextSibling(); @@ -234,8 +234,8 @@ private void countTokens(DetailAST ast, int depth) { public void setLimitedTokens(String... limitedTokensParam) { limitedTokens = new int[limitedTokensParam.length]; - int maxToken = 0; - for (int i = 0; i < limitedTokensParam.length; i++) { + var maxToken = 0; + for (var i = 0; i < limitedTokensParam.length; i++) { limitedTokens[i] = TokenUtil.getTokenId(limitedTokensParam[i]); if (limitedTokens[i] >= maxToken + 1) { maxToken = limitedTokens[i]; 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 c284d90f5c56..2572d651fe38 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java @@ -216,7 +216,7 @@ private void checkParam(final DetailAST param) { * @return true if param has to be skipped. */ private boolean isIgnoredPrimitiveParam(DetailAST paramDef) { - boolean result = false; + var result = false; if (ignorePrimitiveTypes) { final DetailAST type = paramDef.findFirstToken(TokenTypes.TYPE); final DetailAST parameterType = type.getFirstChild(); 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 521c64efb675..50265068f7b4 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheck.java @@ -170,7 +170,7 @@ else if (!endsWithNewline(randomAccessFile, lineSeparator)) { private static boolean endsWithNewline(RandomAccessFile file, LineSeparatorOption separator) throws IOException { final boolean result; - final int len = separator.length(); + final var len = separator.length(); if (file.length() == 0) { result = true; } @@ -180,7 +180,7 @@ else if (file.length() < len) { else { file.seek(file.length() - len); final byte[] lastBytes = new byte[len]; - final int readBytes = file.read(lastBytes); + final var readBytes = file.read(lastBytes); if (readBytes != len) { throw new IOException("Unable to read " + len + " bytes, got " + readBytes); 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 3d17f17c4896..343a3143f810 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.java @@ -113,7 +113,7 @@ protected void processFiltered(File file, FileText fileText) { } String previousProp = ""; - int startLineNo = 0; + var startLineNo = 0; final Iterator propertyIterator = properties.keys().asIterator(); @@ -123,7 +123,7 @@ protected void processFiltered(File file, FileText fileText) { if (String.CASE_INSENSITIVE_ORDER.compare(previousProp, propKey) > 0) { - final int lineNo = getLineNumber(startLineNo, fileText, previousProp, propKey); + final var lineNo = getLineNumber(startLineNo, fileText, previousProp, propKey); log(lineNo + 1, MSG_KEY, propKey, previousProp); // start searching at position of the last reported validation startLineNo = lineNo; @@ -147,7 +147,7 @@ protected void processFiltered(File file, FileText fileText) { */ private static int getLineNumber(int startLineNo, FileText fileText, String previousProp, String propKey) { - final int indexOfPreviousProp = getIndex(startLineNo, fileText, previousProp); + final var indexOfPreviousProp = getIndex(startLineNo, fileText, previousProp); return getIndex(indexOfPreviousProp, fileText, propKey); } @@ -161,9 +161,9 @@ private static int getLineNumber(int startLineNo, FileText fileText, */ private static int getIndex(int startLineNo, FileText fileText, String keyName) { final Pattern keyPattern = getKeyPattern(keyName); - int indexNumber = 0; + var indexNumber = 0; final Matcher matcher = keyPattern.matcher(""); - for (int index = startLineNo; index < fileText.size(); index++) { + for (var index = startLineNo; index < fileText.size(); index++) { final String line = fileText.get(index); matcher.reset(line); if (matcher.matches()) { 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 85991ab27a9e..502cd2bbf99c 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java @@ -102,12 +102,12 @@ public class SuppressWarningsHolder * @return the default alias for the given check */ public static String getDefaultAlias(String sourceName) { - int endIndex = sourceName.length(); + var endIndex = sourceName.length(); final String sourceNameLower = sourceName.toLowerCase(Locale.ENGLISH); if (sourceNameLower.endsWith(CHECK_SUFFIX)) { endIndex -= CHECK_SUFFIX.length(); } - final int startIndex = sourceNameLower.lastIndexOf('.') + 1; + final var startIndex = sourceNameLower.lastIndexOf('.') + 1; return sourceNameLower.substring(startIndex, endIndex); } @@ -126,7 +126,7 @@ private static String getSimpleNameAlias(String sourceName) { // check alias for the CheckNameCheck String checkAlias = CHECK_ALIAS_MAP.get(checkName); if (checkAlias == null && checkName.endsWith(checkNameSuffix)) { - final int checkStartIndex = checkName.length() - checkNameSuffix.length(); + final var checkStartIndex = checkName.length() - checkNameSuffix.length(); final String checkNameWithoutSuffix = checkName.substring(0, checkStartIndex); // check alias for the CheckName checkAlias = CHECK_ALIAS_MAP.get(checkNameWithoutSuffix); @@ -177,7 +177,7 @@ private static void registerAlias(String sourceName, String checkAlias) { */ public void setAliasList(String... aliasList) { for (String sourceAlias : aliasList) { - final int index = sourceAlias.indexOf('='); + final var index = sourceAlias.indexOf('='); if (index > 0) { registerAlias(sourceAlias.substring(0, index), sourceAlias .substring(index + 1)); @@ -201,14 +201,14 @@ public static boolean isSuppressed(AuditEvent event) { final List entries = ENTRIES.get(); final String sourceName = event.getSourceName(); final String checkAlias = getAlias(sourceName); - final int line = event.getLine(); - final int column = event.getColumn(); - boolean suppressed = false; + final var line = event.getLine(); + final var column = event.getColumn(); + var suppressed = false; for (Entry entry : entries) { - final boolean afterStart = isSuppressedAfterEventStart(line, column, entry); - final boolean beforeEnd = isSuppressedBeforeEventEnd(line, column, entry); + final var afterStart = isSuppressedAfterEventStart(line, column, entry); + final var beforeEnd = isSuppressedBeforeEventEnd(line, column, entry); final String checkName = entry.checkName(); - final boolean nameMatches = + final var nameMatches = ALL_WARNING_MATCHING_ID.equals(checkName) || checkName.equalsIgnoreCase(checkAlias) || getDefaultAlias(checkName).equalsIgnoreCase(checkAlias) @@ -299,8 +299,8 @@ public void visitToken(DetailAST ast) { */ private static void addSuppressions(List values, DetailAST targetAST) { // get text range of target - final int firstLine = targetAST.getLineNo(); - final int firstColumn = targetAST.getColumnNo(); + final var firstLine = targetAST.getLineNo(); + final var firstColumn = targetAST.getColumnNo(); final DetailAST nextAST = targetAST.getNextSibling(); final int lastLine; final int lastColumn; @@ -350,7 +350,7 @@ private static List getAllAnnotationValues(DetailAST ast) { final DetailAST lparenAST = ast.findFirstToken(TokenTypes.LPAREN); if (lparenAST != null) { final DetailAST nextAST = lparenAST.getNextSibling(); - final int nextType = nextAST.getType(); + final var nextType = nextAST.getType(); switch (nextType) { case TokenTypes.EXPR: case TokenTypes.ANNOTATION_ARRAY_INIT: @@ -404,7 +404,7 @@ private static Optional getAnnotationTarget(DetailAST ast) { */ private static DetailAST getNthChild(DetailAST ast, int index) { DetailAST child = ast.getFirstChild(); - for (int i = 0; i < index && child != null; ++i) { + for (var i = 0; i < index && child != null; ++i) { child = child.getNextSibling(); } return child; 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 a7a5525ea5df..4a460580c527 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java @@ -230,7 +230,7 @@ private void validateUserSpecifiedLanguageCodes(Set languageCodes) { * @return true if user specified language code is correct. */ private static boolean isValidLanguageCode(final String userSpecifiedLanguageCode) { - boolean valid = false; + var valid = false; final Locale[] locales = Locale.getAvailableLocales(); for (Locale locale : locales) { if (userSpecifiedLanguageCode.equals(locale.toString())) { @@ -614,7 +614,7 @@ public void addFile(File file) { * @return true if a resource bundle contains a file which name matches file name regexp. */ public boolean containsFile(String fileNameRegexp) { - boolean containsFile = false; + var containsFile = false; for (File currentFile : files) { if (Pattern.matches(fileNameRegexp, currentFile.getName())) { containsFile = true; 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 ef0b0594dd3e..a270de64b63e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java @@ -224,12 +224,12 @@ private static boolean checkType(DetailAST method) { * @return true if check passed, false otherwise */ private static boolean checkParams(DetailAST method) { - boolean checkPassed = false; + var checkPassed = false; final DetailAST params = method.findFirstToken(TokenTypes.PARAMETERS); if (params.getChildCount() == 1) { final DetailAST parameterType = params.getFirstChild().findFirstToken(TokenTypes.TYPE); - final boolean isArrayDeclaration = + final var isArrayDeclaration = parameterType.findFirstToken(TokenTypes.ARRAY_DECLARATOR) != null; final Optional varargs = Optional.ofNullable( params.getFirstChild().findFirstToken(TokenTypes.ELLIPSIS)); 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 59b515fe524c..f991d216f43b 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.java @@ -98,7 +98,7 @@ protected void processFiltered(File file, FileText fileText) { for (Entry duplication : properties .getDuplicatedKeys().entrySet()) { final String keyName = duplication.getKey(); - final int lineNumber = getLineNumber(fileText, keyName); + final var lineNumber = getLineNumber(fileText, keyName); // Number of occurrences is number of duplications + 1 log(lineNumber, MSG_KEY, keyName, duplication.getValue() + 1); } @@ -117,9 +117,9 @@ protected void processFiltered(File file, FileText fileText) { */ private static int getLineNumber(FileText fileText, String keyName) { final Pattern keyPattern = getKeyPattern(keyName); - int lineNumber = 1; + var lineNumber = 1; final Matcher matcher = keyPattern.matcher(""); - for (int index = 0; index < fileText.size(); index++) { + for (var index = 0; index < fileText.size(); index++) { final String line = fileText.get(index); matcher.reset(line); if (matcher.matches()) { 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 01e977b44be2..7f6007d14907 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 @@ -366,7 +366,7 @@ private void checkStyleType(final DetailAST annotation) { * @param annotation the annotation token */ private void checkExpandedStyle(final DetailAST annotation) { - final int valuePairCount = + final var valuePairCount = annotation.getChildCount(TokenTypes.ANNOTATION_MEMBER_VALUE_PAIR); if (valuePairCount == 0 && hasArguments(annotation)) { @@ -391,7 +391,7 @@ private static boolean hasArguments(DetailAST annotation) { * @param annotation the annotation token */ private void checkCompactStyle(final DetailAST annotation) { - final int valuePairCount = + final var valuePairCount = annotation.getChildCount( TokenTypes.ANNOTATION_MEMBER_VALUE_PAIR); 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 a8819667a69a..e35fbaa5967b 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 @@ -134,11 +134,11 @@ public void setViolateExecutionOnNonTightHtml(boolean shouldReportViolation) { public void visitJavadocToken(DetailNode ast) { final DetailAST parentAst = getParent(getBlockCommentAst()); - final boolean containsAnnotation = + final var containsAnnotation = AnnotationUtil.containsAnnotation(parentAst, DEPRECATED) || AnnotationUtil.containsAnnotation(parentAst, FQ_DEPRECATED); - final boolean containsJavadocTag = containsDeprecatedTag(ast); + final var containsJavadocTag = containsDeprecatedTag(ast); if (containsAnnotation ^ containsJavadocTag) { log(parentAst.getLineNo(), MSG_KEY_ANNOTATION_MISSING_DEPRECATED); @@ -152,7 +152,7 @@ public void visitJavadocToken(DetailNode ast) { * @return true if contains the tag */ private boolean containsDeprecatedTag(DetailNode javadoc) { - boolean found = false; + var found = false; DetailNode node = javadoc.getFirstChild(); while (node != null) { if (node.getType() == JavadocCommentsTokenTypes.JAVADOC_BLOCK_TAG @@ -183,7 +183,7 @@ private static DetailAST getParent(DetailAST commentBlock) { } while (true) { - final int type = result.getType(); + final var type = result.getType(); if (TYPES_HASH_SET.get(type)) { result = result.getParent(); } 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 837f85bfc704..3d5825c98b5c 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 @@ -127,13 +127,13 @@ public int[] getRequiredTokens() { @Override public void visitToken(final DetailAST ast) { - final boolean containsTag = containsInheritDocTag(ast); + final var containsTag = containsInheritDocTag(ast); if (containsTag && !JavadocTagInfo.INHERIT_DOC.isValidOn(ast)) { log(ast, MSG_KEY_TAG_NOT_VALID_ON, JavadocTagInfo.INHERIT_DOC.getText()); } else { - boolean check = true; + var check = true; if (javaFiveCompatibility) { final DetailAST defOrNew = ast.getParent().getParent(); 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 e797916c4108..38f0ccef07bd 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 @@ -77,7 +77,7 @@ public int[] getAcceptableTokens() { @Override public void visitToken(final DetailAST ast) { - final boolean containsAnnotation = + final var containsAnnotation = AnnotationUtil.containsAnnotation(ast); if (containsAnnotation && !CheckUtil.isPackageInfo(getFilePath())) { 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 34efca5eb854..8aede6e33470 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 @@ -163,11 +163,11 @@ private boolean hasText(final DetailAST slistAST) { else { rcurlyAST = rightCurly; } - final int slistLineNo = slistAST.getLineNo(); - final int slistColNo = slistAST.getColumnNo(); - final int rcurlyLineNo = rcurlyAST.getLineNo(); - final int rcurlyColNo = rcurlyAST.getColumnNo(); - boolean returnValue = false; + final var slistLineNo = slistAST.getLineNo(); + final var slistColNo = slistAST.getColumnNo(); + final var rcurlyLineNo = rcurlyAST.getLineNo(); + final var rcurlyColNo = rcurlyAST.getColumnNo(); + var returnValue = false; if (slistLineNo == rcurlyLineNo) { // Handle braces on the same line final int[] txt = Arrays.copyOfRange(getLineCodePoints(slistLineNo - 1), @@ -201,8 +201,8 @@ private boolean hasText(final DetailAST slistAST) { * @return true if lines contain only whitespaces */ private boolean checkIsAllLinesAreWhitespace(int lineFrom, int lineTo) { - boolean result = true; - for (int i = lineFrom; i < lineTo - 1; i++) { + var result = true; + for (var i = lineFrom; i < lineTo - 1; i++) { if (!CodePointUtil.isBlank(getLineCodePoints(i))) { result = false; break; @@ -219,7 +219,7 @@ private boolean checkIsAllLinesAreWhitespace(int lineFrom, int lineTo) { */ private static Optional getLeftCurly(DetailAST ast) { final DetailAST parent = ast.getParent(); - final int parentType = parent.getType(); + final var parentType = parent.getType(); final Optional leftCurly; if (parentType == TokenTypes.SWITCH_RULE) { 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 f039382546af..53f6280738ec 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 @@ -173,9 +173,9 @@ else if (firstElementInBlock.getType() == TokenTypes.BLOCK_COMMENT_BEGIN) { */ private boolean isVerifiable(DetailAST emptyCatchAst, String commentContent) { final String variableName = getExceptionVariableName(emptyCatchAst); - final boolean isMatchingVariableName = exceptionVariableName + final var isMatchingVariableName = exceptionVariableName .matcher(variableName).find(); - final boolean isMatchingCommentContent = !commentContent.isEmpty() + final var isMatchingCommentContent = !commentContent.isEmpty() && commentFormat.matcher(commentContent).find(); return !isMatchingVariableName && !isMatchingCommentContent; } @@ -187,7 +187,7 @@ private boolean isVerifiable(DetailAST emptyCatchAst, String commentContent) { * @return true if catch block is empty. */ private static boolean isEmptyCatchBlock(DetailAST catchAst) { - boolean result = true; + var result = true; final DetailAST slistToken = catchAst.findFirstToken(TokenTypes.SLIST); DetailAST catchBlockStmt = slistToken.getFirstChild(); while (catchBlockStmt.getType() != TokenTypes.RCURLY) { 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 1e2e404ad38c..5c246afa744b 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 @@ -110,7 +110,7 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { - final boolean hasNoSlist = ast.findFirstToken(TokenTypes.SLIST) == null; + final var hasNoSlist = ast.findFirstToken(TokenTypes.SLIST) == null; if (hasNoSlist && !isSkipStatement(ast) && isBracesNeeded(ast)) { log(ast, MSG_KEY_NEED_BRACES, ast.getText()); } @@ -161,7 +161,7 @@ private boolean isEmptyLoopBodyAllowed(DetailAST ast) { */ private static boolean hasUnbracedStatements(DetailAST ast) { final DetailAST nextSibling = ast.getNextSibling(); - boolean result = false; + var result = false; if (isInSwitchRule(ast)) { final DetailAST parent = ast.getParent(); @@ -231,7 +231,7 @@ private static boolean isSingleLineStatement(DetailAST statement) { * @return true if current while statement is single-line statement. */ private static boolean isSingleLineWhile(DetailAST literalWhile) { - boolean result = false; + var result = false; if (literalWhile.getParent().getType() == TokenTypes.SLIST) { final DetailAST block = literalWhile.getLastChild().getPreviousSibling(); result = TokenUtil.areOnSameLine(literalWhile, block); @@ -252,7 +252,7 @@ private static boolean isSingleLineWhile(DetailAST literalWhile) { * @return true if current do-while statement is single-line statement. */ private static boolean isSingleLineDoWhile(DetailAST literalDo) { - boolean result = false; + var result = false; if (literalDo.getParent().getType() == TokenTypes.SLIST) { final DetailAST block = literalDo.getFirstChild(); result = TokenUtil.areOnSameLine(block, literalDo); @@ -273,7 +273,7 @@ private static boolean isSingleLineDoWhile(DetailAST literalDo) { * @return true if current for statement is single-line statement. */ private static boolean isSingleLineFor(DetailAST literalFor) { - boolean result = false; + var result = false; if (literalFor.getLastChild().getType() == TokenTypes.EMPTY_STAT) { result = true; } @@ -296,7 +296,7 @@ else if (literalFor.getParent().getType() == TokenTypes.SLIST) { * @return true if current if statement is single-line statement. */ private static boolean isSingleLineIf(DetailAST literalIf) { - boolean result = false; + var result = false; if (literalIf.getParent().getType() == TokenTypes.SLIST) { final DetailAST literalIfLastChild = literalIf.getLastChild(); final DetailAST block; 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 829632571382..069ce5dec798 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 @@ -264,7 +264,7 @@ private static boolean isAloneOnLine(Details details, String targetSrcLine) { * @return if the double brace initialization rcurly should be skipped over by the check */ private static boolean skipDoubleBraceInstInit(Details details) { - boolean skipDoubleBraceInstInit = false; + var skipDoubleBraceInstInit = false; final DetailAST tokenAfterNextToken = Details.getNextToken(details.nextToken()); if (tokenAfterNextToken != null) { final DetailAST rcurly = details.rcurly(); @@ -398,7 +398,7 @@ private static Details getDetailsForSwitch(DetailAST switchNode) { */ private static Details getDetailsForCase(DetailAST caseNode) { final DetailAST caseParent = caseNode.getParent(); - final int parentType = caseParent.getType(); + final var parentType = caseParent.getType(); final Optional lcurly; final DetailAST statementList; @@ -430,7 +430,7 @@ private static Details getDetailsForCase(DetailAST caseNode) { */ private static boolean isSwitchExpression(DetailAST switchNode) { DetailAST currentNode = switchNode; - boolean ans = false; + var ans = false; while (currentNode != null) { if (currentNode.getType() == TokenTypes.EXPR) { @@ -450,7 +450,7 @@ private static boolean isSwitchExpression(DetailAST switchNode) { private static Details getDetailsForTryCatch(DetailAST ast) { final DetailAST lcurly; DetailAST nextToken; - final int tokenType = ast.getType(); + final var tokenType = ast.getType(); if (tokenType == TokenTypes.LITERAL_TRY) { if (ast.getFirstChild().getType() == TokenTypes.RESOURCE_SPECIFICATION) { lcurly = ast.getFirstChild().getNextSibling(); @@ -516,7 +516,7 @@ private static Details getDetailsForIf(DetailAST ast) { private static Details getDetailsForOthers(DetailAST ast) { DetailAST rcurly = null; final DetailAST lcurly; - final int tokenType = ast.getType(); + final var tokenType = ast.getType(); if (isTokenWithNoChildSlist(tokenType)) { final DetailAST child = ast.getLastChild(); lcurly = child; 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 77840bfdae13..bb7e9b1cb35f 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 @@ -96,7 +96,7 @@ else if (isSuperCall(ast)) { * @return true if ast is a call to the super method for this check. */ private boolean isSuperCall(DetailAST literalSuperAst) { - boolean superCall = false; + var superCall = false; if (!isSameNameMethod(literalSuperAst)) { final DetailAST parent = literalSuperAst.getParent(); @@ -115,7 +115,7 @@ private boolean isSuperCall(DetailAST literalSuperAst) { * @return true if super call in overriding method. */ private boolean isSuperCallInOverridingMethod(DetailAST ast) { - boolean inOverridingMethod = false; + var inOverridingMethod = false; DetailAST dotAst = ast; while (dotAst.getType() != TokenTypes.CTOR_DEF @@ -178,7 +178,7 @@ public void leaveToken(DetailAST ast) { * @return true if the method of ast is a method for this check. */ private boolean isOverridingMethod(DetailAST ast) { - boolean overridingMethod = false; + var overridingMethod = false; if (ast.getType() == TokenTypes.METHOD_DEF && !ScopeUtil.isInInterfaceOrAnnotationBlock(ast)) { 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 981d147fb731..9647366630e5 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 @@ -108,7 +108,7 @@ && hasOnlyInitialization(ast)) { * false otherwise */ private static boolean hasOnlyInitialization(DetailAST objBlock) { - final boolean hasInitBlock = objBlock.findFirstToken(TokenTypes.INSTANCE_INIT) != null; + final var hasInitBlock = objBlock.findFirstToken(TokenTypes.INSTANCE_INIT) != null; return hasInitBlock && TokenUtil.findFirstTokenByPredicate(objBlock, HAS_MEMBERS).isEmpty(); } 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 ac5a91348a7f..970ef5907f93 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 @@ -88,7 +88,7 @@ public void visitToken(DetailAST ast) { final DetailAST defaultGroupAST = ast.getParent(); // Switch rules are not subject to fall through. - final boolean isSwitchRule = defaultGroupAST.getType() == TokenTypes.SWITCH_RULE; + final var isSwitchRule = defaultGroupAST.getType() == TokenTypes.SWITCH_RULE; if (skipIfLastAndSharedWithCase && !isSwitchRule) { if (isNextSiblingOf(ast, TokenTypes.LITERAL_CASE)) { 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 90d62f4bfe6a..e03ee93d0b76 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 @@ -144,7 +144,7 @@ public void visitToken(final DetailAST ast) { case TokenTypes.LITERAL_NEW -> processLiteralNew(ast); case TokenTypes.OBJBLOCK -> { - final int parentType = ast.getParent().getType(); + final var parentType = ast.getParent().getType(); if (!astTypeIsClassOrEnumOrRecordDef(parentType)) { processFrame(ast); } @@ -162,7 +162,7 @@ public void leaveToken(DetailAST ast) { case TokenTypes.LITERAL_NEW -> leaveLiteralNew(ast); case TokenTypes.OBJBLOCK -> { - final int parentType = ast.getParent().getType(); + final var parentType = ast.getParent().getType(); if (!astTypeIsClassOrEnumOrRecordDef(parentType)) { currentFrame = currentFrame.getParent(); } @@ -218,7 +218,7 @@ private void leaveSlist(DetailAST ast) { */ private void processFrame(DetailAST ast) { final FieldFrame frame = new FieldFrame(currentFrame); - final int astType = ast.getType(); + final var astType = ast.getType(); if (astTypeIsClassOrEnumOrRecordDef(astType)) { frame.setClassOrEnumOrRecordDef(true); frame.setFrameName(ast.findFirstToken(TokenTypes.IDENT).getText()); @@ -329,7 +329,7 @@ private static boolean containsAllSafeTokens(final DetailAST expr) { DetailAST arg = expr.getFirstChild(); arg = skipVariableAssign(arg); - boolean argIsNotNull = false; + var argIsNotNull = false; if (arg.getType() == TokenTypes.PLUS) { DetailAST child = arg.getFirstChild(); while (child != null @@ -396,7 +396,7 @@ private boolean isCalledOnStringFieldOrVariable(DetailAST objCalledOn) { * @return true if the field or the variable is of String type. */ private boolean isStringFieldOrVariable(DetailAST objCalledOn) { - boolean result = false; + var result = false; final String name = objCalledOn.getText(); FieldFrame frame = currentFrame; while (frame != null) { @@ -433,7 +433,7 @@ private boolean isStringFieldOrVariableFromThisInstance(DetailAST objCalledOn) { */ private boolean isStringFieldOrVariableFromClass(DetailAST objCalledOn, final String className) { - boolean result = false; + var result = false; final String name = objCalledOn.getText(); FieldFrame frame = currentFrame; while (frame != null) { 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 04c069269f23..c6efbd8cac0c 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 @@ -113,7 +113,7 @@ private void validateNonObjects(DetailAST ast) { final DetailAST exprStart = assign.getFirstChild().getFirstChild(); final DetailAST type = ast.findFirstToken(TokenTypes.TYPE); - final int primitiveType = type.getFirstChild().getType(); + final var primitiveType = type.getFirstChild().getType(); if (primitiveType == TokenTypes.LITERAL_BOOLEAN && exprStart.getType() == TokenTypes.LITERAL_FALSE) { log(ident, MSG_KEY, ident.getText(), "false"); @@ -145,7 +145,7 @@ private static boolean isZeroChar(DetailAST exprStart) { * @return true is that is a case that need to be skipped. */ private static boolean isSkipCase(DetailAST ast) { - boolean skipCase = true; + var skipCase = true; // do not check local variables and // fields declared in interface/annotations @@ -184,7 +184,7 @@ private static boolean isNumericType(int type) { * @return true if given node contains numeric constant for zero. */ private static boolean isZero(DetailAST expr) { - final int type = expr.getType(); + final var type = expr.getType(); return switch (type) { case TokenTypes.NUM_FLOAT, TokenTypes.NUM_DOUBLE, TokenTypes.NUM_INT, TokenTypes.NUM_LONG -> { 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 8b9836663b5e..f8bb3311d256 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 @@ -126,7 +126,7 @@ public void setCheckLastCaseGroup(boolean value) { @Override public void visitToken(DetailAST ast) { final DetailAST nextGroup = ast.getNextSibling(); - final boolean isLastGroup = nextGroup.getType() != TokenTypes.CASE_GROUP; + final var isLastGroup = nextGroup.getType() != TokenTypes.CASE_GROUP; if (!isLastGroup || checkLastCaseGroup) { final DetailAST slist = ast.findFirstToken(TokenTypes.SLIST); @@ -299,7 +299,7 @@ private boolean checkLoop(final DetailAST ast, Set labels) { private boolean checkTry(final DetailAST ast, boolean useBreak, boolean useContinue, Set labels) { final DetailAST finalStmt = ast.getLastChild(); - boolean isTerminated = finalStmt.getType() == TokenTypes.LITERAL_FINALLY + var isTerminated = finalStmt.getType() == TokenTypes.LITERAL_FINALLY && isTerminated(finalStmt.findFirstToken(TokenTypes.SLIST), useBreak, useContinue, labels); @@ -338,7 +338,7 @@ && isTerminated(finalStmt.findFirstToken(TokenTypes.SLIST), private boolean checkSwitch(DetailAST literalSwitchAst, boolean useContinue, Set labels) { DetailAST caseGroup = literalSwitchAst.findFirstToken(TokenTypes.CASE_GROUP); - boolean isTerminated = caseGroup != null; + var isTerminated = caseGroup != null; while (isTerminated && caseGroup.getType() != TokenTypes.RCURLY) { final DetailAST caseBody = caseGroup.findFirstToken(TokenTypes.SLIST); @@ -410,9 +410,9 @@ private boolean hasFallThroughComment(DetailAST currentCase) { */ private boolean hasReliefComment(DetailAST ast) { final DetailAST nonCommentAst = getNextNonCommentAst(ast); - boolean result = false; + var result = false; if (nonCommentAst != null) { - final int prevLineNumber = nonCommentAst.getPreviousSibling().getLineNo(); + final var prevLineNumber = nonCommentAst.getPreviousSibling().getLineNo(); result = Stream.iterate(nonCommentAst.getPreviousSibling(), Objects::nonNull, DetailAST::getPreviousSibling) 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 7b28a4c2b8b1..ee7294049f5e 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 @@ -221,7 +221,7 @@ && shouldCheckUnnamedVariable(ast)) { } case TokenTypes.IDENT -> { - final int parentType = ast.getParent().getType(); + final var parentType = ast.getParent().getType(); if (isAssignOperator(parentType) && isFirstChild(ast)) { final Optional candidate = getFinalCandidate(ast); if (candidate.isPresent()) { @@ -263,7 +263,7 @@ && shouldUpdateUninitializedVariables(parentAst)) { } case TokenTypes.SLIST -> { - boolean containsBreak = false; + var containsBreak = false; if (parentAst.getType() != TokenTypes.CASE_GROUP || findLastCaseGroupWhichContainsSlist(parentAst.getParent()) == parentAst) { @@ -334,10 +334,10 @@ private static void determineAssignmentConditions(DetailAST ident, * @return true if the scope of a node is restricted to specific code block types. */ private static boolean isInSpecificCodeBlocks(DetailAST node, int... blockTypes) { - boolean returnValue = false; + var returnValue = false; for (int blockType : blockTypes) { for (DetailAST token = node; token != null; token = token.getParent()) { - final int type = token.getType(); + final var type = token.getType(); if (type == blockType) { returnValue = true; break; @@ -378,7 +378,7 @@ private void storePrevScopeUninitializedVariableData() { * Update current scope data uninitialized variable according to the whole scope data. */ private void updateAllUninitializedVariables() { - final boolean hasSomeScopes = !currentScopeAssignedVariables.isEmpty(); + final var hasSomeScopes = !currentScopeAssignedVariables.isEmpty(); if (hasSomeScopes) { scopeStack.forEach(scopeData -> { updateUninitializedVariables(scopeData.prevScopeUninitializedVariables); @@ -395,7 +395,7 @@ private void updateUninitializedVariables(Deque scopeUninitializedVar final Iterator iterator = currentScopeAssignedVariables.peek().iterator(); while (iterator.hasNext()) { final DetailAST assignedVariable = iterator.next(); - boolean shouldRemove = false; + var shouldRemove = false; for (DetailAST variable : scopeUninitializedVariableData) { for (ScopeData scopeData : scopeStack) { final FinalVariableCandidate candidate = @@ -438,7 +438,7 @@ private static boolean shouldUpdateUninitializedVariables(DetailAST ast) { * following, else false */ private static boolean isCaseTokenWithAnotherCaseFollowing(DetailAST ast) { - boolean result = false; + var result = false; if (ast.getType() == TokenTypes.CASE_GROUP) { result = findLastCaseGroupWhichContainsSlist(ast.getParent()) != ast; } @@ -580,7 +580,7 @@ private static boolean isMultipleTypeCatch(DetailAST parameterDefAst) { * @return true, if the variable should be removed. */ private static boolean shouldRemoveFinalVariableCandidate(ScopeData scopeData, DetailAST ast) { - boolean shouldRemove = true; + var shouldRemove = true; for (DetailAST variable : scopeData.uninitializedVariables) { if (variable.getText().equals(ast.getText())) { // if the variable is declared outside the loop and initialized inside 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 8d794f0f8341..b874c26ac05a 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 @@ -297,7 +297,7 @@ private boolean isSamePackage(String className, int pkgNameLen, String illegal) * @return true if type is standard */ private boolean isStandardClass(String className, String illegal) { - boolean isStandardClass = false; + var isStandardClass = false; // class from java.lang if (illegal.length() - JAVA_LANG.length() == className.length() && illegal.endsWith(className) @@ -308,7 +308,7 @@ private boolean isStandardClass(String className, String illegal) { // the expression "new Boolean()" refers to that class, // not to java.lang.Boolean - final boolean isSameFile = classNames.contains(className); + final var isSameFile = classNames.contains(className); if (!isSameFile) { isStandardClass = true; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingNullCaseInSwitchCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingNullCaseInSwitchCheck.java index 7996ff81f84b..eec7875954fa 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingNullCaseInSwitchCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingNullCaseInSwitchCheck.java @@ -94,12 +94,12 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { final List caseLabels = getAllCaseLabels(ast); - final boolean hasNullCaseLabel = caseLabels.stream() + final var hasNullCaseLabel = caseLabels.stream() .anyMatch(MissingNullCaseInSwitchCheck::hasLiteralNull); if (!hasNullCaseLabel) { - final boolean hasPatternCaseLabel = caseLabels.stream() + final var hasPatternCaseLabel = caseLabels.stream() .anyMatch(MissingNullCaseInSwitchCheck::hasPatternCaseLabel); - final boolean hasStringCaseLabel = caseLabels.stream() + final var hasStringCaseLabel = caseLabels.stream() .anyMatch(MissingNullCaseInSwitchCheck::hasStringCaseLabel); if (hasPatternCaseLabel || hasStringCaseLabel) { log(ast, MSG_KEY); @@ -159,8 +159,8 @@ private static boolean hasPatternCaseLabel(DetailAST caseAST) { */ private static boolean hasStringCaseLabel(DetailAST caseAST) { DetailAST curNode = caseAST; - boolean hasStringCaseLabel = false; - boolean exitCaseLabelExpression = false; + var hasStringCaseLabel = false; + var exitCaseLabelExpression = false; while (!exitCaseLabelExpression) { DetailAST toVisit = curNode.getFirstChild(); if (curNode.getType() == TokenTypes.STRING_LITERAL) { 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 997fd1bc5809..c9c69b18e2fe 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 @@ -136,7 +136,7 @@ public final void setIgnoreStringsRegexp(Pattern ignoreStringsRegexp) { public final void setIgnoreOccurrenceContext(String... strRep) { ignoreOccurrenceContext.clear(); for (final String s : strRep) { - final int type = TokenUtil.getTokenId(s); + final var type = TokenUtil.getTokenId(s); ignoreOccurrenceContext.set(type); } } @@ -188,9 +188,9 @@ public void visitToken(DetailAST ast) { * token type in {@link #ignoreOccurrenceContext}. */ private boolean isInIgnoreOccurrenceContext(DetailAST ast) { - boolean isInIgnoreOccurrenceContext = false; + var isInIgnoreOccurrenceContext = false; for (DetailAST token = ast; token != null; token = token.getParent()) { - final int type = token.getType(); + final var type = token.getType(); if (ignoreOccurrenceContext.get(type)) { isInIgnoreOccurrenceContext = true; break; 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 1ed2cdd10128..aaa75cdba895 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 @@ -76,7 +76,7 @@ public void visitToken(DetailAST ast) { DetailAST nextNode = ast.getNextSibling(); if (nextNode != null) { - final boolean isCommaSeparated = nextNode.getType() == TokenTypes.COMMA; + final var isCommaSeparated = nextNode.getType() == TokenTypes.COMMA; if (isCommaSeparated || nextNode.getType() == TokenTypes.SEMI) { 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 2e9651bef2b1..f7b7ea0fc38f 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 @@ -75,7 +75,7 @@ public void visitToken(DetailAST ast) { if ("finalize".equals(name)) { final DetailAST params = ast.findFirstToken(TokenTypes.PARAMETERS); - final boolean hasEmptyParamList = + final var hasEmptyParamList = params.findFirstToken(TokenTypes.PARAMETER_DEF) == null; if (hasEmptyParamList) { 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 35b042783224..26dac54d5c8f 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 @@ -180,7 +180,7 @@ public void leaveToken(DetailAST ast) { private void checkIfSemicolonIsInDifferentLineThanPrevious(DetailAST ast) { DetailAST currentStatement = ast; final DetailAST previousSibling = ast.getPreviousSibling(); - final boolean isUnnecessarySemicolon = previousSibling == null + final var isUnnecessarySemicolon = previousSibling == null || previousSibling.getType() == TokenTypes.RESOURCES || ast.getParent().getType() == TokenTypes.COMPILATION_UNIT; if (!isUnnecessarySemicolon) { @@ -205,7 +205,7 @@ else if (!inForHeader && isOnTheSameLine(currentStatement, lastStatementEnd, * @param currentStatement current statement */ private void checkLambda(DetailAST ast, DetailAST currentStatement) { - int countOfSemiInCurrentLambda = countOfSemiInLambda.pop(); + var countOfSemiInCurrentLambda = countOfSemiInLambda.pop(); countOfSemiInCurrentLambda++; countOfSemiInLambda.push(countOfSemiInCurrentLambda); if (!inForHeader && countOfSemiInCurrentLambda > 1 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 a1cc1d4fc4ee..a808543b9739 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 @@ -65,7 +65,7 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { - final int parentType = ast.getParent().getType(); + final var parentType = ast.getParent().getType(); final int[] tokenTypes = { TokenTypes.CLASS_DEF, @@ -88,11 +88,11 @@ public void visitToken(DetailAST ast) { * is a class, interface or enum object block. */ private void checkOverloadMethodsGrouping(DetailAST objectBlock) { - final int allowedDistance = 1; + final var allowedDistance = 1; DetailAST currentToken = objectBlock.getFirstChild(); final Map methodIndexMap = new HashMap<>(); final Map methodLineNumberMap = new HashMap<>(); - int currentIndex = 0; + var currentIndex = 0; while (currentToken != null) { if (currentToken.getType() == TokenTypes.METHOD_DEF) { currentIndex++; @@ -100,11 +100,11 @@ private void checkOverloadMethodsGrouping(DetailAST objectBlock) { currentToken.findFirstToken(TokenTypes.IDENT).getText(); final Integer previousIndex = methodIndexMap.get(methodName); final DetailAST previousSibling = currentToken.getPreviousSibling(); - final boolean isMethod = previousSibling.getType() == TokenTypes.METHOD_DEF; + final var isMethod = previousSibling.getType() == TokenTypes.METHOD_DEF; if (previousIndex != null && (!isMethod || currentIndex - previousIndex > allowedDistance)) { - final int previousLineWithOverloadMethod = + final var previousLineWithOverloadMethod = methodLineNumberMap.get(methodName); log(currentToken, MSG_KEY, previousLineWithOverloadMethod); 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 79124654dd18..e7494ddcd550 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 @@ -129,7 +129,7 @@ public void visitToken(DetailAST ast) { */ private String getDirectoryName() { final String fileName = getFilePath(); - final int lastSeparatorPos = fileName.lastIndexOf(File.separatorChar); + final var lastSeparatorPos = fileName.lastIndexOf(File.separatorChar); return fileName.substring(0, lastSeparatorPos); } 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 2af045f6046f..0fc12a7b8764 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 @@ -106,7 +106,7 @@ public void beginTree(DetailAST rootAST) { @Override public void visitToken(DetailAST ast) { - final int type = ast.getType(); + final var type = ast.getType(); if (TokenUtil.isOfType(type, TokenTypes.CTOR_DEF, TokenTypes.METHOD_DEF)) { visitMethodDef(ast); } @@ -122,7 +122,7 @@ else if (type == TokenTypes.LAMBDA) { @Override public void leaveToken(DetailAST ast) { - final int type = ast.getType(); + final var type = ast.getType(); if (TokenUtil.isOfType(type, TokenTypes.CTOR_DEF, TokenTypes.METHOD_DEF) || type == TokenTypes.LAMBDA && ast.getParent().getType() != TokenTypes.SWITCH_RULE) { 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 26d0bad879ff..eaa8844f4ea3 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 @@ -262,7 +262,7 @@ public void leaveToken(DetailAST ast) { * @param ast IDENT to check. */ private void processIdent(DetailAST ast) { - int parentType = ast.getParent().getType(); + var parentType = ast.getParent().getType(); if (parentType == TokenTypes.EXPR && ast.getParent().getParent().getParent().getType() == TokenTypes.ANNOTATION_FIELD_DEF) { @@ -284,7 +284,7 @@ private void processIdent(DetailAST ast) { default -> { if (checkFields) { final AbstractFrame frame = getFieldWithoutThis(ast, parentType); - final boolean canUseThis = !isInCompactConstructor(ast); + final var canUseThis = !isInCompactConstructor(ast); if (frame != null && canUseThis) { logViolation(MSG_VARIABLE, ast, frame); } @@ -319,8 +319,8 @@ else if (!(frame instanceof AnonymousClassFrame)) { * 'this' and null otherwise. */ private AbstractFrame getFieldWithoutThis(DetailAST ast, int parentType) { - final boolean importOrPackage = ScopeUtil.getSurroundingScope(ast) == null; - final boolean typeName = parentType == TokenTypes.TYPE + final var importOrPackage = ScopeUtil.getSurroundingScope(ast) == null; + final var typeName = parentType == TokenTypes.TYPE || parentType == TokenTypes.LITERAL_NEW; AbstractFrame frame = null; @@ -344,7 +344,7 @@ private AbstractFrame getFieldWithoutThis(DetailAST ast, int parentType) { * @return true if ast is in a COMPACT_CTOR_DEF, false otherwise */ private static boolean isInCompactConstructor(DetailAST ast) { - boolean isInCompactCtor = false; + var isInCompactCtor = false; DetailAST parent = ast; while (parent != null) { if (parent.getType() == TokenTypes.COMPACT_CTOR_DEF) { @@ -604,7 +604,7 @@ private static boolean isUserDefinedArrangementOfThis(AbstractFrame currentFrame final DetailAST blockStartToken = definitionToken.findFirstToken(TokenTypes.SLIST); final DetailAST blockEndToken = getBlockEndToken(blockFrameNameIdent, blockStartToken); - boolean userDefinedArrangementOfThis = false; + var userDefinedArrangementOfThis = false; final Set variableUsagesInsideBlock = getAllTokensWhichAreEqualToCurrent(definitionToken, ident, @@ -675,7 +675,7 @@ private static boolean isReturnedVariable(AbstractFrame currentFrame, DetailAST * @return {@code true} if the {@code ast} was found. */ private static boolean isAstInside(DetailAST tree, DetailAST ast) { - boolean result = false; + var result = false; if (isAstSimilar(tree, ast)) { result = true; @@ -697,7 +697,7 @@ private static boolean isAstInside(DetailAST tree, DetailAST ast) { * @return true if field can be referenced from a static context. */ private static boolean canBeReferencedFromStaticContext(DetailAST ident) { - boolean staticContext = false; + var staticContext = false; final DetailAST codeBlockDefinition = getCodeBlockDefinitionToken(ident); if (codeBlockDefinition != null) { @@ -735,10 +735,10 @@ private static DetailAST getCodeBlockDefinitionToken(DetailAST ident) { */ private boolean canAssignValueToClassField(DetailAST ast) { final AbstractFrame fieldUsageFrame = findFrame(ast, false); - final boolean fieldUsageInConstructor = isInsideConstructorFrame(fieldUsageFrame); + final var fieldUsageInConstructor = isInsideConstructorFrame(fieldUsageFrame); final AbstractFrame declarationFrame = findFrame(ast, true); - final boolean finalField = ((ClassFrame) declarationFrame).hasFinalField(ast); + final var finalField = ((ClassFrame) declarationFrame).hasFinalField(ast); return fieldUsageInConstructor || !finalField; } @@ -764,7 +764,7 @@ private static boolean isInsideConstructorFrame(AbstractFrame frame) { * @return true if an overlapping by method or constructor argument takes place. */ private boolean isOverlappingByArgument(DetailAST ast) { - boolean overlapping = false; + var overlapping = false; final DetailAST parent = ast.getParent(); final DetailAST sibling = ast.getNextSibling(); if (sibling != null && isAssignToken(parent.getType())) { @@ -787,7 +787,7 @@ private boolean isOverlappingByArgument(DetailAST ast) { * @return true if an overlapping by local variable takes place. */ private boolean isOverlappingByLocalVariable(DetailAST ast) { - boolean overlapping = false; + var overlapping = false; final DetailAST parent = ast.getParent(); if (isAssignToken(parent.getType())) { final ClassFrame classFrame = (ClassFrame) findFrame(ast, true); @@ -1179,7 +1179,7 @@ && containsFieldOrVariable(identToFind)) { * IDENT ast and it is declared in a proper position. */ protected boolean containsFieldOrVariableDef(Set set, DetailAST ident) { - boolean result = false; + var result = false; for (DetailAST ast: set) { if (isProperDefinition(ident, ast)) { result = true; @@ -1356,7 +1356,7 @@ public boolean hasStaticMethod(final DetailAST ident) { * @return true if given instance member has final modifier. */ public boolean hasFinalField(final DetailAST instanceMember) { - boolean result = false; + var result = false; for (DetailAST member : instanceMembers) { final DetailAST parent = member.getParent(); if (parent.getType() == TokenTypes.RECORD_COMPONENT_DEF) { @@ -1364,7 +1364,7 @@ public boolean hasFinalField(final DetailAST instanceMember) { } else { final DetailAST mods = parent.findFirstToken(TokenTypes.MODIFIERS); - final boolean finalMod = mods.findFirstToken(TokenTypes.FINAL) != null; + final var finalMod = mods.findFirstToken(TokenTypes.FINAL) != null; if (finalMod && isAstSimilar(member, instanceMember)) { result = true; } @@ -1420,7 +1420,7 @@ private boolean containsMethod(DetailAST methodToFind) { * same name and number of parameters. */ private static boolean containsMethodDef(Set set, DetailAST ident) { - boolean result = false; + var result = false; for (DetailAST ast: set) { if (isSimilarSignature(ident, ast)) { result = true; @@ -1439,12 +1439,12 @@ private static boolean containsMethodDef(Set set, DetailAST ident) { * as the method call. */ private static boolean isSimilarSignature(DetailAST ident, DetailAST ast) { - boolean result = false; + var result = false; final DetailAST elistToken = ident.getParent().findFirstToken(TokenTypes.ELIST); if (elistToken != null && ident.getText().equals(ast.getText())) { - final int paramsNumber = + final var paramsNumber = ast.getParent().findFirstToken(TokenTypes.PARAMETERS).getChildCount(); - final int argsNumber = elistToken.getChildCount(); + final var argsNumber = elistToken.getChildCount(); result = paramsNumber == argsNumber; } return result; 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 59fdc6844af9..cca2c9f9ace2 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 @@ -180,7 +180,7 @@ public void leaveToken(DetailAST ast) { private void visitMethodDef(DetailAST ast) { contextStack.push(context); final DetailAST methodNameAST = ast.findFirstToken(TokenTypes.IDENT); - final boolean check = !format.matcher(methodNameAST.getText()).find(); + final var check = !format.matcher(methodNameAST.getText()).find(); context = new Context(check); } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/TextBlockGoogleStyleFormattingCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/TextBlockGoogleStyleFormattingCheck.java index 90a4fa74e4f9..5fc1274a8093 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/TextBlockGoogleStyleFormattingCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/TextBlockGoogleStyleFormattingCheck.java @@ -127,7 +127,7 @@ private static DetailAST getClosingQuotes(DetailAST ast) { */ private static boolean openingQuotesAreAloneOnTheLine(DetailAST openingQuotes) { DetailAST parent = openingQuotes; - boolean quotesAreNotPreceded = true; + var quotesAreNotPreceded = true; while (quotesAreNotPreceded || parent.getType() == TokenTypes.ELIST || parent.getType() == TokenTypes.EXPR) { @@ -179,7 +179,7 @@ private static boolean quotesArePrecededWithComma(DetailAST openingQuotes) { private static boolean closingQuotesAreAloneOnTheLine(DetailAST closingQuotes) { final DetailAST content = closingQuotes.getPreviousSibling(); final String text = content.getText(); - int index = text.length() - 1; + var index = text.length() - 1; while (text.charAt(index) == ' ') { index--; } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryNullCheckWithInstanceOfCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryNullCheckWithInstanceOfCheck.java index 77cc99fe2e81..837e6ec88696 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryNullCheckWithInstanceOfCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryNullCheckWithInstanceOfCheck.java @@ -125,7 +125,7 @@ else if (nullCheckNode == null && currentChild.getType() == TokenTypes.LAND) { */ private static boolean containsVariableDereference(DetailAST node, String variableName) { - boolean found = false; + var found = false; if (node.getType() == TokenTypes.DOT || node.getType() == TokenTypes.METHOD_CALL || node.getType() == TokenTypes.LAND) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLambdaParameterShouldBeUnnamedCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLambdaParameterShouldBeUnnamedCheck.java index be7b6da27a54..78fc908eed77 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLambdaParameterShouldBeUnnamedCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLambdaParameterShouldBeUnnamedCheck.java @@ -165,7 +165,7 @@ public void leaveToken(DetailAST ast) { */ private static boolean isLambdaParameterIdentifierCandidate(DetailAST identifierAst) { // we should ignore the ident if it is in the lambda parameters declaration - final boolean isLambdaParameterDeclaration = + final var isLambdaParameterDeclaration = identifierAst.getParent().getType() == TokenTypes.LAMBDA || identifierAst.getParent().getType() == TokenTypes.PARAMETER_DEF; 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 aafbb22d2406..38e15c294f73 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 @@ -247,7 +247,7 @@ public void beginTree(DetailAST root) { @Override public void visitToken(DetailAST ast) { - final int type = ast.getType(); + final var type = ast.getType(); if (type == TokenTypes.DOT) { visitDotToken(ast, variables); } @@ -316,11 +316,11 @@ private void visitVariableDefToken(DetailAST varDefAst) { */ private static void visitIdentToken(DetailAST identAst, Deque variablesStack) { final DetailAST parent = identAst.getParent(); - final boolean isMethodReferenceMethodName = parent.getType() == TokenTypes.METHOD_REF + final var isMethodReferenceMethodName = parent.getType() == TokenTypes.METHOD_REF && parent.getFirstChild() != identAst; - final boolean isConstructorReference = parent.getType() == TokenTypes.METHOD_REF + final var isConstructorReference = parent.getType() == TokenTypes.METHOD_REF && parent.getLastChild().getType() == TokenTypes.LITERAL_NEW; - final boolean isNestedClassInitialization = + final var isNestedClassInitialization = TokenUtil.isOfType(identAst.getNextSibling(), TokenTypes.LITERAL_NEW) && parent.getType() == TokenTypes.DOT; @@ -374,7 +374,7 @@ private boolean skipUnnamedVariables(DetailAST varDefAst) { * @return true if variableDefAst is an instance variable in local anonymous inner class */ private static boolean isInsideLocalAnonInnerClass(DetailAST literalNewAst) { - boolean result = false; + var result = false; final DetailAST lastChild = literalNewAst.getLastChild(); if (lastChild != null && lastChild.getType() == TokenTypes.OBJBLOCK) { DetailAST currentAst = literalNewAst; @@ -469,7 +469,7 @@ private static DetailAST getBlockContainingLocalAnonInnerClass(DetailAST literal private static void addLocalVariables(DetailAST varDefAst, Deque variablesStack) { final DetailAST parentAst = varDefAst.getParent(); final DetailAST grandParent = parentAst.getParent(); - final boolean isInstanceVarInInnerClass = + final var isInstanceVarInInnerClass = grandParent.getType() == TokenTypes.LITERAL_NEW || grandParent.getType() == TokenTypes.CLASS_DEF; if (isInstanceVarInInnerClass @@ -624,11 +624,11 @@ private static TypeDeclDesc getClosestMatchingTypeDeclaration(String outerTypeDe private static int calculateTypeDeclarationDistance(String outerTypeName, TypeDeclDesc firstType, TypeDeclDesc secondType) { - final int firstMatchCount = + final var firstMatchCount = countMatchingQualifierChars(outerTypeName, firstType.getQualifiedName()); - final int secondMatchCount = + final var secondMatchCount = countMatchingQualifierChars(outerTypeName, secondType.getQualifiedName()); - final int matchDistance = Integer.compare(secondMatchCount, firstMatchCount); + final var matchDistance = Integer.compare(secondMatchCount, firstMatchCount); final int distance; if (matchDistance == 0) { @@ -660,15 +660,15 @@ private static int calculateTypeDeclarationDistance(String outerTypeName, */ private static int countMatchingQualifierChars(String pattern, String candidate) { - final int typeDeclarationToBeMatchedLength = candidate.length(); - final int minLength = Math + final var typeDeclarationToBeMatchedLength = candidate.length(); + final var minLength = Math .min(typeDeclarationToBeMatchedLength, pattern.length()); - final boolean shouldCountBeUpdatedAtLastCharacter = + final var shouldCountBeUpdatedAtLastCharacter = typeDeclarationToBeMatchedLength > minLength && candidate.charAt(minLength) == PACKAGE_SEPARATOR.charAt(0); - int result = 0; - for (int idx = 0; + var result = 0; + for (var idx = 0; idx < minLength && pattern.charAt(idx) == candidate.charAt(idx); idx++) { @@ -726,7 +726,7 @@ private void iterateOverBlockContainingLocalAnonInnerClass( * @param variablesStack stack of all the relevant variables in the scope */ private void customVisitToken(DetailAST ast, Deque variablesStack) { - final int type = ast.getType(); + final var type = ast.getType(); if (type == TokenTypes.DOT) { visitDotToken(ast, variablesStack); } 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 bbb678fdc0d9..0e4ef537a446 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 @@ -147,7 +147,7 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { - final int parentType = ast.getParent().getType(); + final var parentType = ast.getParent().getType(); final DetailAST modifiers = ast.getFirstChild(); if (parentType != TokenTypes.OBJBLOCK @@ -164,7 +164,7 @@ public void visitToken(DetailAST ast) { entry = calculateDistanceInSingleScope(semicolonAst, variable); } final DetailAST variableUsageAst = entry.getKey(); - final int dist = entry.getValue(); + final var dist = entry.getValue(); if (dist > allowedDistance && !isInitializationSequence(variableUsageAst, variable.getText())) { if (ignoreFinal) { @@ -188,7 +188,7 @@ public void visitToken(DetailAST ast) { private static String getInstanceName(DetailAST methodCallAst) { final String methodCallName = FullIdent.createFullIdentBelow(methodCallAst).getText(); - final int lastDotIndex = methodCallName.lastIndexOf('.'); + final var lastDotIndex = methodCallName.lastIndexOf('.'); String instanceName = ""; if (lastDotIndex != -1) { instanceName = methodCallName.substring(0, lastDotIndex); @@ -209,8 +209,8 @@ private static String getInstanceName(DetailAST methodCallAst) { */ private static boolean isInitializationSequence( DetailAST variableUsageAst, String variableName) { - boolean result = true; - boolean isUsedVariableDeclarationFound = false; + var result = true; + var isUsedVariableDeclarationFound = false; DetailAST currentSiblingAst = variableUsageAst; String initInstanceName = ""; @@ -260,8 +260,8 @@ else if (currentSiblingAst.getType() == TokenTypes.VARIABLE_DEF) { */ private static Entry calculateDistanceInSingleScope( DetailAST semicolonAst, DetailAST variableIdentAst) { - int dist = 0; - boolean firstUsageFound = false; + var dist = 0; + var firstUsageFound = false; DetailAST currentAst = semicolonAst; DetailAST variableUsageAst = null; @@ -319,7 +319,7 @@ private static int getDistToVariableUsageInChildNode(DetailAST childNode, */ private static Entry calculateDistanceBetweenScopes( DetailAST ast, DetailAST variable) { - int dist = 0; + var dist = 0; DetailAST currentScopeAst = ast; DetailAST variableUsageAst = null; while (currentScopeAst != null) { @@ -378,7 +378,7 @@ else if (variableUsageExpressions.isEmpty()) { private static Entry, Integer> searchVariableUsageExpressions(final DetailAST variableAst, final DetailAST statementAst) { final List variableUsageExpressions = new ArrayList<>(); - int distance = 0; + var distance = 0; DetailAST currentStatementAst = statementAst; while (currentStatementAst != null) { if (currentStatementAst.getFirstChild() != null) { @@ -426,7 +426,7 @@ private static DetailAST getFirstNodeInsideForWhileDoWhileBlocks( currentNode = block.findFirstToken(TokenTypes.RPAREN).getNextSibling(); } - final int currentNodeType = currentNode.getType(); + final var currentNodeType = currentNode.getType(); if (currentNodeType != TokenTypes.EXPR) { firstNodeInsideBlock = currentNode; @@ -621,7 +621,7 @@ private static DetailAST getFirstNodeInsideTryCatchFinallyBlocks( */ private static boolean isVariableInOperatorExpr( DetailAST operator, DetailAST variable) { - boolean isVarInOperatorDeclaration = false; + var isVarInOperatorDeclaration = false; DetailAST ast = operator.findFirstToken(TokenTypes.LPAREN); @@ -647,7 +647,7 @@ private static boolean isVariableInOperatorExpr( * @return true if Ast element was found in Ast node, otherwise - false. */ private static boolean isChild(DetailAST parent, DetailAST ast) { - boolean isChild = false; + var isChild = false; DetailAST curNode = parent.getFirstChild(); while (curNode != null) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/WhenShouldBeUsedCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/WhenShouldBeUsedCheck.java index f06a220d2e7d..1052c40ef804 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/WhenShouldBeUsedCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/WhenShouldBeUsedCheck.java @@ -81,18 +81,18 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { - final boolean hasPatternLabel = hasPatternLabel(ast); + final var hasPatternLabel = hasPatternLabel(ast); final DetailAST statementList = getStatementList(ast); // until https://github.com/checkstyle/checkstyle/issues/15270 - final boolean isInSwitchRule = ast.getParent().getType() == TokenTypes.SWITCH_RULE; + final var isInSwitchRule = ast.getParent().getType() == TokenTypes.SWITCH_RULE; if (hasPatternLabel && statementList != null && isInSwitchRule) { final List blockStatements = getBlockStatements(statementList); - final boolean hasAcceptableStatementsOnly = blockStatements.stream() + final var hasAcceptableStatementsOnly = blockStatements.stream() .allMatch(WhenShouldBeUsedCheck::isAcceptableStatement); - final boolean hasSingleIfWithNoElse = blockStatements.stream() + final var hasSingleIfWithNoElse = blockStatements.stream() .filter(WhenShouldBeUsedCheck::isSingleIfWithNoElse) .count() == 1; 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 0e4cbfc30900..90824d85e980 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 @@ -215,7 +215,7 @@ public void leaveToken(DetailAST ast) { private static boolean shouldBeDeclaredAsFinal(ClassDesc classDesc) { final boolean shouldBeFinal; - final boolean skipClass = classDesc.isDeclaredAsFinal() + final var skipClass = classDesc.isDeclaredAsFinal() || classDesc.isDeclaredAsAbstract() || classDesc.isSuperClassOfAnonymousInnerClass() || classDesc.isWithNestedSubclass(); @@ -376,16 +376,16 @@ private static String getSuperClassName(DetailAST classAst) { */ private static int getAnonSuperTypeMatchingCount(String patternTypeDeclaration, String typeDeclarationToBeMatched) { - final int typeDeclarationToBeMatchedLength = typeDeclarationToBeMatched.length(); - final int minLength = Math + final var typeDeclarationToBeMatchedLength = typeDeclarationToBeMatched.length(); + final var minLength = Math .min(typeDeclarationToBeMatchedLength, patternTypeDeclaration.length()); - final char packageSeparator = PACKAGE_SEPARATOR.charAt(0); - final boolean shouldCountBeUpdatedAtLastCharacter = + final var packageSeparator = PACKAGE_SEPARATOR.charAt(0); + final var shouldCountBeUpdatedAtLastCharacter = typeDeclarationToBeMatchedLength > minLength && typeDeclarationToBeMatched.charAt(minLength) == packageSeparator; - int result = 0; - for (int idx = 0; + var result = 0; + for (var idx = 0; idx < minLength && patternTypeDeclaration.charAt(idx) == typeDeclarationToBeMatched.charAt(idx); idx++) { 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 ad66c138f10e..478d134f099e 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 @@ -81,7 +81,7 @@ public void visitToken(DetailAST ast) { objBlock.findFirstToken(TokenTypes.METHOD_DEF); final DetailAST variableDef = objBlock.findFirstToken(TokenTypes.VARIABLE_DEF); - final boolean methodRequired = + final var methodRequired = !allowMarkerInterfaces || variableDef != null; if (methodDef == null && methodRequired) { 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 109a7fd5fead..da09331b05a3 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 @@ -173,7 +173,7 @@ private boolean isNamedAsException(DetailAST ast) { * @return true if extended class name conforms to specified format */ private boolean isExtendedClassNamedAsException(DetailAST ast) { - boolean result = false; + var result = false; final DetailAST extendsClause = ast.findFirstToken(TokenTypes.EXTENDS_CLAUSE); if (extendsClause != null) { DetailAST currentNode = extendsClause; 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 790185518520..fb3b4125c1b9 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 @@ -67,7 +67,7 @@ public int[] getRequiredTokens() { public void visitToken(DetailAST compilationUnit) { DetailAST currentNode = compilationUnit.getFirstChild(); - boolean publicTypeFound = false; + var publicTypeFound = false; DetailAST firstType = null; while (currentNode != null) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/SealedShouldHavePermitsListCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/SealedShouldHavePermitsListCheck.java index 27593f102673..b0189a78e81d 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/SealedShouldHavePermitsListCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/SealedShouldHavePermitsListCheck.java @@ -77,8 +77,8 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { final DetailAST modifiers = ast.findFirstToken(TokenTypes.MODIFIERS); - final boolean isSealed = modifiers.findFirstToken(TokenTypes.LITERAL_SEALED) != null; - final boolean hasPermitsList = ast.findFirstToken(TokenTypes.PERMITS_CLAUSE) != null; + final var isSealed = modifiers.findFirstToken(TokenTypes.LITERAL_SEALED) != null; + final var hasPermitsList = ast.findFirstToken(TokenTypes.PERMITS_CLAUSE) != null; if (isSealed && !hasPermitsList) { log(ast, MSG_KEY); 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 66c9e47cfe2d..38be62640c92 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 @@ -137,7 +137,7 @@ private void visitLiteralThrows(DetailAST ast) { if ((!ignorePrivateMethods || !isInPrivateMethod(ast)) && !isOverriding(ast)) { // Account for all the commas! - final int count = (ast.getChildCount() + 1) / 2; + final var count = (ast.getChildCount() + 1) / 2; if (count > max) { log(ast, MSG_KEY, count, max); } @@ -152,7 +152,7 @@ private void visitLiteralThrows(DetailAST ast) { */ private static boolean isOverriding(DetailAST ast) { final DetailAST modifiers = ast.getParent().findFirstToken(TokenTypes.MODIFIERS); - boolean isOverriding = false; + var isOverriding = false; DetailAST child = modifiers.getFirstChild(); while (child != null) { if (child.getType() == TokenTypes.ANNOTATION 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 90e116fc0776..5721268af14f 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 @@ -345,7 +345,7 @@ private static boolean isAnonymousClassVariable(DetailAST variableDef) { * @param variableDef variable to check. */ private void visitVariableDef(DetailAST variableDef) { - final boolean inInterfaceOrAnnotationBlock = + final var inInterfaceOrAnnotationBlock = ScopeUtil.isInInterfaceOrAnnotationBlock(variableDef); if (!inInterfaceOrAnnotationBlock && !hasIgnoreAnnotation(variableDef)) { @@ -407,7 +407,7 @@ private void visitImport(DetailAST importAst) { * @return true if it is star import */ private static boolean isStarImport(DetailAST importAst) { - boolean result = false; + var result = false; DetailAST toVisit = importAst; while (toVisit != null) { toVisit = getNextSubTreeNode(toVisit, importAst); @@ -427,7 +427,7 @@ private static boolean isStarImport(DetailAST importAst) { * @return true if variable has proper access modifier. */ private boolean hasProperAccessModifier(DetailAST variableDef, String variableName) { - boolean result = true; + var result = true; final String variableScope = getVisibilityScope(variableDef); @@ -539,10 +539,10 @@ private static String getVisibilityScope(DetailAST variableDef) { * @return true if field is immutable. */ private boolean isImmutableField(DetailAST variableDef) { - boolean result = false; + var result = false; if (isFinalField(variableDef)) { final DetailAST type = variableDef.findFirstToken(TokenTypes.TYPE); - final boolean isCanonicalName = isCanonicalName(type); + final var isCanonicalName = isCanonicalName(type); final String typeName = getCanonicalName(type); if (immutableClassShortNames.contains(typeName) || isCanonicalName && immutableClassCanonicalNames.contains(typeName)) { 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 5016b4d0cbc3..90ede93c822a 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 @@ -100,7 +100,7 @@ protected void processFiltered(File file, FileText fileText) { log(1, MSG_MISSING); } else { - for (int i = 0; i < getHeaderLines().size(); i++) { + for (var i = 0; i < getHeaderLines().size(); i++) { if (!isMatch(i, fileText.get(i))) { log(i + 1, MSG_MISMATCH, getHeaderLines().get(i)); break; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/MultiFileRegexpHeaderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/MultiFileRegexpHeaderCheck.java index 3d16cda5e4ef..b8be92966c78 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/MultiFileRegexpHeaderCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/MultiFileRegexpHeaderCheck.java @@ -166,11 +166,11 @@ protected void processFiltered(File file, FileText fileText) { * @return a MatchResult containing the result of the analysis */ private static MatchResult matchHeader(FileText fileText, HeaderFileMetadata headerFile) { - final int fileSize = fileText.size(); + final var fileSize = fileText.size(); final List headerPatterns = headerFile.headerPatterns(); - final int headerPatternSize = headerPatterns.size(); + final var headerPatternSize = headerPatterns.size(); - int mismatchLine = MISMATCH_CODE; + var mismatchLine = MISMATCH_CODE; int index; for (index = 0; index < headerPatternSize && index < fileSize; index++) { if (!headerPatterns.get(index).matcher(fileText.get(index)).find()) { 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 f5bcc2f8c91a..ab4e786687a2 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 @@ -79,18 +79,18 @@ public void setMultiLines(int... list) { @Override protected void processFiltered(File file, FileText fileText) { - final int headerSize = getHeaderLines().size(); - final int fileSize = fileText.size(); + final var headerSize = getHeaderLines().size(); + final var fileSize = fileText.size(); if (headerSize - multiLines.cardinality() > fileSize) { log(1, MSG_HEADER_MISSING); } else { - int headerLineNo = 0; + var headerLineNo = 0; int index; for (index = 0; headerLineNo < headerSize && index < fileSize; index++) { final String line = fileText.get(index); - boolean isMatch = isMatch(line, headerLineNo); + var isMatch = isMatch(line, headerLineNo); while (!isMatch && isMultiLine(headerLineNo)) { headerLineNo++; isMatch = headerLineNo == headerSize @@ -134,7 +134,7 @@ private String getHeaderLine(int headerLineNo) { * @param headerSize whole header size */ private void logFirstSinglelineLine(int startHeaderLine, int headerSize) { - for (int lineNum = startHeaderLine; lineNum < headerSize; lineNum++) { + for (var lineNum = startHeaderLine; lineNum < headerSize; lineNum++) { if (!isMultiLine(lineNum)) { log(1, MSG_HEADER_MISSING); break; 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 6fce547b1a09..19cf14b22ce1 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 @@ -119,7 +119,7 @@ public void visitToken(final DetailAST ast) { * @return true if except false if not */ private boolean isExempt(String classOrStaticMember) { - boolean exempt = false; + var exempt = false; for (String exclude : excludes) { if (classOrStaticMember.equals(exclude) @@ -140,7 +140,7 @@ private boolean isExempt(String classOrStaticMember) { * @return true if member in exclusion list */ private static boolean isStarImportOfPackage(String classOrStaticMember, String exclude) { - boolean result = false; + var result = false; if (exclude.endsWith(".*")) { // this section allows explicit imports // to be exempt when configured using 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 ed722175037e..2bae9fda6c24 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 @@ -206,7 +206,7 @@ public void visitToken(DetailAST ast) { * for illegal packages, illegal class names or illegal modules */ private boolean isIllegalImportByRegularExpressions(String importText) { - boolean result = false; + var result = false; for (Pattern pattern : illegalPkgsRegexps) { if (pattern.matcher(importText).matches()) { result = true; @@ -236,7 +236,7 @@ private boolean isIllegalImportByRegularExpressions(String importText) { * or module name */ private boolean isIllegalImportLiteral(String importText) { - boolean result = false; + var result = false; for (String element : illegalPkgs) { if (importText.startsWith(element + ".")) { result = true; 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 31d65cd7099c..2a5da5439edc 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 @@ -165,13 +165,13 @@ public void startElement(String namespaceUri, if ("import-control".equals(qName)) { final String pkg = safeGet(attributes, PKG_ATTRIBUTE_NAME); final MismatchStrategy strategyOnMismatch = getStrategyForImportControl(attributes); - final boolean regex = containsRegexAttribute(attributes); + final var regex = containsRegexAttribute(attributes); stack.push(new PkgImportControl(pkg, regex, strategyOnMismatch)); } else if (SUBPACKAGE_ELEMENT_NAME.equals(qName)) { final String name = safeGet(attributes, NAME_ATTRIBUTE_NAME); final MismatchStrategy strategyOnMismatch = getStrategyForSubpackage(attributes); - final boolean regex = containsRegexAttribute(attributes); + final var regex = containsRegexAttribute(attributes); final PkgImportControl parentImportControl = (PkgImportControl) stack.peek(); final AbstractImportControl importControl = new PkgImportControl(parentImportControl, name, regex, strategyOnMismatch); @@ -180,7 +180,7 @@ else if (SUBPACKAGE_ELEMENT_NAME.equals(qName)) { } else if (FILE_ELEMENT_NAME.equals(qName)) { final String name = safeGet(attributes, NAME_ATTRIBUTE_NAME); - final boolean regex = containsRegexAttribute(attributes); + final var regex = containsRegexAttribute(attributes); final PkgImportControl parentImportControl = (PkgImportControl) stack.peek(); final AbstractImportControl importControl = new FileImportControl(parentImportControl, name, regex); @@ -207,10 +207,10 @@ private static AbstractImportRule createImportRule(String qName, Attributes attr // Need to handle either "pkg" or "class" attribute. // May have "exact-match" for "pkg" // May have "local-only" - final boolean isAllow = ALLOW_ELEMENT_NAME.equals(qName); - final boolean isLocalOnly = attributes.getValue("local-only") != null; + final var isAllow = ALLOW_ELEMENT_NAME.equals(qName); + final var isLocalOnly = attributes.getValue("local-only") != null; final String pkg = attributes.getValue(PKG_ATTRIBUTE_NAME); - final boolean regex = containsRegexAttribute(attributes); + final var regex = containsRegexAttribute(attributes); final AbstractImportRule rule; if (pkg == null) { // handle class names which can be normal class names or regular @@ -219,7 +219,7 @@ private static AbstractImportRule createImportRule(String qName, Attributes attr rule = new ClassImportRule(isAllow, isLocalOnly, clazz, regex); } else { - final boolean exactMatch = + final var exactMatch = attributes.getValue("exact-match") != null; rule = new PkgImportRule(isAllow, isLocalOnly, pkg, exactMatch, regex); } 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 1edecacf0b15..1f7cbae03cdc 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 @@ -359,11 +359,11 @@ public void visitToken(DetailAST ast) { // using set of IF instead of SWITCH to analyze Enum options to satisfy coverage. // https://github.com/checkstyle/checkstyle/issues/1387 if (option == ImportOrderOption.TOP || option == ImportOrderOption.ABOVE) { - final boolean isStaticAndNotLastImport = isStatic && !lastImportStatic; + final var isStaticAndNotLastImport = isStatic && !lastImportStatic; doVisitToken(ident, isStatic, isStaticAndNotLastImport, ast); } else if (option == ImportOrderOption.BOTTOM || option == ImportOrderOption.UNDER) { - final boolean isLastImportAndNonStatic = lastImportStatic && !isStatic; + final var isLastImportAndNonStatic = lastImportStatic && !isStatic; doVisitToken(ident, isStatic, isLastImportAndNonStatic, ast); } else if (option == ImportOrderOption.INFLOW) { @@ -391,7 +391,7 @@ else if (option == ImportOrderOption.INFLOW) { */ private void doVisitToken(FullIdent ident, boolean isStatic, boolean previous, DetailAST ast) { final String name = ident.getText(); - final int groupIdx = getGroupNumber(isStatic && staticImportsApart, name); + final var groupIdx = getGroupNumber(isStatic && staticImportsApart, name); if (groupIdx > lastGroup) { if (!beforeFirstImport @@ -421,7 +421,7 @@ else if (groupIdx == lastGroup) { * @return true if imports groups should be separated. */ private boolean needSeparator(boolean isStatic) { - final boolean typeImportSeparator = !isStatic && separated; + final var typeImportSeparator = !isStatic && separated; final boolean staticImportSeparator; if (staticImportsApart) { staticImportSeparator = isStatic && separatedStaticGroups; @@ -429,7 +429,7 @@ private boolean needSeparator(boolean isStatic) { else { staticImportSeparator = separated; } - final boolean separatorBetween = isStatic != lastImportStatic + final var separatorBetween = isStatic != lastImportStatic && (separated || separatedStaticGroups); return typeImportSeparator || staticImportSeparator || separatorBetween; @@ -444,7 +444,7 @@ private boolean needSeparator(boolean isStatic) { * @return true if imports group are separated internally. */ private boolean isSeparatorInGroup(int groupIdx, boolean isStatic, int line) { - final boolean inSameGroup = groupIdx == lastGroup; + final var inSameGroup = groupIdx == lastGroup; return (inSameGroup || !needSeparator(isStatic)) && isSeparatorBeforeImport(line); } @@ -476,7 +476,7 @@ private void doVisitTokenInSameGroup(boolean isStatic, } } else { - final boolean shouldFireError = + final var shouldFireError = // previous non-static but current is static (above) // or // previous static but current is non-static (under) @@ -585,7 +585,7 @@ private static int compareContainerOrder(String importName1, String importName2, * @return import container name. */ private static String getImportContainer(String qualifiedImportName) { - final int lastDotIndex = qualifiedImportName.lastIndexOf('.'); + final var lastDotIndex = qualifiedImportName.lastIndexOf('.'); return qualifiedImportName.substring(0, lastDotIndex); } @@ -605,7 +605,7 @@ private int getGroupNumber(boolean isStatic, String name) { patterns = groupsReg; } - int number = getGroupNumber(patterns, name); + var number = getGroupNumber(patterns, name); if (isStatic && option == ImportOrderOption.BOTTOM) { number += groups.length + 1; @@ -624,13 +624,13 @@ else if (!isStatic && option == ImportOrderOption.TOP) { * @return group number for given import name. */ private static int getGroupNumber(Pattern[] patterns, String name) { - int bestIndex = patterns.length; - int bestEnd = -1; - int bestPos = Integer.MAX_VALUE; + var bestIndex = patterns.length; + var bestEnd = -1; + var bestPos = Integer.MAX_VALUE; // find out what group this belongs in // loop over patterns and get index - for (int i = 0; i < patterns.length; i++) { + for (var i = 0; i < patterns.length; i++) { final Matcher matcher = patterns[i].matcher(name); if (matcher.find()) { if (matcher.start() < bestPos) { @@ -683,7 +683,7 @@ private static int compare(String string1, String string2, */ private static Pattern[] compilePatterns(String... packageGroups) { final Pattern[] patterns = new Pattern[packageGroups.length]; - for (int i = 0; i < packageGroups.length; i++) { + for (var i = 0; i < packageGroups.length; i++) { String pkg = packageGroups[i]; final Pattern grp; 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 c05ebbbcc5cb..76e04e7bb64b 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 @@ -242,7 +242,7 @@ private boolean matchesAtFront(String pkg) { * @return if it matches. */ private boolean matchesAtFrontNoRegex(String pkg) { - final int length = fullPackageName.length(); + final var length = fullPackageName.length(); return pkg.startsWith(fullPackageName) && (pkg.length() == length || pkg.charAt(length) == '.'); } 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 49f8a8f71595..7ef8bdc92b99 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 @@ -152,7 +152,7 @@ private static boolean isFromPackage(String importName, String pkg) { // imports from unnamed package are not allowed: // https://docs.oracle.com/javase/specs/jls/se7/html/jls-7.html#jls-7.5 // So '.' must be present in member name and we are not checking for it - final int index = importName.lastIndexOf('.'); + final var index = importName.lastIndexOf('.'); final String front = importName.substring(0, index); return pkg.equals(front); } 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 832f575a4410..0565230fb1b3 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 @@ -255,9 +255,9 @@ private boolean isUnusedImport(String imprt) { */ private void processIdent(DetailAST ast) { final DetailAST parent = ast.getParent(); - final int parentType = parent.getType(); + final var parentType = parent.getType(); - final boolean isClassOrMethod = parentType == TokenTypes.DOT + final var isClassOrMethod = parentType == TokenTypes.DOT || parentType == TokenTypes.METHOD_DEF || parentType == TokenTypes.METHOD_REF; if (TokenUtil.isTypeDeclaration(parentType)) { @@ -276,12 +276,12 @@ else if (!isClassOrMethod || isQualifiedIdentifier(ast)) { */ private static boolean isQualifiedIdentifier(DetailAST ast) { final DetailAST parent = ast.getParent(); - final int parentType = parent.getType(); + final var parentType = parent.getType(); - final boolean isQualifiedIdent = parentType == TokenTypes.DOT + final var isQualifiedIdent = parentType == TokenTypes.DOT && !TokenUtil.isOfType(ast.getPreviousSibling(), TokenTypes.DOT) && ast.getNextSibling() != null; - final boolean isQualifiedIdentFromMethodRef = parentType == TokenTypes.METHOD_REF + final var isQualifiedIdentFromMethodRef = parentType == TokenTypes.METHOD_REF && ast.getNextSibling() != null; return isQualifiedIdent || isQualifiedIdentFromMethodRef; } @@ -321,7 +321,7 @@ private void processStaticImport(DetailAST ast) { @SuppressWarnings("deprecation") private void collectReferencesFromJavadoc(DetailAST ast) { final FileContents contents = getFileContents(); - final int lineNo = ast.getLineNo(); + final var lineNo = ast.getLineNo(); final TextBlock textBlock = contents.getJavadocBefore(lineNo); if (textBlock != null) { currentFrame.addReferencedTypes(collectReferencesFromJavadoc(textBlock)); @@ -416,7 +416,7 @@ private static Set matchPattern(String identifier, Pattern pattern) { */ private static String topLevelType(String type) { final String topLevelType; - final int dotIndex = type.indexOf('.'); + final var dotIndex = type.indexOf('.'); if (dotIndex == -1) { topLevelType = type; } @@ -438,8 +438,8 @@ private static String topLevelType(String type) { */ private static boolean isMatchingTagType(JavadocTag tag, JavadocUtil.JavadocTagType javadocTagType) { - final boolean isInlineTag = tag.isInlineTag(); - final boolean isBlockTagType = javadocTagType == JavadocUtil.JavadocTagType.BLOCK; + final var isInlineTag = tag.isInlineTag(); + final var isBlockTagType = javadocTagType == JavadocUtil.JavadocTagType.BLOCK; return isBlockTagType != isInlineTag; } @@ -453,7 +453,7 @@ private static boolean isMatchingTagType(JavadocTag tag, */ public static Optional bestTryToMatchReference(JavadocTag tag) { final String content = tag.getFirstArg(); - final int referenceIndex = extractReferencePart(content); + final var referenceIndex = extractReferencePart(content); Optional validTag = Optional.empty(); if (referenceIndex != -1) { @@ -466,9 +466,9 @@ public static Optional bestTryToMatchReference(JavadocTag tag) { } final Matcher matcher = REFERENCE.matcher(referenceString); if (matcher.matches()) { - final int methodIndex = 3; + final var methodIndex = 3; final String methodPart = matcher.group(methodIndex); - final boolean isValid = methodPart == null + final var isValid = methodPart == null || METHOD.matcher(methodPart).matches(); if (isValid) { validTag = Optional.of(tag); @@ -486,10 +486,10 @@ public static Optional bestTryToMatchReference(JavadocTag tag) { * or the index of the first space outside parentheses. */ private static @IndexOrLow("#1")int extractReferencePart(String input) { - int parenthesesCount = 0; - int firstSpaceOutsideParens = -1; - for (int index = 0; index < input.length(); index++) { - final char currentCharacter = input.charAt(index); + var parenthesesCount = 0; + var firstSpaceOutsideParens = -1; + for (var index = 0; index < input.length(); index++) { + final var currentCharacter = input.charAt(index); if (currentCharacter == '(') { parenthesesCount++; @@ -503,7 +503,7 @@ else if (currentCharacter == ' ' && parenthesesCount == 0) { } } - int methodIndex = -1; + var methodIndex = -1; if (parenthesesCount == 0) { if (firstSpaceOutsideParens == -1) { methodIndex = 0; 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 ab8f90b7b7da..d1978f801cee 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 @@ -234,7 +234,7 @@ protected final int getLineStart(int lineNo) { * @return the start of the specified line */ private int getLineStart(String line) { - int index = 0; + var index = 0; while (Character.isWhitespace(line.charAt(index))) { index++; } @@ -250,7 +250,7 @@ private int getLineStart(String line) { * false otherwise */ protected boolean shouldIncreaseIndent() { - boolean result = true; + var result = true; if (TokenUtil.isOfType(mainAst, TokenTypes.LITERAL_CATCH)) { final DetailAST parameterAst = mainAst.findFirstToken(TokenTypes.PARAMETER_DEF); result = !AnnotationUtil.containsAnnotation(parameterAst); @@ -275,9 +275,9 @@ private void checkLinesIndent(DetailAstSet astSet, if (!astSet.isEmpty()) { // check first line final DetailAST startLineAst = astSet.firstLine(); - int startCol = expandedTabsColumnNo(startLineAst); + var startCol = expandedTabsColumnNo(startLineAst); - final int realStartCol = + final var realStartCol = getLineStart(indentCheck.getLine(startLineAst.getLineNo() - 1)); if (firstLineMatches && !allowNesting) { @@ -312,7 +312,7 @@ private void checkRemainingLines(boolean firstLineMatches, // doesn't start the line) then don't indent more, the first // indentation is absorbed by the nesting final DetailAST startLineAst = astSet.firstLine(); - final int endLine = astSet.lastLine(); + final var endLine = astSet.lastLine(); IndentLevel level = indentLevel; if (shouldIncreaseIndent() @@ -323,7 +323,7 @@ private void checkRemainingLines(boolean firstLineMatches, } // check following lines - for (int index = startLineAst.getLineNo() + 1; index <= endLine; index++) { + for (var index = startLineAst.getLineNo() + 1; index <= endLine; index++) { final Integer col = astSet.getStartColumn(index); // startCol could be null if this line didn't have an // expression that was required to be checked (it could be @@ -345,8 +345,8 @@ private void checkRemainingLines(boolean firstLineMatches, private void checkLineIndent(DetailAST ast, IndentLevel indentLevel, boolean mustMatch) { final String line = indentCheck.getLine(ast.getLineNo() - 1); - final int start = getLineStart(line); - final int columnNumber = expandedTabsColumnNo(ast); + final var start = getLineStart(line); + final var columnNumber = expandedTabsColumnNo(ast); // if must match is set, it is a violation if the line start is not // at the correct indention level; otherwise, it is an only a // violation if this statement starts the line and it is less than @@ -426,7 +426,7 @@ protected final void checkExpressionSubtree( boolean allowNesting ) { final DetailAstSet subtreeAst = new DetailAstSet(indentCheck); - final int firstLine = getFirstLine(tree); + final var firstLine = getFirstLine(tree); if (firstLineMatches && !allowNesting) { final DetailAST firstAst = getFirstAstNode(tree); subtreeAst.addAst(firstAst); @@ -499,10 +499,10 @@ protected final int expandedTabsColumnNo(DetailAST ast) { protected final void findSubtreeAst(DetailAstSet astSet, DetailAST tree, boolean allowNesting) { if (!indentCheck.getHandlerFactory().isHandledType(tree.getType())) { - final int lineNum = tree.getLineNo(); + final var lineNum = tree.getLineNo(); final Integer colNum = astSet.getStartColumn(lineNum); - final int thisLineColumn = expandedTabsColumnNo(tree); + final var thisLineColumn = expandedTabsColumnNo(tree); if (colNum == null || thisLineColumn < colNum) { astSet.addAst(tree); } @@ -589,9 +589,9 @@ protected final void checkRightParen(DetailAST lparen, DetailAST rparen) { if (rparen != null) { // the rcurly can either be at the correct indentation, // or not first on the line - final int rparenLevel = expandedTabsColumnNo(rparen); + final var rparenLevel = expandedTabsColumnNo(rparen); // or has + 1 indentation - final int lparenLevel = expandedTabsColumnNo(lparen); + final var lparenLevel = expandedTabsColumnNo(lparen); if (rparenLevel != lparenLevel + 1 && !getIndent().isAcceptable(rparenLevel) 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 7ed19d3a5561..e576acef380e 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 @@ -64,7 +64,7 @@ protected DetailAST getLeftCurly() { @Override protected IndentLevel curlyIndent() { - int offset = 0; + var offset = 0; final DetailAST lcurly = getLeftCurly(); if (isOnStartOfLine(lcurly)) { @@ -97,9 +97,9 @@ protected IndentLevel getChildrenExpectedIndent() { new IndentLevel(getIndent(), getArrayInitIndentation(), getLineWrappingIndentation()); final DetailAST leftCurly = getLeftCurly(); - final int firstLine = getFirstLine(getListChild()); - final int lcurlyPos = expandedTabsColumnNo(leftCurly); - final int firstChildPos = + final var firstLine = getFirstLine(getListChild()); + final var lcurlyPos = expandedTabsColumnNo(leftCurly); + final var firstChildPos = getNextFirstNonBlankOnLineAfter(firstLine, lcurlyPos); // the code is written with old style where curlies are given their own line, @@ -130,9 +130,9 @@ protected IndentLevel getChildrenExpectedIndent() { * such char doesn't exist. */ private int getNextFirstNonBlankOnLineAfter(int lineNo, int columnNo) { - int realColumnNo = columnNo + 1; + var realColumnNo = columnNo + 1; final String line = getIndentCheck().getLines()[lineNo - 1]; - final int lineLength = line.length(); + final var lineLength = line.length(); while (realColumnNo < lineLength && Character.isWhitespace(line.charAt(realColumnNo))) { realColumnNo++; 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 3d47458381dc..e6effc71146b 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 @@ -49,7 +49,7 @@ public ArrayInitHandler(IndentationCheck indentCheck, @Override protected IndentLevel getIndentImpl() { final DetailAST parentAST = getMainAst().getParent(); - final int type = parentAST.getType(); + final var type = parentAST.getType(); final IndentLevel indentLevel; if (type == TokenTypes.LITERAL_NEW || type == TokenTypes.ASSIGN) { // note: assumes new or assignment is line to align with @@ -74,7 +74,7 @@ protected DetailAST getLeftCurly() { @Override protected IndentLevel curlyIndent() { - int offset = 0; + var offset = 0; final DetailAST lcurly = getLeftCurly(); @@ -109,9 +109,9 @@ protected IndentLevel getChildrenExpectedIndent() { new IndentLevel(getIndent(), getIndentCheck().getArrayInitIndent(), getIndentCheck().getLineWrappingIndentation()); - final int firstLine = getFirstLine(getListChild()); - final int lcurlyPos = expandedTabsColumnNo(getLeftCurly()); - final int firstChildPos = + final var firstLine = getFirstLine(getListChild()); + final var lcurlyPos = expandedTabsColumnNo(getLeftCurly()); + final var firstChildPos = getNextFirstNonBlankOnLineAfter(firstLine, lcurlyPos); if (firstChildPos != NOT_EXIST) { @@ -134,9 +134,9 @@ protected IndentLevel getChildrenExpectedIndent() { * such char doesn't exist. */ private int getNextFirstNonBlankOnLineAfter(int lineNo, int columnNo) { - int realColumnNo = columnNo + 1; + var realColumnNo = columnNo + 1; final String line = getIndentCheck().getLines()[lineNo - 1]; - final int lineLength = line.length(); + final var lineLength = line.length(); while (realColumnNo < lineLength && Character.isWhitespace(line.charAt(realColumnNo))) { realColumnNo++; 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 a6292c1922c4..5bc719d34ad9 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 @@ -141,7 +141,7 @@ private void checkLeftCurly() { // the lcurly can either be at the correct indentation, or nested // with a previous expression final DetailAST lcurly = getLeftCurly(); - final int lcurlyPos = expandedTabsColumnNo(lcurly); + final var lcurlyPos = expandedTabsColumnNo(lcurly); if (!curlyIndent().isAcceptable(lcurlyPos) && isOnStartOfLine(lcurly)) { logError(lcurly, "lcurly", lcurlyPos, curlyIndent()); @@ -187,7 +187,7 @@ protected boolean canChildrenBeNested() { */ private void checkRightCurly() { final DetailAST rcurly = getRightCurly(); - final int rcurlyPos = expandedTabsColumnNo(rcurly); + final var rcurlyPos = expandedTabsColumnNo(rcurly); if (!curlyIndent().isAcceptable(rcurlyPos) && isOnStartOfLine(rcurly)) { 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 44685ffe98e3..a9759713c2dd 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 @@ -74,7 +74,7 @@ public void checkIndentation() { else { if (getMainAst().getType() != TokenTypes.ANNOTATION_DEF) { final DetailAST ident = getMainAst().findFirstToken(TokenTypes.IDENT); - final int lineStart = getLineStart(ident); + final var lineStart = getLineStart(ident); if (!getIndent().isAcceptable(lineStart)) { logError(ident, "ident", lineStart); } @@ -112,7 +112,7 @@ protected int[] getCheckedChildren() { * @return handler name for this class. */ private static String getHandlerName(DetailAST ast) { - final int tokenType = ast.getType(); + final var tokenType = ast.getType(); return switch (tokenType) { case TokenTypes.CLASS_DEF -> "class def"; 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 8be2e801e780..97f542eead92 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 @@ -190,7 +190,7 @@ private boolean isDistributedExpression(DetailAST comment) { while (previousSibling != null && isComment(previousSibling)) { previousSibling = previousSibling.getPreviousSibling(); } - boolean isDistributed = false; + var isDistributed = false; if (previousSibling != null) { if (previousSibling.getType() == TokenTypes.SEMI && isOnPreviousLineIgnoringComments(comment, previousSibling)) { @@ -243,7 +243,7 @@ private static boolean isDefinition(DetailAST previousSibling) { * @return true if the previous statement of a comment is a distributed return statement. */ private static boolean isDistributedReturnStatement(DetailAST commentPreviousSibling) { - boolean isDistributed = false; + var isDistributed = false; if (commentPreviousSibling != null && commentPreviousSibling.getType() == TokenTypes.LITERAL_RETURN) { final DetailAST firstChild = commentPreviousSibling.getFirstChild(); @@ -262,7 +262,7 @@ private static boolean isDistributedReturnStatement(DetailAST commentPreviousSib * @return true if the previous statement of a comment is a distributed throw statement. */ private static boolean isDistributedThrowStatement(DetailAST commentPreviousSibling) { - boolean isDistributed = false; + var isDistributed = false; if (commentPreviousSibling != null && commentPreviousSibling.getType() == TokenTypes.LITERAL_THROW) { final DetailAST firstChild = commentPreviousSibling.getFirstChild(); @@ -495,7 +495,7 @@ else if (isCommentForMultiblock(nextStmt)) { } } else if (!areSameLevelIndented(comment, prevStmt, prevStmt)) { - final int prevStmtLineNo = prevStmt.getLineNo(); + final var prevStmtLineNo = prevStmt.getLineNo(); log(comment, getMessageKey(comment), prevStmtLineNo, comment.getColumnNo(), getLineStart(prevStmtLineNo)); } @@ -511,7 +511,7 @@ else if (!areSameLevelIndented(comment, prevStmt, prevStmt)) { */ private static boolean isCommentForMultiblock(DetailAST endBlockStmt) { final DetailAST nextBlock = endBlockStmt.getParent().getNextSibling(); - final int endBlockLineNo = endBlockStmt.getLineNo(); + final var endBlockLineNo = endBlockStmt.getLineNo(); final DetailAST catchAst = endBlockStmt.getParent().getParent(); final DetailAST finallyAst = catchAst.getNextSibling(); return nextBlock != null && nextBlock.getLineNo() == endBlockLineNo @@ -590,7 +590,7 @@ private DetailAST getOneLinePreviousStatement(DetailAST comment) { * @return true if the ast is a comment. */ private static boolean isComment(DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); return astType == TokenTypes.SINGLE_LINE_COMMENT || astType == TokenTypes.BLOCK_COMMENT_BEGIN || astType == TokenTypes.COMMENT_CONTENT @@ -707,7 +707,7 @@ private static DetailAST findStartTokenOfMethodCallChain(DetailAST root) { private boolean isOnPreviousLineIgnoringComments(DetailAST currentStatement, DetailAST checkedStatement) { DetailAST nextToken = getNextToken(checkedStatement); - int distanceAim = 1; + var distanceAim = 1; if (nextToken != null && isComment(nextToken)) { distanceAim += countEmptyLines(checkedStatement, currentStatement); } @@ -752,10 +752,10 @@ private DetailAST getNextToken(DetailAST checkedStatement) { * @return the number of empty lines between statements. */ private int countEmptyLines(DetailAST startStatement, DetailAST endStatement) { - int emptyLinesNumber = 0; + var emptyLinesNumber = 0; final String[] lines = getLines(); - final int endLineNo = endStatement.getLineNo(); - for (int lineNo = startStatement.getLineNo(); lineNo < endLineNo; lineNo++) { + final var endLineNo = endStatement.getLineNo(); + for (var lineNo = startStatement.getLineNo(); lineNo < endLineNo; lineNo++) { if (CommonUtil.isBlank(lines[lineNo])) { emptyLinesNumber++; } @@ -908,7 +908,7 @@ private boolean areSameLevelIndented(DetailAST comment, DetailAST prevStmt, */ private int getLineStart(int lineNo) { final char[] line = getLines()[lineNo - 1].toCharArray(); - int lineStart = 0; + var lineStart = 0; while (Character.isWhitespace(line[lineStart])) { lineStart++; } @@ -946,7 +946,7 @@ private boolean isTrailingComment(DetailAST comment) { */ private boolean isTrailingSingleLineComment(DetailAST singleLineComment) { final String targetSourceLine = getLine(singleLineComment.getLineNo() - 1); - final int commentColumnNo = singleLineComment.getColumnNo(); + final var commentColumnNo = singleLineComment.getColumnNo(); return !CommonUtil.hasWhitespaceBefore(commentColumnNo, targetSourceLine); } @@ -965,7 +965,7 @@ private boolean isTrailingSingleLineComment(DetailAST singleLineComment) { */ private boolean isTrailingBlockComment(DetailAST blockComment) { final String commentLine = getLine(blockComment.getLineNo() - 1); - final int commentColumnNo = blockComment.getColumnNo(); + final var commentColumnNo = blockComment.getColumnNo(); final DetailAST nextSibling = blockComment.getNextSibling(); return !CommonUtil.hasWhitespaceBefore(commentColumnNo, commentLine) || nextSibling != null && TokenUtil.areOnSameLine(nextSibling, blockComment); 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 664e6965fb9f..ba0dd7cad07b 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 @@ -129,7 +129,7 @@ public boolean isHandledType(int type) { public int[] getHandledTypes() { final Set typeSet = typeHandlers.keySet(); final int[] types = new int[typeSet.size()]; - int index = 0; + var index = 0; for (final Integer val : typeSet) { types[index] = val; index++; 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 51de946044dc..84dd8444b78e 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 @@ -43,7 +43,7 @@ public ImportHandler(IndentationCheck indentCheck, @Override public void checkIndentation() { - final int columnNo = expandedTabsColumnNo(getMainAst()); + final var columnNo = expandedTabsColumnNo(getMainAst()); if (!getIndent().isAcceptable(columnNo) && isOnStartOfLine(getMainAst())) { logError(getMainAst(), "", columnNo); 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 736859fde070..7ab65fd42e56 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 @@ -48,7 +48,7 @@ public IndentLevel(int indent) { */ public IndentLevel(IndentLevel base, int... offsets) { final BitSet src = base.levels; - for (int i = src.nextSetBit(0); i >= 0; i = src.nextSetBit(i + 1)) { + for (var i = src.nextSetBit(0); i >= 0; i = src.nextSetBit(i + 1)) { for (int offset : offsets) { levels.set(i + offset); } @@ -150,7 +150,7 @@ public String toString() { } else { final StringBuilder sb = new StringBuilder(50); - for (int i = levels.nextSetBit(0); i >= 0; + for (var i = levels.nextSetBit(0); i >= 0; i = levels.nextSetBit(i + 1)) { if (!sb.isEmpty()) { sb.append(", "); 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 647ab291860e..fe815b5d6831 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 @@ -116,11 +116,11 @@ public void checkIndentation() { // If the "->" has no children, it is a switch // rule lambda (i.e. 'case ONE -> 1;') - final boolean isSwitchRuleLambda = firstChild == null; + final var isSwitchRuleLambda = firstChild == null; if (!isSwitchRuleLambda && getLineStart(firstChild) == expandedTabsColumnNo(firstChild)) { - final int firstChildColumnNo = expandedTabsColumnNo(firstChild); + final var firstChildColumnNo = expandedTabsColumnNo(firstChild); final IndentLevel level = getIndent(); if (isNonAcceptableIndent(firstChildColumnNo, level)) { @@ -130,8 +130,8 @@ && getLineStart(firstChild) == expandedTabsColumnNo(firstChild)) { } // If the "->" is the first element on the line, assume line wrapping. - final int mainAstColumnNo = expandedTabsColumnNo(mainAst); - final boolean isLineWrappedLambda = mainAstColumnNo == getLineStart(mainAst); + final var mainAstColumnNo = expandedTabsColumnNo(mainAst); + final var isLineWrappedLambda = mainAstColumnNo == getLineStart(mainAst); if (isLineWrappedLambda) { checkLineWrappedLambda(isSwitchRuleLambda, mainAstColumnNo); } @@ -178,7 +178,7 @@ private void checkLineWrappedLambda(final boolean isSwitchRuleLambda, // on the previous line and use that to determine the correct // indentation for the line wrapped "->" final DetailAST previousSibling = mainAst.getPreviousSibling(); - final int previousLineStart = getLineStart(previousSibling); + final var previousLineStart = getLineStart(previousSibling); level = new IndentLevel(new IndentLevel(previousLineStart), getIndentCheck().getLineWrappingIndentation()); @@ -219,7 +219,7 @@ private void checkSingleStatementSwitchRuleIndentation(boolean isLambdaFirstInLi // The first line should not match if the switch rule statement starts on the same line // as "->" but continues onto the next lines as part of a single logical expression. final DetailAST nextSibling = mainAst.getNextSibling(); - final boolean firstLineMatches = getFirstLine(nextSibling) != mainAst.getLineNo(); + final var firstLineMatches = getFirstLine(nextSibling) != mainAst.getLineNo(); checkExpressionSubtree(nextSibling, level, firstLineMatches, false); } 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 2017753d92f8..39ad8c4b2f5a 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 @@ -161,10 +161,10 @@ public void checkIndentation(DetailAST firstNode, DetailAST lastNode, int indent else { firstNodeIndent = startIndent; } - final int currentIndent = firstNodeIndent + indentLevel; + final var currentIndent = firstNodeIndent + indentLevel; for (DetailAST node : firstNodesOnLines.values()) { - final int currentType = node.getType(); + final var currentType = node.getType(); if (checkForNullParameterChild(node) || checkForMethodLparenNewLine(node) || !shouldProcessTextBlockLiteral(node)) { continue; @@ -221,7 +221,7 @@ public static boolean checkForNullParameterChild(DetailAST node) { * @return true if method lparen starts from a new line. */ public static boolean checkForMethodLparenNewLine(DetailAST node) { - final int parentType = node.getParent().getType(); + final var parentType = node.getParent().getType(); return parentType == TokenTypes.METHOD_DEF && node.getType() == TokenTypes.LPAREN; } @@ -315,20 +315,20 @@ private static DetailAST getNextCurNode(DetailAST curNode) { */ private void checkAnnotationIndentation(DetailAST atNode, NavigableMap firstNodesOnLines, int indentLevel) { - final int firstNodeIndent = getLineStart(atNode); - final int currentIndent = firstNodeIndent + indentLevel; + final var firstNodeIndent = getLineStart(atNode); + final var currentIndent = firstNodeIndent + indentLevel; final Collection values = firstNodesOnLines.values(); final DetailAST lastAnnotationNode = atNode.getParent().getLastChild(); - final int lastAnnotationLine = lastAnnotationNode.getLineNo(); + final var lastAnnotationLine = lastAnnotationNode.getLineNo(); final Iterator itr = values.iterator(); while (firstNodesOnLines.size() > 1) { final DetailAST node = itr.next(); final DetailAST parentNode = node.getParent(); - final boolean isArrayInitPresentInAncestors = + final var isArrayInitPresentInAncestors = isParentContainsTokenType(node, TokenTypes.ANNOTATION_ARRAY_INIT); - final boolean isCurrentNodeCloseAnnotationAloneInLine = + final var isCurrentNodeCloseAnnotationAloneInLine = node.getLineNo() == lastAnnotationLine && isEndOfScope(lastAnnotationNode, node); if (!isArrayInitPresentInAncestors @@ -357,7 +357,7 @@ else if (!isArrayInitPresentInAncestors) { */ private static boolean isEndOfScope(final DetailAST lastAnnotationNode, final DetailAST node) { DetailAST checkNode = node; - boolean endOfScope = true; + var endOfScope = true; while (endOfScope && !checkNode.equals(lastAnnotationNode)) { switch (checkNode.getType()) { case TokenTypes.RCURLY, TokenTypes.RBRACK -> { @@ -381,7 +381,7 @@ private static boolean isEndOfScope(final DetailAST lastAnnotationNode, final De * @return true if there is a parent of given type */ private static boolean isParentContainsTokenType(final DetailAST node, int type) { - boolean returnValue = false; + var returnValue = false; for (DetailAST ast = node.getParent(); ast != null; ast = ast.getParent()) { if (ast.getType() == type) { returnValue = true; @@ -426,7 +426,7 @@ private int getLineStart(DetailAST ast) { * @return the start of the specified line */ private int getLineStart(String line) { - int index = 0; + var index = 0; while (Character.isWhitespace(line.charAt(index))) { index++; } 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 2be5871fe077..b258618e7fba 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 @@ -97,7 +97,7 @@ protected void checkModifiers() { private void checkType() { final DetailAST type = getMainAst().findFirstToken(TokenTypes.TYPE); final DetailAST ident = AbstractExpressionHandler.getFirstToken(type); - final int columnNo = expandedTabsColumnNo(ident); + final var columnNo = expandedTabsColumnNo(ident); if (isOnStartOfLine(ident) && !getIndent().isAcceptable(columnNo)) { logError(ident, "type", columnNo); } 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 36f7e0b49f6b..fc8643e3405a 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 @@ -74,8 +74,8 @@ else if (getMainAst().getFirstChild().getType() == TokenTypes.LITERAL_NEW) { // of the line final DetailAstSet astSet = new DetailAstSet(indentCheck); findSubtreeAst(astSet, getMainAst().getFirstChild(), true); - final int firstCol = expandedTabsColumnNo(astSet.firstLine()); - final int lineStart = getLineStart(getFirstAst(getMainAst())); + final var firstCol = expandedTabsColumnNo(astSet.firstLine()); + final var lineStart = getLineStart(getFirstAst(getMainAst())); if (lineStart == firstCol) { indentLevel = super.getIndentImpl(); } 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 ceb54d383b99..0558ebb9775c 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 @@ -80,7 +80,7 @@ private void checkThrows() { */ private static int getMethodDefLineStart(DetailAST mainAst) { // get first type position - int lineStart = mainAst.findFirstToken(TokenTypes.IDENT).getLineNo(); + var lineStart = mainAst.findFirstToken(TokenTypes.IDENT).getLineNo(); // check if there is a type before the indent final DetailAST typeNode = mainAst.findFirstToken(TokenTypes.TYPE); 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 ab976e581966..13fa9c381485 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 @@ -50,10 +50,10 @@ public NewHandler(IndentationCheck indentCheck, public void checkIndentation() { // if new is on the line start and it is not the part of assignment. if (isOnStartOfLine(mainAst)) { - final int columnNo = expandedTabsColumnNo(mainAst); + final var columnNo = expandedTabsColumnNo(mainAst); final IndentLevel level = getIndentImpl(); - final boolean forceStrictCondition = getIndentCheck().isForceStrictCondition(); + final var forceStrictCondition = getIndentCheck().isForceStrictCondition(); if (forceStrictCondition && !level.isAcceptable(columnNo) || !forceStrictCondition && level.isGreaterThan(columnNo)) { logError(mainAst, "", columnNo, level); @@ -84,9 +84,9 @@ public void checkIndentation() { * @return true if nested new is present. */ public boolean checkNestedNew(DetailAST expression) { - boolean result = false; + var result = false; if (expression != null && expression.getFirstChild() != null) { - final boolean isNestedNewPresent = expression.getFirstChild() + final var isNestedNewPresent = expression.getFirstChild() .findFirstToken(TokenTypes.LITERAL_NEW) != null; if (!isNestedNewPresent) { result = true; @@ -115,7 +115,7 @@ protected IndentLevel getIndentImpl() { if (getLineStart(mainAst) == mainAst.getColumnNo()) { result = super.getIndentImpl(); - final boolean isLineWrappedNew = TokenUtil.isOfType(mainAst.getParent().getParent(), + final var isLineWrappedNew = TokenUtil.isOfType(mainAst.getParent().getParent(), TokenTypes.ASSIGN, TokenTypes.LITERAL_RETURN); if (isLineWrappedNew || doesChainedMethodNeedsLineWrapping()) { 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 e409d6496eb3..c9c4baf9dcab 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 @@ -43,7 +43,7 @@ public PackageDefHandler(IndentationCheck indentCheck, @Override public void checkIndentation() { - final int columnNo = expandedTabsColumnNo(getMainAst()); + final var columnNo = expandedTabsColumnNo(getMainAst()); if (!getIndent().isAcceptable(columnNo) && isOnStartOfLine(getMainAst())) { logError(getMainAst(), "", columnNo); 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 f7e1edcf2abf..ceff6b57ddca 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 @@ -114,7 +114,7 @@ protected DetailAST getTopLevelAst() { * @return true if it does, false otherwise */ private boolean hasBlockParent() { - final int parentType = getMainAst().getParent().getType(); + final var parentType = getMainAst().getParent().getType(); return PARENT_TOKEN_TYPES.get(parentType); } 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 4a7e41ac4601..4ad293f14904 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 @@ -117,14 +117,14 @@ private boolean shouldIndentDueToWrapping(DetailAST directParent, DetailAST gran // The enclosing handler node that already determines base indentation // (e.g., method declaration containing our current node) final DetailAST enclosingHandlerNode = getParent().getMainAst(); - final boolean isDirectParentTheHandler = directParent.equals(enclosingHandlerNode); + final var isDirectParentTheHandler = directParent.equals(enclosingHandlerNode); - final boolean shouldIndentForDirectParent = !isDirectParentTheHandler + final var shouldIndentForDirectParent = !isDirectParentTheHandler && isWrappingTrigger(directParent); // Check if grandparent requires extra indentation (when // neither it nor direct parent is the handler) - final boolean shouldIndentForGrandParent = !isDirectParentTheHandler + final var shouldIndentForGrandParent = !isDirectParentTheHandler && !grandParent.equals(enclosingHandlerNode) && isWrappingTrigger(grandParent); 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 9dc3f3a6bf68..e4ca910e4c9c 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 @@ -131,7 +131,7 @@ private void checkChildIndentation(DetailAST ast, String subType, IndentLevel ex */ private void checkTryResources(final DetailAST resourcesSpecAst) { final DetailAST resourcesAst = resourcesSpecAst.findFirstToken(TokenTypes.RESOURCES); - final int indentation = getIndent().getFirstIndentLevel() + final var indentation = getIndent().getFirstIndentLevel() + getIndentCheck().getLineWrappingIndentation(); final IndentLevel expectedResourceIndent = new IndentLevel(indentation); @@ -173,7 +173,7 @@ private void checkTryResources(final DetailAST resourcesSpecAst) { * @return if the expression provided is try block's resource specification. */ private static boolean isTryBlocksResourceSpecification(AbstractExpressionHandler expression) { - boolean isResourceSpecificationExpression = false; + var isResourceSpecificationExpression = false; DetailAST ast = expression.getMainAst(); 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 151f047e03fb..850ade81aa7e 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 @@ -55,7 +55,7 @@ public void checkIndentation() { */ private void checkYield() { final DetailAST yieldKey = getMainAst(); - final int columnNo = expandedTabsColumnNo(yieldKey); + final var columnNo = expandedTabsColumnNo(yieldKey); if (isOnStartOfLine(yieldKey) && !getIndent().isAcceptable(columnNo)) { logError(yieldKey, "", columnNo); } 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 2c424cf2d214..a72ff413094a 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 @@ -307,7 +307,7 @@ public final void visitToken(DetailAST blockCommentNode) { // store as field, to share with child Checks context.get().blockCommentAst = blockCommentNode; - final int treeCacheKey = blockCommentNode.getLineNo(); + final var treeCacheKey = blockCommentNode.getLineNo(); final ParseStatus result = TREE_CACHE.get() .computeIfAbsent(treeCacheKey, lineNumber -> { @@ -364,7 +364,7 @@ private void processTree(DetailNode root) { private void walk(DetailNode root) { DetailNode curNode = root; while (curNode != null) { - boolean waitsForProcessing = shouldBeProcessed(curNode); + var waitsForProcessing = shouldBeProcessed(curNode); if (waitsForProcessing) { visitJavadocToken(curNode); 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 e4d4d4919ca4..7e7e7b28184f 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 @@ -127,7 +127,7 @@ public int[] getRequiredJavadocTokens() { @Override public void visitJavadocToken(DetailNode ast) { - final int parentType = getParentType(getBlockCommentAst()); + final var parentType = getParentType(getBlockCommentAst()); if (target.get(parentType)) { checkOrderInTagSection(ast); @@ -140,13 +140,13 @@ public void visitJavadocToken(DetailNode ast) { * @param javadoc Javadoc root node. */ private void checkOrderInTagSection(DetailNode javadoc) { - int maxIndexOfPreviousTag = 0; + var maxIndexOfPreviousTag = 0; DetailNode node = javadoc.getFirstChild(); while (node != null) { if (node.getType() == JavadocCommentsTokenTypes.JAVADOC_BLOCK_TAG) { final String tagText = JavadocUtil.getTagName(node); - final int indexOfCurrentTag = tagOrder.indexOf("@" + tagText); + final var indexOfCurrentTag = tagOrder.indexOf("@" + tagText); if (indexOfCurrentTag != -1) { if (indexOfCurrentTag < maxIndexOfPreviousTag) { @@ -169,7 +169,7 @@ private void checkOrderInTagSection(DetailNode javadoc) { */ private static int getParentType(DetailAST commentBlock) { final DetailAST parentNode = commentBlock.getParent(); - int result = parentNode.getType(); + var result = parentNode.getType(); if (result == TokenTypes.TYPE || result == TokenTypes.MODIFIERS) { result = parentNode.getParent().getType(); } 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 ac312ffafd04..824057c2655f 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 @@ -138,8 +138,8 @@ public String toString() { * @return text of the tag */ public String getText() { - final int startOfText = position; - final int endOfText = Math.min(startOfText + MAX_TEXT_LEN, text.length()); + final var startOfText = position; + final var endOfText = Math.min(startOfText + MAX_TEXT_LEN, text.length()); return text.substring(startOfText, endOfText); } 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 08611396be39..25e326ea5652 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 @@ -167,7 +167,7 @@ public void visitJavadocToken(DetailNode ast) { * @return {@code true} if node is {@code @code}, {@code @literal} or HTML comment. */ private static boolean isCommentOrInlineTag(DetailNode node) { - boolean isInsideInlineTagOrHtmlComment = false; + var isInsideInlineTagOrHtmlComment = false; DetailNode current = node; while (current != null) { 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 292255b6feae..0e901329b35a 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 @@ -150,7 +150,7 @@ public void setLocation(String value) { public void visitToken(DetailAST ast) { if (isMultilineComment(ast) && JavadocUtil.isJavadocComment(ast)) { final String commentContent = JavadocUtil.getJavadocCommentContent(ast); - final int indexOfFirstNonBlankLine = findIndexOfFirstNonBlankLine(commentContent); + final var indexOfFirstNonBlankLine = findIndexOfFirstNonBlankLine(commentContent); if (indexOfFirstNonBlankLine >= 0) { if (location == JavadocContentLocationOption.FIRST_LINE && indexOfFirstNonBlankLine != 0) { @@ -184,10 +184,10 @@ private static boolean isMultilineComment(DetailAST node) { * @return the index of the first non-blank line or {@code -1} if all lines are blank */ private static int findIndexOfFirstNonBlankLine(String commentContent) { - int lineNo = 0; - boolean noContent = true; - for (int i = 0; i < commentContent.length(); ++i) { - final char character = commentContent.charAt(i); + var lineNo = 0; + var noContent = true; + for (var i = 0; i < commentContent.length(); ++i) { + final var character = commentContent.charAt(i); if (character == '\n') { ++lineNo; } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocLeadingAsteriskAlignCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocLeadingAsteriskAlignCheck.java index 485f6ae75311..fe3f2518348b 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocLeadingAsteriskAlignCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocLeadingAsteriskAlignCheck.java @@ -98,7 +98,7 @@ public void beginJavadocTree(DetailNode rootAst) { @Override public void visitJavadocToken(DetailNode ast) { // this method checks the alignment of leading asterisks. - final boolean isJavadocStartingLine = ast.getLineNumber() == javadocStartLineNumber; + final var isJavadocStartingLine = ast.getLineNumber() == javadocStartLineNumber; if (!isJavadocStartingLine) { final Optional leadingAsteriskColumnNumber = 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 f2bd9c035c68..4693b6e0efb7 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 @@ -363,11 +363,11 @@ private void checkComment(DetailAST ast, TextBlock comment) { else { final Iterator it = tags.iterator(); // Check for inheritDoc - boolean hasInheritDocTag = false; + var hasInheritDocTag = false; while (!hasInheritDocTag && it.hasNext()) { hasInheritDocTag = it.next().isInheritDocTag(); } - final boolean reportExpectedTags = !hasInheritDocTag + final var reportExpectedTags = !hasInheritDocTag && !AnnotationUtil.containsAnnotation(ast, allowedAnnotations); // COMPACT_CTOR_DEF has no parameters @@ -432,7 +432,7 @@ private static DetailAST getRecordDef(DetailAST ast) { * @return true if the construct has a short circuit tag. */ private boolean hasShortCircuitTag(final DetailAST ast, final List tags) { - boolean result = true; + var result = true; // Check if it contains {@inheritDoc} tag if (tags.size() == 1 && tags.get(0).isInheritDocTag()) { @@ -461,10 +461,10 @@ private List getMethodTags(TextBlock comment) { } final String[] lines = comment.getText(); final List tags = new ArrayList<>(); - int currentLine = comment.getStartLineNo() - 1; - final int startColumnNumber = comment.getStartColNo(); + var currentLine = comment.getStartLineNo() - 1; + final var startColumnNumber = comment.getStartColNo(); - for (int i = 0; i < lines.length; i++) { + for (var i = 0; i < lines.length; i++) { currentLine++; final Matcher javadocArgMatcher = MATCH_JAVADOC_ARG.matcher(lines[i]); @@ -478,19 +478,19 @@ private List getMethodTags(TextBlock comment) { MATCH_JAVADOC_NOARG_MULTILINE_START.matcher(lines[i]); if (javadocArgMatcher.find()) { - final int col = calculateTagColumn(javadocArgMatcher, i, startColumnNumber); + final var col = calculateTagColumn(javadocArgMatcher, i, startColumnNumber); tags.add(new JavadocTag(currentLine, col, javadocArgMatcher.group(1), javadocArgMatcher.group(2))); } else if (javadocArgMissingDescriptionMatcher.find()) { - final int col = calculateTagColumn(javadocArgMissingDescriptionMatcher, i, + final var col = calculateTagColumn(javadocArgMissingDescriptionMatcher, i, startColumnNumber); tags.add(new JavadocTag(currentLine, col, javadocArgMissingDescriptionMatcher.group(1), javadocArgMissingDescriptionMatcher.group(2))); } else if (javadocNoargMatcher.find()) { - final int col = calculateTagColumn(javadocNoargMatcher, i, startColumnNumber); + final var col = calculateTagColumn(javadocNoargMatcher, i, startColumnNumber); tags.add(new JavadocTag(currentLine, col, javadocNoargMatcher.group(1))); } else if (noargCurlyMatcher.find()) { @@ -513,7 +513,7 @@ else if (noargMultilineStart.find()) { */ private static int calculateTagColumn(MatchResult javadocTagMatchResult, int lineNumber, int startColumnNumber) { - int col = javadocTagMatchResult.start(1) - 1; + var col = javadocTagMatchResult.start(1) - 1; if (lineNumber == 0) { col += startColumnNumber; } @@ -531,7 +531,7 @@ private static int calculateTagColumn(MatchResult javadocTagMatchResult, */ private static List getMultilineNoArgTags(final Matcher noargMultilineStart, final String[] lines, final int lineIndex, final int tagLine) { - int remIndex = lineIndex; + var remIndex = lineIndex; Matcher multilineCont; do { @@ -544,7 +544,7 @@ private static List getMultilineNoArgTags(final Matcher noargMultili if (!NEXT_TAG.equals(lFin) && !END_JAVADOC.equals(lFin)) { final String param1 = noargMultilineStart.group(1); - final int col = noargMultilineStart.start(1) - 1; + final var col = noargMultilineStart.start(1) - 1; tags.add(new JavadocTag(tagLine, col, param1)); } @@ -753,7 +753,7 @@ private void checkRecordParamTags(final List tags, tagIt.remove(); final String arg1 = tag.getFirstArg(); - final boolean found = removeMatchingParam(params, arg1); + final var found = removeMatchingParam(params, arg1); if (!found) { log(tag.getLineNo(), tag.getColumnNo(), MSG_UNUSED_TAG, @@ -795,7 +795,7 @@ private void checkParamTags(final List tags, tagIt.remove(); final String arg1 = tag.getFirstArg(); - boolean found = removeMatchingParam(params, arg1); + var found = removeMatchingParam(params, arg1); if (arg1.endsWith(ELEMENT_END)) { found = searchMatchingTypeParameter(typeParams, @@ -839,7 +839,7 @@ private static boolean searchMatchingTypeParameter(Iterable typeParam String requiredTypeName) { // Loop looking for matching type param final Iterator typeParamsIt = typeParams.iterator(); - boolean found = false; + var found = false; while (typeParamsIt.hasNext()) { final DetailAST typeParam = typeParamsIt.next(); if (typeParam.findFirstToken(TokenTypes.IDENT).getText() @@ -860,7 +860,7 @@ private static boolean searchMatchingTypeParameter(Iterable typeParam * @return true if parameter found and removed */ private static boolean removeMatchingParam(Iterable params, String paramName) { - boolean found = false; + var found = false; final Iterator paramIt = params.iterator(); while (paramIt.hasNext()) { final DetailAST param = paramIt.next(); @@ -885,7 +885,7 @@ private static boolean removeMatchingParam(Iterable params, String pa private void checkReturnTag(List tags, int lineNo, boolean reportExpectedTags) { // Loop over tags finding return tags. After the first one, report a violation - boolean found = false; + var found = false; final ListIterator it = tags.listIterator(); while (it.hasNext()) { final JavadocTag javadocTag = it.next(); 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 3025434d9de9..00fafffe45ce 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 @@ -83,7 +83,7 @@ public void visitJavadocToken(DetailNode detailNode) { * @return {@code true} if the node is inside an HTML comment */ private static boolean isInsideHtmlComment(DetailNode detailNode) { - final int parentType = detailNode.getParent().getType(); + final var parentType = detailNode.getParent().getType(); return parentType == JavadocCommentsTokenTypes.HTML_COMMENT_CONTENT || parentType == JavadocCommentsTokenTypes.HTML_COMMENT; 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 fcb55c3564af..b10e4f6a4777 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 @@ -60,7 +60,7 @@ public void visitJavadocToken(DetailNode detailNode) { if (nextNode != null) { final String text = nextNode.getText(); - final int lastAsteriskPosition = getLastLeadingAsteriskPosition(text); + final var lastAsteriskPosition = getLastLeadingAsteriskPosition(text); if (!isLast(lastAsteriskPosition, text) && !Character.isWhitespace(text.charAt(lastAsteriskPosition + 1))) { @@ -125,9 +125,9 @@ private static boolean isLast(int position, String text) { * */ private static int getLastLeadingAsteriskPosition(String text) { - int index = -1; + var index = -1; - for (int i = 0; i < text.length(); i++) { + for (var i = 0; i < text.length(); i++) { if (text.charAt(i) != '*') { break; } 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 8d77d83ff9af..ba594ad2f6ed 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 @@ -97,7 +97,7 @@ protected void processFiltered(File file, FileText fileText) throws CheckstyleEx throw new CheckstyleException( "Exception while getting canonical path to file " + file.getPath(), exc); } - final boolean isDirChecked = !directoriesChecked.add(dir); + final var isDirChecked = !directoriesChecked.add(dir); if (!isDirChecked) { // Check for the preferred file. final Path packageInfo = Path.of(dir.getPath(), "package-info.java"); 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 024fe9ba9846..5edcc935075b 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 @@ -196,7 +196,7 @@ else if (newLine == null || tag.getLineNumber() - newLine.getLineNumber() != 1) * @return true, if the paragraph tag is nested. */ private static boolean isNestedParagraph(DetailNode tag) { - boolean nested = false; + var nested = false; DetailNode parent = tag.getParent(); while (parent != null) { @@ -307,7 +307,7 @@ private static DetailNode getNearestNode(DetailNode node) { * @return true, if line is empty line. */ private static boolean isEmptyLine(DetailNode newLine) { - boolean result = false; + var result = false; DetailNode previousSibling = newLine.getPreviousSibling(); if (previousSibling != null && (previousSibling.getParent().getType() == JavadocCommentsTokenTypes.JAVADOC_CONTENT @@ -346,7 +346,7 @@ private static boolean insideNonTightHtml(DetailNode previousSibling) { * @return true, if line with paragraph tag is first line in javadoc. */ private static boolean isFirstParagraph(DetailNode paragraphTag) { - boolean result = true; + var result = true; DetailNode previousNode = paragraphTag.getPreviousSibling(); while (previousNode != null) { if (previousNode.getType() == JavadocCommentsTokenTypes.TEXT 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 f56d11af71c3..3654ef85d1ca 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 @@ -215,7 +215,7 @@ public void visitToken(DetailAST ast) { * @return whether we should check a given node. */ private boolean shouldCheck(final DetailAST ast) { - boolean check = false; + var check = false; if (ast.getType() == TokenTypes.PACKAGE_DEF) { check = CheckUtil.isPackageInfo(getFilePath()); @@ -269,7 +269,7 @@ private void checkComment(final DetailAST ast, final TextBlock comment) { */ private void checkFirstSentenceEnding(final DetailAST ast, TextBlock comment) { final String commentText = getCommentText(comment.getText()); - final boolean hasInLineReturnTag = Arrays.stream(SENTENCE_SEPARATOR.split(commentText)) + final var hasInLineReturnTag = Arrays.stream(SENTENCE_SEPARATOR.split(commentText)) .findFirst() .map(INLINE_RETURN_TAG_PATTERN::matcher) .filter(Matcher::find) @@ -306,7 +306,7 @@ private void checkJavadocIsNotEmpty(TextBlock comment) { private static String getCommentText(String... comments) { final StringBuilder builder = new StringBuilder(1024); for (final String line : comments) { - final int textStart = findTextStart(line); + final var textStart = findTextStart(line); if (textStart != -1) { if (line.charAt(textStart) == '@') { @@ -332,8 +332,8 @@ private static String getCommentText(String... comments) { * or -1 if not found. */ private static int findTextStart(String line) { - int textStart = -1; - int index = 0; + var textStart = -1; + var index = 0; while (index < line.length()) { if (!Character.isWhitespace(line.charAt(index))) { if (line.regionMatches(index, "/**", 0, "/**".length()) @@ -356,7 +356,7 @@ else if (line.charAt(index) != '*') { * @param builder the StringBuilder to trim. */ private static void trimTail(StringBuilder builder) { - int index = builder.length() - 1; + var index = builder.length() - 1; while (true) { if (Character.isWhitespace(builder.charAt(index))) { builder.deleteCharAt(index); @@ -392,7 +392,7 @@ else if (index > 0 && builder.charAt(index) == '/' */ // -@cs[ReturnCount] Too complex to break apart. private void checkHtmlTags(final DetailAST ast, final TextBlock comment) { - final int lineNo = comment.getStartLineNo(); + final var lineNo = comment.getStartLineNo(); final Deque htmlStack = new ArrayDeque<>(); final String[] text = comment.getText(); @@ -522,7 +522,7 @@ private static boolean isAllowedTag(HtmlTag tag) { * for the token. */ private static boolean isExtraHtml(String token, Deque htmlStack) { - boolean isExtra = true; + var isExtra = true; for (final HtmlTag tag : htmlStack) { // Loop, looking for tags that are closed. // The loop is needed in case there are unclosed 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 7dd198ac65ab..9c65e678bd14 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 @@ -267,7 +267,7 @@ private static boolean isTextOrAttributeValueNode(DetailNode node) { * @return true if the node has a violation. */ private boolean isViolation(DetailNode textNode) { - boolean result = false; + var result = false; final String text = textNode.getText(); if (text.length() <= offset) { if (CommonUtil.isBlank(text)) { @@ -296,7 +296,7 @@ else if (!CommonUtil.isBlank(text.substring(1, offset + 1))) { * @return {@code true} if the node is inside a block tag, {@code false} otherwise */ private static boolean isBlockDescription(DetailNode description) { - boolean isBlock = false; + var isBlock = false; DetailNode currentNode = description; while (currentNode != null) { if (currentNode.getType() == JavadocCommentsTokenTypes.JAVADOC_BLOCK_TAG) { @@ -315,7 +315,7 @@ private static boolean isBlockDescription(DetailNode description) { * @return true, if description node is a description of in-line tag. */ private static boolean isInlineDescription(DetailNode description) { - boolean isInline = false; + var isInline = false; DetailNode currentNode = description; while (currentNode != null) { if (currentNode.getType() == JavadocCommentsTokenTypes.JAVADOC_INLINE_TAG) { 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 72951b305963..2ac552d8554a 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 @@ -73,7 +73,7 @@ public enum JavadocTagInfo { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); return astType == TokenTypes.PACKAGE_DEF || TokenUtil.isTypeDeclaration(astType); } @@ -87,7 +87,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); return DEF_TOKEN_TYPES.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -101,7 +101,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); return DEF_TOKEN_TYPES.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -115,7 +115,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); return DEF_TOKEN_TYPES_DEPRECATED.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -129,7 +129,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); return astType == TokenTypes.METHOD_DEF || astType == TokenTypes.CTOR_DEF; } @@ -142,7 +142,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); return astType == TokenTypes.METHOD_DEF && ast.findFirstToken(TokenTypes.MODIFIERS) @@ -159,7 +159,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); return DEF_TOKEN_TYPES.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -173,7 +173,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); return DEF_TOKEN_TYPES.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -187,7 +187,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); return DEF_TOKEN_TYPES.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -201,7 +201,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); return astType == TokenTypes.CLASS_DEF || astType == TokenTypes.INTERFACE_DEF || astType == TokenTypes.METHOD_DEF @@ -217,7 +217,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); final DetailAST returnType = ast.findFirstToken(TokenTypes.TYPE); return astType == TokenTypes.METHOD_DEF @@ -233,7 +233,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); return DEF_TOKEN_TYPES.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -247,7 +247,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); return astType == TokenTypes.VARIABLE_DEF && !ScopeUtil.isLocalVariableDef(ast); @@ -262,7 +262,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); final DetailAST methodNameAst = ast.findFirstToken(TokenTypes.IDENT); final String methodName = methodNameAst.getText(); @@ -284,7 +284,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); final DetailAST varType = ast.findFirstToken(TokenTypes.TYPE); return astType == TokenTypes.VARIABLE_DEF @@ -301,7 +301,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); return DEF_TOKEN_TYPES.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -315,7 +315,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); return astType == TokenTypes.METHOD_DEF || astType == TokenTypes.CTOR_DEF; } @@ -329,7 +329,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); return DEF_TOKEN_TYPES.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -343,7 +343,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); return astType == TokenTypes.PACKAGE_DEF || TokenUtil.isTypeDeclaration(astType); } 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 c2b211c9c851..135771fe274a 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 @@ -239,7 +239,7 @@ public int[] getRequiredTokens() { public void visitToken(DetailAST ast) { if (shouldCheck(ast)) { final FileContents contents = getFileContents(); - final int lineNo = ast.getLineNo(); + final var lineNo = ast.getLineNo(); final TextBlock textBlock = contents.getJavadocBefore(lineNo); if (textBlock != null) { final List tags = getJavadocTags(textBlock); @@ -314,7 +314,7 @@ private List getJavadocTags(TextBlock textBlock) { private void checkTag(DetailAST ast, Iterable tags, String tagName, Pattern formatPattern) { if (formatPattern != null) { - boolean hasTag = false; + var hasTag = false; final String tagPrefix = "@"; for (final JavadocTag tag :tags) { @@ -343,7 +343,7 @@ private void checkComponentParamTag(DetailAST ast, Collection tags, String recordComponentName) { - final boolean found = tags + final var found = tags .stream() .filter(JavadocTag::isParamTag) .anyMatch(tag -> tag.getFirstArg().indexOf(recordComponentName) == 0); @@ -367,7 +367,7 @@ private void checkTypeParamTag(DetailAST ast, final String typeParamNameWithBrackets = OPEN_ANGLE_BRACKET + typeParamName + CLOSE_ANGLE_BRACKET; - final boolean found = tags + final var found = tags .stream() .filter(JavadocTag::isParamTag) .anyMatch(tag -> tag.getFirstArg().indexOf(typeParamNameWithBrackets) == 0); @@ -393,7 +393,7 @@ private void checkUnusedParamTags( for (final JavadocTag tag: tags) { if (tag.isParamTag()) { final String paramName = extractParamNameFromTag(tag); - final boolean found = typeParamNames.contains(paramName) + final var found = typeParamNames.contains(paramName) || recordComponentNames.contains(paramName); if (!found) { 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 15ffc98854d0..e8d471713f99 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 @@ -165,7 +165,7 @@ private boolean matchAccessModifiers(AccessModifierOption accessModifier) { * @return whether we should check a given node. */ private boolean shouldCheck(final DetailAST ast) { - boolean result = false; + var result = false; if (!ScopeUtil.isInCodeBlock(ast) && !isIgnored(ast)) { final AccessModifierOption accessModifier = getAccessModifierFromModifiersTokenWithPrivateEnumSupport(ast); 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 4f0e792b1dd2..b7d66df0310a 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 @@ -95,7 +95,7 @@ public void visitToken(DetailAST ast) { * @return true if there is javadoc, false otherwise */ private static boolean hasJavadoc(DetailAST ast) { - final boolean hasJavadocBefore = ast.getPreviousSibling() != null + final var hasJavadocBefore = ast.getPreviousSibling() != null && isJavadoc(ast.getPreviousSibling()); return hasJavadocBefore || hasJavadocAboveAnnotation(ast); } @@ -110,7 +110,7 @@ private static boolean hasJavadocAboveAnnotation(DetailAST ast) { final Optional firstAnnotationChild = Optional.of(ast.getFirstChild()) .map(DetailAST::getFirstChild) .map(DetailAST::getFirstChild); - boolean result = false; + var result = false; if (firstAnnotationChild.isPresent()) { for (DetailAST child = firstAnnotationChild.orElseThrow(); child != null; child = child.getNextSibling()) { 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 8d0e9c254b62..3268d63915f2 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 @@ -122,7 +122,7 @@ public int[] getRequiredTokens() { public void visitToken(DetailAST ast) { if (shouldCheck(ast)) { final FileContents contents = getFileContents(); - final int lineNo = ast.getLineNo(); + final var lineNo = ast.getLineNo(); final TextBlock textBlock = contents.getJavadocBefore(lineNo); if (textBlock == null) { log(ast, MSG_JAVADOC_MISSING); 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 55315ae31900..4e30c8d583a2 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 @@ -111,7 +111,7 @@ && hasInsufficientConsecutiveNewlines(tagNode)) { * @return true when there is a javadoc tag before the provided tagNode. */ private static boolean isAnotherTagBefore(DetailNode tagNode) { - boolean found = false; + var found = false; DetailNode currentNode = tagNode.getPreviousSibling(); while (currentNode != null) { if (currentNode.getType() == JavadocCommentsTokenTypes.JAVADOC_BLOCK_TAG) { @@ -179,7 +179,7 @@ private static boolean isOnlyTagInWholeJavadoc(DetailNode tagNode) { * @return true if there are not enough empty lines before the tagNode. */ private static boolean hasInsufficientConsecutiveNewlines(DetailNode tagNode) { - int count = 0; + var count = 0; DetailNode currentNode = tagNode.getPreviousSibling(); while (currentNode != null && (CommonUtil.isBlank(currentNode.getText()) 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 582788601287..b7070a505744 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 @@ -145,7 +145,7 @@ private boolean hasJavadocInlineTags(DetailNode javadocRoot) { DetailNode javadocTagSection = JavadocUtil.findFirstToken( javadocRoot, JavadocCommentsTokenTypes.JAVADOC_INLINE_TAG); - boolean foundTag = false; + var foundTag = false; while (javadocTagSection != null) { if (!isTagIgnored(javadocTagSection)) { foundTag = true; 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 851ab7e75b3b..f9b4cb053b95 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 @@ -205,7 +205,7 @@ else if (!period.isEmpty()) { * @return {@code true} if the {@code {@summary}} tag is defined first in the javadoc */ private static boolean isDefinedFirst(DetailNode inlineTagNode) { - boolean isDefinedFirst = true; + var isDefinedFirst = true; DetailNode currentAst = inlineTagNode.getPreviousSibling(); while (currentAst != null && isDefinedFirst) { switch (currentAst.getType()) { @@ -235,7 +235,7 @@ private static boolean isDefinedFirst(DetailNode inlineTagNode) { * @return {@code true} if some text is present inside the HTML element */ public static boolean isHtmlTagWithoutText(DetailNode node) { - boolean isEmpty = true; + var isEmpty = true; final DetailNode htmlContentToken = JavadocUtil.findFirstToken(node, JavadocCommentsTokenTypes.HTML_CONTENT); @@ -283,7 +283,7 @@ private void validateSummaryTag(DetailNode inlineSummaryTag) { log(inlineSummaryTag.getLineNumber(), MSG_SUMMARY_JAVADOC_MISSING); } else if (!period.isEmpty()) { - final boolean isPeriodNotAtEnd = + final var isPeriodNotAtEnd = summaryVisible.lastIndexOf(period) != summaryVisible.length() - 1; if (isPeriodNotAtEnd) { log(inlineSummaryTag.getLineNumber(), MSG_SUMMARY_MISSING_PERIOD); @@ -369,7 +369,7 @@ private boolean containsForbiddenFragment(String firstSentence) { */ private static String trimExcessWhitespaces(String text) { final StringBuilder result = new StringBuilder(256); - boolean previousWhitespace = true; + var previousWhitespace = true; for (char letter : text.toCharArray()) { final char print; @@ -399,7 +399,7 @@ private static String trimExcessWhitespaces(String text) { * @return {@code true} if the javadoc starts with an {@inheritDoc}. */ private static boolean startsWithInheritDoc(DetailNode root) { - boolean found = false; + var found = false; DetailNode node = root.getFirstChild(); while (node != null) { @@ -525,10 +525,10 @@ private static Stream streamTextParts(DetailNode node) { * or empty Optional if no ending was found. */ private static Optional findSentenceEnding(String text, String period) { - int periodIndex = text.indexOf(period); + var periodIndex = text.indexOf(period); Optional result = Optional.empty(); while (periodIndex >= 0) { - final int afterPeriodIndex = periodIndex + period.length(); + final var afterPeriodIndex = periodIndex + period.length(); // Handle western period separately as it is only the end of a sentence if followed // by whitespace. Other period characters often include whitespace in the character. 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 08227ae97fc1..4c9f69e7e9f5 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 @@ -96,7 +96,7 @@ private void add(HtmlTag tag) { * @param lineNo the source line number. */ private void parseTags(String[] text, int lineNo) { - final int nLines = text.length; + final var nLines = text.length; Point position = new Point(0, 0); while (position.lineNo() < nLines) { // if this is html comment then skip it @@ -125,11 +125,11 @@ else if (isTag(text, position)) { private Point parseTag(String[] text, int lineNo, final int nLines, Point position) { // find end of tag final Point endTag = findChar(text, '>', position); - final boolean incompleteTag = endTag.lineNo() >= nLines; + final var incompleteTag = endTag.lineNo() >= nLines; // get tag id (one word) final String tagId = getTagId(text, position); // is this closed tag - final boolean closedTag = + final var closedTag = endTag.lineNo() < nLines && text[endTag.lineNo()] .charAt(endTag.columnNo() - 1) == '/'; @@ -151,7 +151,7 @@ private Point parseTag(String[] text, int lineNo, final int nLines, Point positi * @return {@code true} some HTML tag starts from given position. */ private static boolean isTag(String[] javadocText, Point pos) { - final int column = pos.columnNo() + 1; + final var column = pos.columnNo() + 1; final String text = javadocText[pos.lineNo()]; // Character.isJavaIdentifier... may not be a valid HTML @@ -170,14 +170,14 @@ private static boolean isTag(String[] javadocText, Point pos) { */ private static String getTagId(String[] javadocText, Point tagStart) { String tagId = ""; - int column = tagStart.columnNo() + 1; + var column = tagStart.columnNo() + 1; String text = javadocText[tagStart.lineNo()]; if (column < text.length()) { if (text.charAt(column) == '/') { column++; } text = text.substring(column); - int position = 0; + var position = 0; // Character.isJavaIdentifier... may not be a valid HTML // identifier but is valid for generics @@ -246,8 +246,8 @@ private static Point findChar(String[] text, char character, Point from) { * @return next point to be examined */ private static Point getNextPoint(String[] text, Point from) { - int line = from.lineNo(); - int column = from.columnNo() + 1; + var line = from.lineNo(); + var column = from.columnNo() + 1; while (line < text.length && column >= text[line].length()) { // go to the next line line++; 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 ed2fba823ef1..d26efffdd147 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 @@ -213,13 +213,13 @@ private static int countCommentLines(DetailAST blockComment) { */ private void checkTag(int astLineNo, int javadocLineNo, String... comment) { if (tagRegExp != null) { - boolean hasTag = false; - for (int i = 0; i < comment.length; i++) { + var hasTag = false; + for (var i = 0; i < comment.length; i++) { final String commentValue = comment[i]; final Matcher matcher = tagRegExp.matcher(commentValue); if (matcher.find()) { hasTag = true; - final int contentStart = matcher.start(1); + final var contentStart = matcher.start(1); final String content = commentValue.substring(contentStart); if (tagFormat == null || tagFormat.matcher(content).find()) { logTag(astLineNo + i, tag, content); 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 cadd31f27f1a..3d0031747013 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 @@ -56,9 +56,9 @@ private BlockTagUtil() { public static List extractBlockTags(String... lines) { final List tags = new ArrayList<>(); - for (int i = 0; i < lines.length; i++) { + for (var i = 0; i < lines.length; i++) { // Starting lines of a comment have a different first line pattern. - final boolean isFirstLine = i == 0; + final var isFirstLine = i == 0; final Pattern pattern; if (isFirstLine) { pattern = BLOCK_TAG_PATTERN_FIRST_LINE; @@ -74,15 +74,15 @@ public static List extractBlockTags(String... lines) { final String tagName = tagMatcher.group(1); // offset of one for the @ character - final int colNum = tagMatcher.start(1) - 1; - final int lineNum = i + 1; + final var colNum = tagMatcher.start(1) - 1; + final var lineNum = i + 1; final String remainder = line.substring(tagMatcher.end(1)); String tagValue = remainder.trim(); // Handle the case where we're on the last line of a Javadoc comment. if (tagValue.endsWith(JAVADOC_CLOSING_TAG)) { - final int endIndex = tagValue.length() - JAVADOC_CLOSING_TAG.length(); + final var endIndex = tagValue.length() - JAVADOC_CLOSING_TAG.length(); tagValue = tagValue.substring(0, endIndex).trim(); } 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 c93628946407..dbed1233772e 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 @@ -88,7 +88,7 @@ public static List extractInlineTags(String... lines) { final String tagValue = matchedTagValue; - final int startIndex = inlineTagMatcher.start(1); + final var startIndex = inlineTagMatcher.start(1); final LineColumn position = getLineColumnOfIndex(commentText, // correct start index offset startIndex - 1); 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 91f4335aad6d..46b7a7acd71f 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 @@ -246,7 +246,7 @@ private void registerImport(DetailAST imp) { final FullIdent ident = FullIdent.createFullIdent( imp.getLastChild().getPreviousSibling()); final String fullName = ident.getText(); - final int lastDot = fullName.lastIndexOf(DOT); + final var lastDot = fullName.lastIndexOf(DOT); importedClassPackages.put(fullName.substring(lastDot + 1), fullName); } @@ -438,9 +438,9 @@ private boolean isFromExcludedPackage(String candidateClassName) { classNameWithPackage = getClassNameWithPackage(candidateClassName) .orElse(""); } - boolean isFromExcludedPackage = false; + var isFromExcludedPackage = false; if (classNameWithPackage.indexOf(DOT) != -1) { - final int lastDotIndex = classNameWithPackage.lastIndexOf(DOT); + final var lastDotIndex = classNameWithPackage.lastIndexOf(DOT); final String candidatePackageName = classNameWithPackage.substring(0, lastDotIndex); isFromExcludedPackage = candidatePackageName.startsWith("java.lang") @@ -467,7 +467,7 @@ private Optional getClassNameWithPackage(String examineClassName) { * @return true if we should not count this class. */ private boolean isExcludedClassRegexp(String candidateClassName) { - boolean result = false; + var result = false; for (Pattern pattern : excludeClassesRegexps) { if (pattern.matcher(candidateClassName).matches()) { result = true; 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 67d532ca0aa1..f1b85596b931 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 @@ -202,7 +202,7 @@ public void leaveToken(DetailAST ast) { */ private void visitMethodDef(DetailAST ast) { contextStack.push(context); - final boolean check = !CheckUtil.isEqualsMethod(ast); + final var check = !CheckUtil.isEqualsMethod(ast); context = new Context(check); } 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 ddf0e30d23bb..bb839b44930b 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 @@ -174,7 +174,7 @@ public void beginTree(DetailAST rootAST) { @Override public void visitToken(DetailAST ast) { - final int tokenType = ast.getType(); + final var tokenType = ast.getType(); if (tokenType == TokenTypes.CLASS_DEF || tokenType == TokenTypes.RECORD_DEF @@ -192,13 +192,13 @@ public void visitToken(DetailAST ast) { @Override public void leaveToken(DetailAST ast) { - final int tokenType = ast.getType(); + final var tokenType = ast.getType(); if (isMethodOrCtorOrInitDefinition(tokenType)) { // pop counter from the stack final Counter counter = counters.pop(); - final int count = counter.getCount(); + final var count = counter.getCount(); if (count > methodMaximum) { log(ast, MSG_METHOD, count, methodMaximum); } @@ -207,7 +207,7 @@ else if (tokenType == TokenTypes.CLASS_DEF) { // pop counter from the stack final Counter counter = counters.pop(); - final int count = counter.getCount(); + final var count = counter.getCount(); if (count > classMaximum) { log(ast, MSG_CLASS, count, classMaximum); } @@ -216,7 +216,7 @@ else if (tokenType == TokenTypes.RECORD_DEF) { // pop counter from the stack final Counter counter = counters.pop(); - final int count = counter.getCount(); + final var count = counter.getCount(); if (count > recordMaximum) { log(ast, MSG_RECORD, count, recordMaximum); } @@ -228,7 +228,7 @@ public void finishTree(DetailAST rootAST) { // pop counter from the stack final Counter counter = counters.pop(); - final int count = counter.getCount(); + final var count = counter.getCount(); if (count > fileMaximum) { log(rootAST, MSG_FILE, count, fileMaximum); } @@ -287,9 +287,9 @@ public void setMethodMaximum(int methodMaximum) { * @return true if the token is countable */ private static boolean isCountable(DetailAST ast) { - boolean countable = true; + var countable = true; - final int tokenType = ast.getType(); + final var tokenType = ast.getType(); // check if an expression is countable if (tokenType == TokenTypes.EXPR) { @@ -309,11 +309,11 @@ else if (tokenType == TokenTypes.VARIABLE_DEF) { * @return true if the variable definition is countable, false otherwise */ private static boolean isVariableDefCountable(DetailAST ast) { - boolean countable = false; + var countable = false; // count variable definitions only if they are direct child to a slist or // object block - final int parentType = ast.getParent().getType(); + final var parentType = ast.getParent().getType(); if (parentType == TokenTypes.SLIST || parentType == TokenTypes.OBJBLOCK) { @@ -341,7 +341,7 @@ private static boolean isExpressionCountable(DetailAST ast) { // count expressions only if they are direct child to a slist (method // body, for loop...) // or direct child of label,if,else,do,while,for - final int parentType = ast.getParent().getType(); + final var parentType = ast.getParent().getType(); return switch (parentType) { case TokenTypes.SLIST, TokenTypes.LABELED_STAT, TokenTypes.LITERAL_FOR, TokenTypes.LITERAL_DO, 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 28f5aa075505..1fe4a6550a0c 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 @@ -237,13 +237,13 @@ public void visitToken(DetailAST ast) { case TokenTypes.LITERAL_WHEN -> visitWhenExpression(ast, 1); case TokenTypes.CASE_GROUP -> { - final int caseNumber = countCaseTokens(ast); + final var caseNumber = countCaseTokens(ast); branchVisited = true; pushValue(caseNumber); } case TokenTypes.SWITCH_RULE -> { - final int caseConstantNumber = countCaseConstants(ast); + final var caseConstantNumber = countCaseConstants(ast); branchVisited = true; pushValue(caseConstantNumber); } @@ -318,7 +318,7 @@ public void leaveToken(DetailAST ast) { * @param basicBranchingFactor default number of branches added. */ private void visitConditional(DetailAST ast, int basicBranchingFactor) { - int expressionValue = basicBranchingFactor; + var expressionValue = basicBranchingFactor; DetailAST bracketed; for (bracketed = ast.findFirstToken(TokenTypes.LPAREN); bracketed.getType() != TokenTypes.RPAREN; @@ -337,7 +337,7 @@ private void visitConditional(DetailAST ast, int basicBranchingFactor) { * @param basicBranchingFactor default number of branches added. */ private void visitWhenExpression(DetailAST ast, int basicBranchingFactor) { - final int expressionValue = basicBranchingFactor + countConditionalOperators(ast); + final var expressionValue = basicBranchingFactor + countConditionalOperators(ast); processingTokenEnd.setToken(getLastToken(ast)); pushValue(expressionValue); } @@ -350,11 +350,11 @@ private void visitWhenExpression(DetailAST ast, int basicBranchingFactor) { * @param basicBranchingFactor number of branches inherently added by this token. */ private void visitUnitaryOperator(DetailAST ast, int basicBranchingFactor) { - final boolean isAfter = processingTokenEnd.isAfter(ast); + final var isAfter = processingTokenEnd.isAfter(ast); afterValues.push(isAfter); if (!isAfter) { processingTokenEnd.setToken(getLastToken(ast)); - final int expressionValue = basicBranchingFactor + countConditionalOperators(ast); + final var expressionValue = basicBranchingFactor + countConditionalOperators(ast); pushValue(expressionValue); } } @@ -441,7 +441,7 @@ private void pushValue(Integer expressionValue) { * @return pair of head values from both of the stacks. */ private Values popValue() { - final int expressionValue = expressionValues.pop(); + final var expressionValue = expressionValues.pop(); return new Values(rangeValues.pop(), BigInteger.valueOf(expressionValue)); } @@ -464,10 +464,10 @@ private void leaveMultiplyingConditional() { * Java Language Specification, §15.25 */ private static int countConditionalOperators(DetailAST ast) { - int number = 0; + var number = 0; for (DetailAST child = ast.getFirstChild(); child != null; child = child.getNextSibling()) { - final int type = child.getType(); + final var type = child.getType(); if (type == TokenTypes.LOR || type == TokenTypes.LAND) { number++; } @@ -504,7 +504,7 @@ private static DetailAST getLastToken(DetailAST ast) { * @return number of case tokens. */ private static int countCaseTokens(DetailAST ast) { - int counter = 0; + var counter = 0; for (DetailAST iterator = ast.getFirstChild(); iterator != null; iterator = iterator.getNextSibling()) { if (iterator.getType() == TokenTypes.LITERAL_CASE) { @@ -521,7 +521,7 @@ private static int countCaseTokens(DetailAST ast) { * @return number of case constant tokens. */ private static int countCaseConstants(DetailAST ast) { - int counter = 0; + var counter = 0; final DetailAST literalCase = ast.getFirstChild(); for (DetailAST node = literalCase.getFirstChild(); node != null; @@ -571,8 +571,8 @@ public void reset() { * @return true, if saved coordinates located after given token. */ public boolean isAfter(DetailAST ast) { - final int lineNo = ast.getLineNo(); - final int columnNo = ast.getColumnNo(); + final var lineNo = ast.getLineNo(); + final var columnNo = ast.getColumnNo(); return lineNo <= endLineNo && (lineNo != endLineNo || columnNo <= endColumnNo); 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 3c796971c40c..f460eafd247c 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 @@ -157,7 +157,7 @@ private static DetailAST checkOrderSuggestedByJls(List modifiers) { // All modifiers are annotations, no problem if (modifier.getType() != TokenTypes.ANNOTATION) { - int index = 0; + var index = 0; while (modifier != null && offendingModifier == null) { @@ -211,10 +211,10 @@ private static DetailAST skipAnnotations(Iterator modifierIterator) { * @return true if annotation on type takes place. */ private static boolean isAnnotationOnType(DetailAST modifier) { - boolean annotationOnType = false; + var annotationOnType = false; final DetailAST modifiers = modifier.getParent(); final DetailAST definition = modifiers.getParent(); - final int definitionType = definition.getType(); + final var definitionType = definition.getType(); if (definitionType == TokenTypes.VARIABLE_DEF || definitionType == TokenTypes.PARAMETER_DEF || definitionType == TokenTypes.CTOR_DEF) { @@ -222,7 +222,7 @@ private static boolean isAnnotationOnType(DetailAST modifier) { } else if (definitionType == TokenTypes.METHOD_DEF) { final DetailAST typeToken = definition.findFirstToken(TokenTypes.TYPE); - final int methodReturnType = typeToken.getLastChild().getType(); + final var methodReturnType = typeToken.getLastChild().getType(); if (methodReturnType != TokenTypes.LITERAL_VOID) { annotationOnType = true; } 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 444f7dee6230..fffca9ebe694 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 @@ -267,8 +267,8 @@ else if (ast.getType() == TokenTypes.METHOD_DEF) { * @return true if there is a modifier to be ignored */ private boolean hasIgnoredModifiers(DetailAST modifiers) { - final boolean isStatic = modifiers.findFirstToken(TokenTypes.LITERAL_STATIC) != null; - final boolean isFinal = modifiers.findFirstToken(TokenTypes.FINAL) != null; + final var isStatic = modifiers.findFirstToken(TokenTypes.LITERAL_STATIC) != null; + final var isFinal = modifiers.findFirstToken(TokenTypes.FINAL) != null; final boolean result; if (isStatic && isFinal) { result = ignoreStaticFinal; @@ -287,7 +287,7 @@ private boolean hasIgnoredModifiers(DetailAST modifiers) { * or @interface definition. */ private static boolean isInterfaceDeclaration(DetailAST variableDefAst) { - boolean result = false; + var result = false; final DetailAST astBlock = variableDefAst.getParent(); final DetailAST astParent2 = astBlock.getParent(); @@ -307,7 +307,7 @@ private static boolean isInterfaceDeclaration(DetailAST variableDefAst) { * @return true if method has "@Override" annotation. */ private static boolean hasOverrideAnnotation(DetailAST methodModifiersAST) { - boolean result = false; + var result = false; for (DetailAST child : getChildren(methodModifiersAST)) { final DetailAST annotationIdent = child.findFirstToken(TokenTypes.IDENT); @@ -328,12 +328,12 @@ private static boolean hasOverrideAnnotation(DetailAST methodModifiersAST) { * separate String. */ private String getDisallowedAbbreviation(String str) { - int beginIndex = 0; - boolean abbrStarted = false; + var beginIndex = 0; + var abbrStarted = false; String result = null; - for (int index = 0; index < str.length(); index++) { - final char symbol = str.charAt(index); + for (var index = 0; index < str.length(); index++) { + final var symbol = str.charAt(index); if (Character.isUpperCase(symbol)) { if (!abbrStarted) { @@ -363,7 +363,7 @@ else if (abbrStarted) { } // if abbreviation at the end of name (example: scaleX) if (abbrStarted) { - final int endIndex = str.length() - 1; + final var endIndex = str.length() - 1; result = getAbbreviationIfIllegal(str, beginIndex, endIndex, allowedAbbreviationLength); } return result; @@ -383,7 +383,7 @@ else if (abbrStarted) { private String getAbbreviationIfIllegal(String str, int beginIndex, int endIndex, int allowedLength) { String result = null; - final int abbrLength = endIndex - beginIndex; + final var abbrLength = endIndex - beginIndex; if (abbrLength > allowedLength) { final String abbr = getAbbreviation(str, beginIndex, endIndex); if (!allowedAbbreviations.contains(abbr)) { 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 23ffb3c7445e..74f395fa07a9 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 @@ -81,13 +81,13 @@ protected boolean mustCheckName(DetailAST ast) { * @return true if we should check such member. */ protected boolean shouldCheckInScope(DetailAST modifiers) { - final boolean isProtected = modifiers + final var isProtected = modifiers .findFirstToken(TokenTypes.LITERAL_PROTECTED) != null; - final boolean isPrivate = modifiers + final var isPrivate = modifiers .findFirstToken(TokenTypes.LITERAL_PRIVATE) != null; - final boolean isPublic = isPublic(modifiers); + final var isPublic = isPublic(modifiers); - final boolean isPackage = !(isPublic || isProtected || isPrivate); + final var isPackage = !(isPublic || isProtected || isPrivate); return applyToPublic && isPublic || applyToProtected && isProtected 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 84a1648e348b..e1873ba53f77 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 @@ -103,11 +103,11 @@ public final void setApplyToPublic(boolean applyTo) { @Override protected final boolean mustCheckName(DetailAST ast) { - boolean returnValue = false; + var returnValue = false; final DetailAST modifiersAST = ast.findFirstToken(TokenTypes.MODIFIERS); - final boolean isStaticFinal = + final var isStaticFinal = modifiersAST.findFirstToken(TokenTypes.LITERAL_STATIC) != null && modifiersAST.findFirstToken(TokenTypes.FINAL) != null || ScopeUtil.isInAnnotationBlock(ast) 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 1376452146d6..2d9d730b9dac 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 @@ -58,7 +58,7 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { - final boolean isInSwitchRule = ast.getParent().getType() == TokenTypes.SWITCH_RULE; + final var isInSwitchRule = ast.getParent().getType() == TokenTypes.SWITCH_RULE; if (Objects.nonNull(ast.findFirstToken(TokenTypes.PARAMETERS))) { final DetailAST parametersNode = ast.findFirstToken(TokenTypes.PARAMETERS); 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 9fed1f05f81f..8e459ae9ebbc 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 @@ -70,7 +70,7 @@ public int[] getRequiredTokens() { protected final boolean mustCheckName(DetailAST ast) { final DetailAST modifiersAST = ast.findFirstToken(TokenTypes.MODIFIERS); - final boolean isFinal = ast.getType() == TokenTypes.RESOURCE + final var isFinal = ast.getType() == TokenTypes.RESOURCE || modifiersAST.findFirstToken(TokenTypes.FINAL) != null; return isFinal && ScopeUtil.isLocalVariableDef(ast); } 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 b51d721d65a9..8f481b365127 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 @@ -92,7 +92,7 @@ protected final boolean mustCheckName(DetailAST ast) { } else { final DetailAST modifiersAST = ast.findFirstToken(TokenTypes.MODIFIERS); - final boolean isFinal = modifiersAST.findFirstToken(TokenTypes.FINAL) != null; + final var isFinal = modifiersAST.findFirstToken(TokenTypes.FINAL) != null; result = !isFinal && ScopeUtil.isLocalVariableDef(ast); } return result; @@ -105,7 +105,7 @@ protected final boolean mustCheckName(DetailAST ast) { * @return true if a variable is the loop's one. */ private static boolean isForLoopVariable(DetailAST variableDef) { - final int parentType = variableDef.getParent().getType(); + final var parentType = variableDef.getParent().getType(); return parentType == TokenTypes.FOR_INIT || parentType == TokenTypes.FOR_EACH_CLAUSE; } 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 ebf667c31ffb..d9fcc8457471 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 @@ -101,7 +101,7 @@ public final void setApplyToPublic(boolean applyTo) { protected final boolean mustCheckName(DetailAST ast) { final DetailAST modifiersAST = ast.findFirstToken(TokenTypes.MODIFIERS); - final boolean isStatic = modifiersAST.findFirstToken(TokenTypes.LITERAL_STATIC) != null; + final var isStatic = modifiersAST.findFirstToken(TokenTypes.LITERAL_STATIC) != null; return !isStatic && !ScopeUtil.isInInterfaceOrAnnotationBlock(ast) && !ScopeUtil.isLocalVariableDef(ast) 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 3c9d4f6ce50b..b50a7f4a1202 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 @@ -107,7 +107,7 @@ public int[] getRequiredTokens() { @Override protected boolean mustCheckName(DetailAST ast) { - boolean checkName = true; + var checkName = true; final DetailAST parent = ast.getParent(); if (ignoreOverridden && isOverriddenMethod(ast) || parent.getType() == TokenTypes.LITERAL_CATCH @@ -138,7 +138,7 @@ private boolean matchAccessModifiers(final AccessModifierOption accessModifier) * @return true if a method is annotated with Override annotation. */ private static boolean isOverriddenMethod(DetailAST ast) { - boolean overridden = false; + var overridden = false; final DetailAST parent = ast.getParent().getParent(); final Optional annotation = 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 d79d07f70e08..66aa261489e4 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 @@ -101,8 +101,8 @@ public final void setApplyToPublic(boolean applyTo) { protected final boolean mustCheckName(DetailAST ast) { final DetailAST modifiersAST = ast.findFirstToken(TokenTypes.MODIFIERS); - final boolean isStatic = modifiersAST.findFirstToken(TokenTypes.LITERAL_STATIC) != null; - final boolean isFinal = modifiersAST.findFirstToken(TokenTypes.FINAL) != null; + final var isStatic = modifiersAST.findFirstToken(TokenTypes.LITERAL_STATIC) != null; + final var isFinal = modifiersAST.findFirstToken(TokenTypes.FINAL) != null; return isStatic && !isFinal 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 04efe8fbb877..697876d1c462 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 @@ -257,7 +257,7 @@ public DetectorOptions build() { * @return Pattern object. */ private Pattern createPattern(String formatValue) { - int options = compileFlags; + var options = compileFlags; if (ignoreCase) { options |= Pattern.CASE_INSENSITIVE; } 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 7b7b81b4338d..6b1c767e7c82 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 @@ -93,7 +93,7 @@ public void processLines(FileText fileText) { /** Method that finds the matches. */ private void findMatch() { try { - boolean foundMatch = matcher.find(); + var foundMatch = matcher.find(); while (foundMatch) { currentMatches++; 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 a1f221d89be5..2c1e3df03a05 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 @@ -261,14 +261,14 @@ public void beginTree(DetailAST rootAST) { @SuppressWarnings("deprecation") private void processRegexpMatches() { final Matcher matcher = format.matcher(getFileContents().getText().getFullText()); - int errorCount = 0; - int matchCount = 0; + var errorCount = 0; + var matchCount = 0; final FileText text = getFileContents().getText(); while (errorCount < errorLimit && matcher.find()) { final LineColumn start = text.lineColumn(matcher.start()); - final int startLine = start.getLine(); + final var startLine = start.getLine(); - final boolean ignore = isIgnore(startLine, text, start, matcher); + final var ignore = isIgnore(startLine, text, start, matcher); if (!ignore) { matchCount++; if (illegalPattern || checkForDuplicates @@ -303,12 +303,12 @@ private boolean isIgnore(int startLine, FileText text, LineColumn start, Matcher else { end = text.lineColumn(matcher.end() - 1); } - boolean ignore = false; + var ignore = false; if (ignoreComments) { final FileContents theFileContents = getFileContents(); - final int startColumn = start.getColumn(); - final int endLine = end.getLine(); - final int endColumn = end.getColumn(); + final var startColumn = start.getColumn(); + final var endLine = end.getLine(); + final var endColumn = end.getColumn(); ignore = theFileContents.hasIntersectionWithComment(startLine, startColumn, endLine, endColumn); } 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 4d6a8efa7b61..714b2aa087ad 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 @@ -207,7 +207,7 @@ private boolean isMatchFolder(String folderPath) { } else { // null pattern means 'match' applies to the folderPattern matching - final boolean useMatch = fileNamePattern != null || match; + final var useMatch = fileNamePattern != null || match; result = folderPattern.matcher(folderPath).find() == useMatch; } 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 eb2cbd369939..cd77d3437aac 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 @@ -65,8 +65,8 @@ class SinglelineDetector { */ public void processLines(FileText fileText) { currentMatches = 0; - int lineNo = 0; - for (int index = 0; index < fileText.size(); index++) { + var lineNo = 0; + for (var index = 0; index < fileText.size(); index++) { final String line = fileText.get(index); lineNo++; checkLine(lineNo, options.getPattern().matcher(line)); @@ -96,11 +96,11 @@ private void finish() { * @param matcher the matcher to use */ private void checkLine(int lineNo, Matcher matcher) { - int startPosition = 0; + var startPosition = 0; while (matcher.find(startPosition)) { // match is found, check for intersection with comment - final int startCol = matcher.start(0); - final int endCol = matcher.end(0); + final var startCol = matcher.start(0); + final var endCol = matcher.end(0); // Note that Matcher.end(int) returns the offset AFTER the // last matched character, but shouldSuppress() // needs column number of the last character. 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 6dd2a66d59a7..0e217f1e0b22 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 @@ -75,7 +75,7 @@ public void visitToken(DetailAST ast) { if (openingBrace != null) { final DetailAST closingBrace = openingBrace.findFirstToken(TokenTypes.RCURLY); - final int length = + final var length = closingBrace.getLineNo() - openingBrace.getLineNo() + 1; if (length > max) { log(ast, MSG_KEY, length, max); 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 460ec85c17c7..fde772120616 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 @@ -148,7 +148,7 @@ private void visitContainerNode(DetailAST ast) { * @param ast the token representing the container node. */ private void leaveContainerNode(DetailAST ast) { - final int count = context.getCount(); + final var count = context.getCount(); if (count > max) { log(ast, MSG_KEY, count, max); } 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 c05b76a870ac..d1b2c108343e 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 @@ -81,7 +81,7 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { if (ast.getParent().getType() != TokenTypes.SWITCH_RULE) { - final int length = getLength(ast); + final var length = getLength(ast); if (length > max) { log(ast, MSG_KEY, length, max); } 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 9d897aa7993c..6ef8c184494b 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 @@ -108,8 +108,8 @@ public void visitToken(DetailAST ast) { * @return number of lines with code for current block */ private static int getLengthOfBlock(DetailAST openingBrace, DetailAST closingBrace) { - final int startLineNo = openingBrace.getLineNo(); - final int endLineNo = closingBrace.getLineNo(); + final var startLineNo = openingBrace.getLineNo(); + final var endLineNo = closingBrace.getLineNo(); return endLineNo - startLineNo + 1; } @@ -125,11 +125,11 @@ private static int countUsedLines(DetailAST ast) { final BitSet usedLines = new BitSet(); while (!nodes.isEmpty()) { final DetailAST node = nodes.removeFirst(); - final int lineIndex = node.getLineNo(); + final var lineIndex = node.getLineNo(); // text block requires special treatment, // since it is the only non-comment token that can span more than one line if (node.getType() == TokenTypes.TEXT_BLOCK_LITERAL_BEGIN) { - final int endLineIndex = node.getLastChild().getLineNo(); + final var endLineIndex = node.getLastChild().getLineNo(); usedLines.set(lineIndex, endLineIndex + 1); } else { 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 4321e244ada8..c19233efe83c 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 @@ -108,7 +108,7 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { final DetailAST params = ast.findFirstToken(TokenTypes.PARAMETERS); - final int count = params.getChildCount(TokenTypes.PARAMETER_DEF); + final var count = params.getChildCount(TokenTypes.PARAMETER_DEF); if (count > max && !shouldIgnoreNumberOfParameters(ast)) { final DetailAST name = ast.findFirstToken(TokenTypes.IDENT); log(name, MSG_KEY, max, count); 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 05c3c62a3e32..8641227ba862 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 @@ -111,7 +111,7 @@ public void visitToken(DetailAST ast) { if (matchAccessModifiers(accessModifier)) { final DetailAST recordComponents = ast.findFirstToken(TokenTypes.RECORD_COMPONENTS); - final int componentCount = countComponents(recordComponents); + final var componentCount = countComponents(recordComponents); if (componentCount > max) { log(ast, MSG_KEY, componentCount, max); 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 f7cdf624ca88..0a91131b2c2b 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 @@ -87,10 +87,10 @@ public void setOption(String optionStr) { */ protected void processLeft(DetailAST ast) { final int[] line = getLineCodePoints(ast.getLineNo() - 1); - final int after = ast.getColumnNo() + 1; + final var after = ast.getColumnNo() + 1; if (after < line.length) { - final boolean hasWhitespaceAfter = + final var hasWhitespaceAfter = CommonUtil.isCodePointWhitespace(line, after); if (option == PadOption.NOSPACE && hasWhitespaceAfter) { log(ast, MSG_WS_FOLLOWED, OPEN_PARENTHESIS); @@ -108,10 +108,10 @@ else if (option == PadOption.SPACE && !hasWhitespaceAfter * @param ast the token representing a right parentheses */ protected void processRight(DetailAST ast) { - final int before = ast.getColumnNo() - 1; + final var before = ast.getColumnNo() - 1; if (before >= 0) { final int[] line = getLineCodePoints(ast.getLineNo() - 1); - final boolean hasPrecedingWhitespace = + final var hasPrecedingWhitespace = CommonUtil.isCodePointWhitespace(line, before); if (option == PadOption.NOSPACE && hasPrecedingWhitespace 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 ab57ab1634b1..1bfcbeee69d9 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 @@ -187,7 +187,7 @@ public void visitToken(DetailAST ast) { * @param nextToken next sibling of the token */ private void checkToken(DetailAST ast, DetailAST nextToken) { - final int astType = ast.getType(); + final var astType = ast.getType(); switch (astType) { case TokenTypes.VARIABLE_DEF -> processVariableDef(ast, nextToken); @@ -231,7 +231,7 @@ private void checkCommentInModifiers(DetailAST packageDef) { * @param ast the ast to check. */ private void processMultipleLinesInside(DetailAST ast) { - final int astType = ast.getType(); + final var astType = ast.getType(); if (isClassMemberBlock(astType)) { final List emptyLines = getEmptyLines(ast); final List emptyLinesToLog = getEmptyLinesToLog(emptyLines); @@ -316,7 +316,7 @@ private static boolean isClassMemberBlock(int astType) { */ private List getEmptyLines(DetailAST ast) { final DetailAST lastToken = ast.getLastChild().getLastChild(); - int lastTokenLineNo = 0; + var lastTokenLineNo = 0; if (lastToken != null) { // -1 as count starts from 0 // -2 as last token line cannot be empty, because it is a RCURLY @@ -324,7 +324,7 @@ private List getEmptyLines(DetailAST ast) { } final List emptyLines = new ArrayList<>(); - for (int lineNo = ast.getLineNo(); lineNo <= lastTokenLineNo; lineNo++) { + for (var lineNo = ast.getLineNo(); lineNo <= lastTokenLineNo; lineNo++) { if (CommonUtil.isBlank(getLine(lineNo))) { emptyLines.add(lineNo); } @@ -340,7 +340,7 @@ private List getEmptyLines(DetailAST ast) { */ private static List getEmptyLinesToLog(Iterable emptyLines) { final List emptyLinesToLog = new ArrayList<>(); - int previousEmptyLineNo = -1; + var previousEmptyLineNo = -1; for (int emptyLineNo : emptyLines) { if (previousEmptyLineNo + 1 == emptyLineNo) { emptyLinesToLog.add(previousEmptyLineNo); @@ -395,7 +395,7 @@ else if (!hasEmptyLineAfter(ast)) { */ private static boolean isLineEmptyAfterPackage(DetailAST ast) { DetailAST nextElement = ast; - final int lastChildLineNo = ast.getLastChild().getLineNo(); + final var lastChildLineNo = ast.getLastChild().getLineNo(); while (nextElement.getLineNo() < lastChildLineNo + 1 && nextElement.getNextSibling() != null) { nextElement = nextElement.getNextSibling(); @@ -411,7 +411,7 @@ private static boolean isLineEmptyAfterPackage(DetailAST ast) { */ private static DetailAST getViolationAstForPackage(DetailAST ast) { DetailAST nextElement = ast; - final int lastChildLineNo = ast.getLastChild().getLineNo(); + final var lastChildLineNo = ast.getLastChild().getLineNo(); while (nextElement.getLineNo() < lastChildLineNo + 1) { nextElement = nextElement.getNextSibling(); } @@ -530,15 +530,15 @@ else if (isCommentInBeginningOfLine(childNode)) { * @return true, if token has empty lines before. */ private boolean isPrePreviousLineEmpty(DetailAST token) { - boolean result = false; - final int lineNo = token.getLineNo(); + var result = false; + final var lineNo = token.getLineNo(); // 3 is the number of the pre-previous line because the numbering starts from zero. - final int number = 3; + final var number = 3; if (lineNo >= number) { final String prePreviousLine = getLine(lineNo - number); result = CommonUtil.isBlank(prePreviousLine); - final boolean previousLineIsEmpty = CommonUtil.isBlank(getLine(lineNo - 2)); + final var previousLineIsEmpty = CommonUtil.isBlank(getLine(lineNo - 2)); if (previousLineIsEmpty && result) { result = true; @@ -558,7 +558,7 @@ else if (token.findFirstToken(TokenTypes.TYPE) != null) { * @return true, if both previous and pre-previous lines from dependent comment are empty */ private boolean isTwoPrecedingPreviousLinesFromCommentEmpty(DetailAST token) { - boolean upToPrePreviousLinesEmpty = false; + var upToPrePreviousLinesEmpty = false; for (DetailAST typeChild = token.findFirstToken(TokenTypes.TYPE).getLastChild(); typeChild != null; typeChild = typeChild.getPreviousSibling()) { @@ -617,9 +617,9 @@ private boolean hasEmptyLineAfter(DetailAST token) { nextToken = nextToken.getNextSibling(); } // Start of the next token - final int nextBegin = nextToken.getLineNo(); + final var nextBegin = nextToken.getLineNo(); // End of current token. - final int currentEnd = lastToken.getLineNo(); + final var currentEnd = lastToken.getLineNo(); return hasEmptyLine(currentEnd + 1, nextBegin - 1); } @@ -648,8 +648,8 @@ private static Optional findCommentUnder(DetailAST packageDef) { */ private boolean hasEmptyLine(int startLine, int endLine) { // Initial value is false - blank line not found - boolean result = false; - for (int line = startLine; line <= endLine; line++) { + var result = false; + for (var line = startLine; line <= endLine; line++) { // Check, if the line is blank. Lines are numbered from 0, so subtract 1 if (CommonUtil.isBlank(getLine(line - 1))) { result = true; @@ -666,8 +666,8 @@ private boolean hasEmptyLine(int startLine, int endLine) { * @return true, if token have empty line before. */ private boolean hasEmptyLineBefore(DetailAST token) { - boolean result = false; - final int lineNo = token.getLineNo(); + var result = false; + final var lineNo = token.getLineNo(); if (lineNo != 1) { // [lineNo - 2] is the number of the previous line as the numbering starts from zero. final String lineBefore = getLine(lineNo - 2); @@ -699,7 +699,7 @@ else if (token.findFirstToken(TokenTypes.TYPE) != null) { private boolean isCommentInBeginningOfLine(DetailAST comment) { // comment.getLineNo() - 1 is the number of the previous line as the numbering starts // from zero. - boolean result = false; + var result = false; if (comment != null) { final String lineWithComment = getLine(comment.getLineNo() - 1).trim(); result = lineWithComment.startsWith("//") || lineWithComment.startsWith("/*"); @@ -714,7 +714,7 @@ private boolean isCommentInBeginningOfLine(DetailAST comment) { * @return true, if token is preceded by javadoc comment. */ private static boolean isPrecededByJavadoc(DetailAST token) { - boolean result = false; + var result = false; final DetailAST previous = token.getPreviousSibling(); if (previous.getType() == TokenTypes.BLOCK_COMMENT_BEGIN && JavadocUtil.isJavadocComment(previous.getFirstChild().getText())) { 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 81df419ef068..ec80f713890f 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 @@ -73,11 +73,11 @@ public class FileTabCharacterCheck extends AbstractFileSetCheck { @Override protected void processFiltered(File file, FileText fileText) { - int lineNum = 0; - for (int index = 0; index < fileText.size(); index++) { + var lineNum = 0; + for (var index = 0; index < fileText.size(); index++) { final String line = fileText.get(index); lineNum++; - final int tabPosition = line.indexOf('\t'); + final var tabPosition = line.indexOf('\t'); if (tabPosition != -1) { if (eachLine) { log(lineNum, tabPosition, MSG_CONTAINS_TAB); 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 75ba9ccce7cd..dd928c2009a7 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 @@ -143,8 +143,8 @@ public void visitToken(DetailAST ast) { */ private void processEnd(DetailAST ast) { final int[] line = getLineCodePoints(ast.getLineNo() - 1); - final int before = ast.getColumnNo() - 1; - final int after = ast.getColumnNo() + 1; + final var before = ast.getColumnNo() - 1; + final var after = ast.getColumnNo() + 1; if (before >= 0 && CommonUtil.isCodePointWhitespace(line, before) && !containsWhitespaceBefore(before, line)) { @@ -179,7 +179,7 @@ private void processNestedGenerics(DetailAST ast, int[] line, int after) { // ^ // should be whitespace if followed by & -+ // - final int indexOfAmp = IntStream.range(after, line.length) + final var indexOfAmp = IntStream.range(after, line.length) .filter(index -> line[index] == '&') .findFirst() .orElse(-1); @@ -205,7 +205,7 @@ else if (line[after] == ' ') { * @param after position after */ private void processSingleGeneric(DetailAST ast, int[] line, int after) { - final char charAfter = Character.toChars(line[after])[0]; + final var charAfter = Character.toChars(line[after])[0]; if (isGenericBeforeMethod(ast) || isGenericBeforeCtorInvocation(ast) || isGenericBeforeRecordHeader(ast)) { @@ -298,8 +298,8 @@ private static boolean isAfterMethodReference(DetailAST genericEnd) { */ private void processStart(DetailAST ast) { final int[] line = getLineCodePoints(ast.getLineNo() - 1); - final int before = ast.getColumnNo() - 1; - final int after = ast.getColumnNo() + 1; + final var before = ast.getColumnNo() - 1; + final var after = ast.getColumnNo() + 1; // Checks if generic needs to be preceded by a whitespace or not. // Handles 3 cases as in: @@ -346,8 +346,8 @@ else if (CommonUtil.isCodePointWhitespace(line, before) * @return whether there are only whitespaces (or nothing) */ private static boolean containsWhitespaceBetween(int fromIndex, int toIndex, int... line) { - boolean result = true; - for (int i = fromIndex; i < toIndex; i++) { + var result = true; + for (var i = fromIndex; i < toIndex; i++) { if (!CommonUtil.isCodePointWhitespace(line, i)) { result = false; break; 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 adc0d0dd7e1a..b80691e4aba4 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 @@ -118,7 +118,7 @@ public void visitToken(DetailAST ast) { } } else { - final int before = parenAST.getColumnNo() - 1; + final var before = parenAST.getColumnNo() - 1; if (option == PadOption.NOSPACE && CommonUtil.isCodePointWhitespace(line, before)) { log(parenAST, MSG_WS_PRECEDED, parenAST.getText()); 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 d7819c15c7c8..f254fbf4a6f0 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 @@ -135,8 +135,8 @@ public void setAllowLineBreaks(boolean allowLineBreaks) { public void visitToken(DetailAST ast) { if (shouldCheckWhitespaceAfter(ast)) { final DetailAST whitespaceFollowedAst = getWhitespaceFollowedNode(ast); - final int whitespaceColumnNo = getPositionAfter(whitespaceFollowedAst); - final int whitespaceLineNo = whitespaceFollowedAst.getLineNo(); + final var whitespaceColumnNo = getPositionAfter(whitespaceFollowedAst); + final var whitespaceLineNo = whitespaceFollowedAst.getLineNo(); if (hasTrailingWhitespace(ast, whitespaceColumnNo, whitespaceLineNo)) { log(ast, MSG_KEY, whitespaceFollowedAst.getText()); @@ -171,7 +171,7 @@ private static DetailAST getWhitespaceFollowedNode(DetailAST ast) { */ private static boolean shouldCheckWhitespaceAfter(DetailAST ast) { final DetailAST previousSibling = ast.getPreviousSibling(); - final boolean isSynchronizedMethod = ast.getType() == TokenTypes.LITERAL_SYNCHRONIZED + final var isSynchronizedMethod = ast.getType() == TokenTypes.LITERAL_SYNCHRONIZED && ast.getFirstChild() == null; return !isSynchronizedMethod && (previousSibling == null || previousSibling.getType() != TokenTypes.ANNOTATIONS); @@ -213,7 +213,7 @@ private static int getPositionAfter(DetailAST ast) { private boolean hasTrailingWhitespace(DetailAST ast, int whitespaceColumnNo, int whitespaceLineNo) { final boolean result; - final int astLineNo = ast.getLineNo(); + final var astLineNo = ast.getLineNo(); final int[] line = getLineCodePoints(astLineNo - 1); if (astLineNo == whitespaceLineNo && whitespaceColumnNo < line.length) { result = CommonUtil.isCodePointWhitespace(line, whitespaceColumnNo); @@ -356,7 +356,7 @@ else if (firstChild.getType() == TokenTypes.IDENT) { private static DetailAST getTypeLastNode(DetailAST ast) { final DetailAST typeLastNode; final DetailAST parent = ast.getParent(); - final boolean isPrecededByTypeArgs = + final var isPrecededByTypeArgs = parent.findFirstToken(TokenTypes.TYPE_ARGUMENTS) != null; final Optional objectArrayType = Optional.ofNullable(getIdentLastToken(ast)); @@ -401,7 +401,7 @@ else if (ident.getLineNo() < ast.getLineNo()) { } // ident and lastTypeNode lay on one line else { - final int instanceOfSize = 13; + final var instanceOfSize = 13; // +2 because ast has `[]` after the ident if (ident.getColumnNo() >= ast.getColumnNo() + 2 // +13 because ident (at most 1 character) is followed by 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 7dd3bf0db6a3..4cc324f5aa0d 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 @@ -109,7 +109,7 @@ else if (parent.getType() == TokenTypes.LITERAL_CASE) { */ private static boolean isWhitespaceBeforeColonOfCase(DetailAST colonAst) { final DetailAST previousSibling = colonAst.getPreviousSibling(); - int offset = 0; + var offset = 0; if (previousSibling.getType() == TokenTypes.BLOCK_COMMENT_BEGIN) { offset = 1; } 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 a77921928b0a..9dd48aa44bf4 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 @@ -87,12 +87,12 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { final int[] line = getLineCodePoints(ast.getLineNo() - 1); - final int columnNoBeforeToken = ast.getColumnNo() - 1; - final boolean isFirstToken = columnNoBeforeToken == -1; + final var columnNoBeforeToken = ast.getColumnNo() - 1; + final var isFirstToken = columnNoBeforeToken == -1; if ((isFirstToken || CommonUtil.isCodePointWhitespace(line, columnNoBeforeToken)) && !isInEmptyForInitializerOrCondition(ast)) { - final boolean isViolation = !allowLineBreaks + final var isViolation = !allowLineBreaks || !isFirstToken && !CodePointUtil.hasWhitespaceBefore(columnNoBeforeToken, line); @@ -109,7 +109,7 @@ public void visitToken(DetailAST ast) { * @return true if semicolon is in empty for initializer or condition. */ private static boolean isInEmptyForInitializerOrCondition(DetailAST semicolonAst) { - boolean result = false; + var result = false; final DetailAST sibling = semicolonAst.getPreviousSibling(); if (sibling != null && (sibling.getType() == TokenTypes.FOR_INIT 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 5f7886d60bda..05023308a09e 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 @@ -294,7 +294,7 @@ private static DetailAST getRightNode(DetailAST node) { */ private static DetailAST adjustParens(DetailAST node, UnaryOperator step) { DetailAST result = node; - int accumulator = 0; + var accumulator = 0; while (true) { if (result.getType() == TokenTypes.LPAREN) { accumulator--; 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 b7bf9c243132..089ed0985079 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 @@ -237,7 +237,7 @@ private static int[] makeAcceptableTokens() { * @return true if ast is a closing paren of a {@link TokenTypes#TYPECAST}. */ private static boolean isInTypecast(DetailAST ast) { - boolean result = false; + var result = false; if (ast.getParent().getType() == TokenTypes.TYPECAST) { final DetailAST firstRparen = ast.getParent().findFirstToken(TokenTypes.RPAREN); if (TokenUtil.areOnSameLine(firstRparen, ast) @@ -255,7 +255,7 @@ private static boolean isInTypecast(DetailAST ast) { * @return whether a token follows an empty for iterator */ private static boolean isFollowsEmptyForIterator(DetailAST ast) { - boolean result = false; + var result = false; final DetailAST parent = ast.getParent(); // Only traditional for statements are examined, not for-each statements if (parent.findFirstToken(TokenTypes.FOR_EACH_CLAUSE) == null) { @@ -273,7 +273,7 @@ private static boolean isFollowsEmptyForIterator(DetailAST ast) { * @return whether a token precedes an empty for initializer */ private static boolean isPrecedingEmptyForInit(DetailAST ast) { - boolean result = false; + var result = false; final DetailAST parent = ast.getParent(); // Only traditional for statements are examined, not for-each statements if (parent.findFirstToken(TokenTypes.FOR_EACH_CLAUSE) == null) { 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 dc2b6bb0d4a4..99fabdd5f7c7 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 @@ -98,13 +98,13 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { final String text = ast.getText(); - final int colNo = ast.getColumnNo(); - final int lineNo = ast.getLineNo(); + final var colNo = ast.getColumnNo(); + final var lineNo = ast.getLineNo(); final int[] currentLine = getLineCodePoints(lineNo - 1); - final boolean isLineEmptyAfterToken = CodePointUtil.isBlank( + final var isLineEmptyAfterToken = CodePointUtil.isBlank( Arrays.copyOfRange(currentLine, colNo + text.length(), currentLine.length) ); - final boolean isLineEmptyBeforeToken = CodePointUtil.isBlank( + final var isLineEmptyBeforeToken = CodePointUtil.isBlank( Arrays.copyOfRange(currentLine, 0, colNo) ); 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 a80f569b2abb..27ce989acdd2 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 @@ -149,12 +149,12 @@ else if (ast.getType() == TokenTypes.ANNOTATIONS) { * @return true if ast token is followed by a whitespace. */ private static boolean isFollowedByWhitespace(DetailAST targetAST, int... line) { - final int after = + final var after = targetAST.getColumnNo() + targetAST.getText().length(); - boolean followedByWhitespace = true; + var followedByWhitespace = true; if (after < line.length) { - final int codePoint = line[after]; + final var codePoint = line[after]; followedByWhitespace = codePoint == ';' || codePoint == ')' 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 7a4bf11b5a44..22f6b9fa4c41 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/CsvFilterElement.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/CsvFilterElement.java @@ -50,15 +50,15 @@ class CsvFilterElement implements IntFilterElement { final StringTokenizer tokenizer = new StringTokenizer(pattern, ","); while (tokenizer.hasMoreTokens()) { final String token = tokenizer.nextToken().trim(); - final int index = token.indexOf('-'); + final var index = token.indexOf('-'); if (index == -1) { - final int matchValue = Integer.parseInt(token); + final var matchValue = Integer.parseInt(token); addFilter(new IntMatchFilterElement(matchValue)); } else { - final int lowerBound = + final var lowerBound = Integer.parseInt(token.substring(0, index)); - final int upperBound = + final var upperBound = Integer.parseInt(token.substring(index + 1)); addFilter(new IntRangeFilterElement(lowerBound, upperBound)); } @@ -91,7 +91,7 @@ protected Set getFilters() { */ @Override public boolean accept(int intValue) { - boolean result = false; + var result = false; for (IntFilterElement filter : getFilters()) { if (filter.accept(intValue)) { result = true; 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 b1cd5bd582f9..a7582c66ee5a 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java @@ -85,7 +85,7 @@ protected void finishLocalSetup() { @Override public boolean accept(AuditEvent event) { - final boolean severityMatches = severity == event.getSeverityLevel(); + final var severityMatches = severity == event.getSeverityLevel(); return acceptOnMatch == severityMatches; } 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 d38e13e87af5..c86824a26d24 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java @@ -219,7 +219,7 @@ protected void finishLocalSetup() { @Override public boolean accept(TreeWalkerAuditEvent event) { - boolean accepted = true; + var accepted = true; if (event.getViolation() != null) { // Lazy update. If the first event for the current file, update file @@ -244,7 +244,7 @@ public boolean accept(TreeWalkerAuditEvent event) { * @return true if event matches any tag from {@link #tags}, false otherwise. */ private boolean matchesTag(TreeWalkerAuditEvent event) { - boolean result = false; + var result = false; for (final Tag tag : tags) { if (tag.isMatch(event)) { result = true; @@ -279,10 +279,10 @@ private void tagSuppressions() { */ private void tagSuppressions(Collection comments) { for (final TextBlock comment : comments) { - final int startLineNo = comment.getStartLineNo(); + final var startLineNo = comment.getStartLineNo(); final String[] text = comment.getText(); tagCommentLine(text[0], startLineNo); - for (int i = 1; i < text.length; i++) { + for (var i = 1; i < text.length; i++) { tagCommentLine(text[i], startLineNo + i); } } @@ -373,7 +373,7 @@ private Tag(String text, int line, SuppressWithNearbyCommentFilter filter) { format = CommonUtil.fillTemplateWithStringsByRegexp( filter.influenceFormat, text, filter.commentFormat); - final int influence = parseInfluence(format, filter.influenceFormat, text); + final var influence = parseInfluence(format, filter.influenceFormat, text); if (influence >= 1) { firstLine = line; @@ -453,7 +453,7 @@ && isIdMatch(event) * @return true if the {@link TreeWalkerAuditEvent} is in the scope of the suppression. */ private boolean isInScopeOfSuppression(TreeWalkerAuditEvent event) { - final int line = event.getLine(); + final var line = event.getLine(); return line >= firstLine && line <= lastLine; } @@ -475,7 +475,7 @@ private boolean isCheckMatch(TreeWalkerAuditEvent event) { * @return true if the {@link TreeWalkerAuditEvent} module ID matches the ID format. */ private boolean isIdMatch(TreeWalkerAuditEvent event) { - boolean match = true; + var match = true; if (tagIdRegexp != null) { if (event.getModuleId() == null) { match = false; @@ -495,7 +495,7 @@ private boolean isIdMatch(TreeWalkerAuditEvent event) { * @return true if the {@link TreeWalkerAuditEvent} message matches the message format. */ private boolean isMessageMatch(TreeWalkerAuditEvent event) { - boolean match = true; + var match = true; if (tagMessageRegexp != null) { final Matcher messageMatcher = tagMessageRegexp.matcher(event.getMessage()); match = messageMatcher.find(); 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 21d20f4a05a3..af429a94c460 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.java @@ -157,7 +157,7 @@ public final void setLineRange(String format) { @Override public boolean accept(AuditEvent event) { - boolean accepted = true; + var accepted = true; if (event.getViolation() != null) { final String eventFileTextAbsolutePath = event.getFileName(); @@ -215,7 +215,7 @@ private static FileText getFileText(String fileName) { private void collectSuppressions(FileText fileText) { suppressions.clear(); - for (int lineNo = 0; lineNo < fileText.size(); lineNo++) { + for (var lineNo = 0; lineNo < fileText.size(); lineNo++) { final Suppression suppression = getSuppression(fileText, lineNo); if (suppression != null) { suppressions.add(suppression); @@ -311,7 +311,7 @@ private Suppression( format = CommonUtil.fillTemplateWithStringsByRegexp(lineRange, text, nearbyTextPattern); - final int range = parseRange(format, lineRange, text); + final var range = parseRange(format, lineRange, text); firstLine = Math.min(lineNo, lineNo + range); lastLine = Math.max(lineNo, lineNo + range); @@ -362,7 +362,7 @@ && isIdMatch(event) * @return true if the {@link AuditEvent} is in the scope of the suppression. */ private boolean isInScopeOfSuppression(AuditEvent event) { - final int eventLine = event.getLine(); + final var eventLine = event.getLine(); return eventLine >= firstLine && eventLine <= lastLine; } @@ -384,7 +384,7 @@ private boolean isCheckMatch(AuditEvent event) { * @return true if the {@link AuditEvent} module ID matches the ID pattern. */ private boolean isIdMatch(AuditEvent event) { - boolean match = true; + var match = true; if (eventIdRegexp != null) { if (event.getModuleId() == null) { match = false; @@ -404,7 +404,7 @@ private boolean isIdMatch(AuditEvent event) { * @return true if the {@link AuditEvent} message matches the message pattern. */ private boolean isMessageMatch(AuditEvent event) { - boolean match = true; + var match = true; if (eventMessageRegexp != null) { final Matcher messageMatcher = eventMessageRegexp.matcher(event.getMessage()); match = messageMatcher.find(); 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 d91621ec8087..e6f5dab3174f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java @@ -170,7 +170,7 @@ public final void setIdFormat(String format) { @Override public boolean accept(AuditEvent event) { - boolean accepted = true; + var accepted = true; if (event.getViolation() != null) { final String eventFileName = event.getFileName(); @@ -223,7 +223,7 @@ private static FileText getFileText(String fileName) { * @param fileText {@link FileText} instance. */ private void cacheSuppressions(FileText fileText) { - for (int lineNo = 0; lineNo < fileText.size(); lineNo++) { + for (var lineNo = 0; lineNo < fileText.size(); lineNo++) { final Optional suppression = getSuppression(fileText, lineNo); suppression.ifPresent(currentFileSuppressionCache::add); } @@ -426,7 +426,7 @@ private boolean isCheckMatch(AuditEvent event) { * @return true if the {@link AuditEvent} module ID matches the ID format. */ private boolean isIdMatch(AuditEvent event) { - boolean match = true; + var match = true; if (eventIdRegexp != null) { if (event.getModuleId() == null) { match = false; @@ -446,7 +446,7 @@ private boolean isIdMatch(AuditEvent event) { * @return true if the {@link AuditEvent} message matches the message format. */ private boolean isMessageMatch(AuditEvent event) { - boolean match = true; + var match = true; if (eventMessageRegexp != null) { final Matcher messageMatcher = eventMessageRegexp.matcher(event.getMessage()); match = messageMatcher.find(); 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 3690a10bb472..58f0f3533e8d 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java @@ -243,7 +243,7 @@ protected void finishLocalSetup() { @Override public boolean accept(TreeWalkerAuditEvent event) { - boolean accepted = true; + var accepted = true; if (event.getViolation() != null) { // Lazy update. If the first event for the current file, update file @@ -270,7 +270,7 @@ public boolean accept(TreeWalkerAuditEvent event) { private Tag findNearestMatch(TreeWalkerAuditEvent event) { Tag result = null; for (Tag tag : tags) { - final int eventLine = event.getLine(); + final var eventLine = event.getLine(); if (tag.getLine() > eventLine || tag.getLine() == eventLine && tag.getColumn() > event.getColumn()) { @@ -309,10 +309,10 @@ private void tagSuppressions() { */ private void tagSuppressions(Collection comments) { for (TextBlock comment : comments) { - final int startLineNo = comment.getStartLineNo(); + final var startLineNo = comment.getStartLineNo(); final String[] text = comment.getText(); tagCommentLine(text[0], startLineNo, comment.getStartColNo()); - for (int i = 1; i < text.length; i++) { + for (var i = 1; i < text.length; i++) { tagCommentLine(text[i], startLineNo + i, 0); } } @@ -549,7 +549,7 @@ private boolean isCheckMatch(TreeWalkerAuditEvent event) { * @return true if the {@link TreeWalkerAuditEvent} module ID matches the ID format. */ private boolean isIdMatch(TreeWalkerAuditEvent event) { - boolean match = true; + var match = true; if (tagIdRegexp != null) { if (event.getModuleId() == null) { match = false; @@ -569,7 +569,7 @@ private boolean isIdMatch(TreeWalkerAuditEvent event) { * @return true if the {@link TreeWalkerAuditEvent} message matches the message format. */ private boolean isMessageMatch(TreeWalkerAuditEvent event) { - boolean match = true; + var match = true; if (tagMessageRegexp != null) { final Matcher messageMatcher = tagMessageRegexp.matcher(event.getMessage()); match = messageMatcher.find(); 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 8373d30ddb13..475d48d588e6 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java @@ -293,7 +293,7 @@ public int hashCode() { @Override public boolean accept(TreeWalkerAuditEvent treeWalkerAuditEvent) { - boolean result = true; + var result = true; for (TreeWalkerFilter filter : filters) { if (!filter.accept(treeWalkerAuditEvent)) { result = false; 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 3f1579db62a6..9625cd916396 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerSimulator.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerSimulator.java @@ -57,13 +57,13 @@ public CrAwareLexerSimulator(Lexer lexer, ATN augmented, */ @Override public void consume(CharStream input) { - final int currentChar = input.LA(1); + final var currentChar = input.LA(1); if (currentChar == '\n') { line++; charPositionInLine = 0; } else if (currentChar == '\r') { - final int nextChar = input.LA(2); + final var nextChar = input.LA(2); if (nextChar != '\n') { line++; charPositionInLine = 0; 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 b0c3119fa143..8635141f8923 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.java @@ -88,7 +88,7 @@ protected void fireEditingStopped() { final Object[] listeners = listenerList.getListenerList(); // Process the listeners last to first, notifying // those that are interested in this event - for (int i = listeners.length - 2; i >= 0; i -= 2) { + for (var i = listeners.length - 2; i >= 0; i -= 2) { if (listeners[i] == CellEditorListener.class) { ((CellEditorListener) listeners[i + 1]).editingStopped(new ChangeEvent(this)); } @@ -106,7 +106,7 @@ protected void fireEditingCanceled() { final Object[] listeners = listenerList.getListenerList(); // Process the listeners last to first, notifying // those that are interested in this event - for (int i = listeners.length - 2; i >= 0; i -= 2) { + for (var i = listeners.length - 2; i >= 0; i -= 2) { if (listeners[i] == CellEditorListener.class) { ((CellEditorListener) listeners[i + 1]).editingCanceled(new ChangeEvent(this)); } 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 e54ac2f8f59e..5f8a74e12672 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.java @@ -99,12 +99,12 @@ private void updateSelectedPathsFromSelectedRows() { try { // This is way expensive, ListSelectionModel needs an // enumerator for iterating. - final int min = listSelectionModel.getMinSelectionIndex(); - final int max = listSelectionModel.getMaxSelectionIndex(); + final var min = listSelectionModel.getMinSelectionIndex(); + final var max = listSelectionModel.getMaxSelectionIndex(); clearSelection(); if (min != -1 && max != -1) { - for (int counter = min; counter <= max; counter++) { + for (var counter = min; counter <= max; counter++) { updateSelectedPathIfRowIsSelected(counter); } } 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 19cbc82af1d0..bcc79e1d3335 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrame.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrame.java @@ -145,7 +145,7 @@ private JPanel createButtonsPanel() { }); final JLabel modesLabel = new JLabel("Modes:", SwingConstants.RIGHT); - final int leftIndentation = 10; + final var leftIndentation = 10; modesLabel.setBorder(BorderFactory.createEmptyBorder(0, leftIndentation, 0, 0)); modesLabel.setDisplayedMnemonic(KeyEvent.VK_M); modesLabel.setLabelFor(modesCombobox); @@ -226,7 +226,7 @@ public void actionPerformed(ActionEvent event) { final FileFilter filter = new JavaFileFilter(); fileChooser.setFileFilter(filter); - final int returnCode = fileChooser.showOpenDialog(MainFrame.this); + final var returnCode = fileChooser.showOpenDialog(MainFrame.this); if (returnCode == JFileChooser.APPROVE_OPTION) { final File file = fileChooser.getSelectedFile(); openFile(file); 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 58c318caabc4..6196535dfb26 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.java @@ -179,7 +179,7 @@ private void fireTreeStructureChanged(Object source, Object[] path, TreeModelEvent event = null; // Process the listeners last to first, notifying // those that are interested in this event - for (int i = listeners.length - 2; i >= 0; i -= 2) { + for (var i = listeners.length - 2; i >= 0; i -= 2) { if (listeners[i] == TreeModelListener.class) { // Lazily create the event: if (event == null) { 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 39b3a05000f6..67edcf96f41c 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.java @@ -154,7 +154,7 @@ public Object getChild(Object parent, int index) { if (parent instanceof DetailNode parentNode) { DetailNode node = parentNode.getFirstChild(); - for (int nodeIndex = 0; nodeIndex < index; nodeIndex++) { + for (var nodeIndex = 0; nodeIndex < index; nodeIndex++) { node = node.getNextSibling(); } result = node; @@ -173,7 +173,7 @@ public Object getChild(Object parent, int index) { * @return the number of children of the node parent. */ public int getChildCount(Object parent) { - int result = 0; + var result = 0; if (parent instanceof DetailNode parentNode) { DetailNode node = parentNode.getFirstChild(); @@ -230,8 +230,8 @@ public boolean isLeaf(Object node) { * or don't belong to this tree model. */ public int getIndexOfChild(Object parent, Object child) { - int index = -1; - for (int i = 0; i < getChildCount(parent); i++) { + var index = -1; + for (var i = 0; i < getChildCount(parent); i++) { if (getChild(parent, i).equals(child)) { index = i; break; @@ -267,7 +267,7 @@ private Object getChildAtDetailAst(DetailAST parent, int index) { result = getJavadocTree(parent.getParent()); } else { - int currentIndex = 0; + var currentIndex = 0; DetailAST child = parent.getFirstChild(); while (currentIndex < index) { child = child.getNextSibling(); 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 eaaa0960081f..2eab202880c3 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java @@ -111,7 +111,7 @@ public TreeTable(ParseTreeTableModel treeTableModel) { // the table. if (tree.getRowHeight() < 1) { // Metal looks better like this. - final int height = getRowHeight(); + final var height = getRowHeight(); setRowHeight(height); } @@ -184,21 +184,21 @@ private void generateXpath() { private void setColumnsInitialWidth() { final FontMetrics fontMetrics = getFontMetrics(getFont()); // Six character string to contain "Column" column. - final int widthOfSixCharacterString = fontMetrics.stringWidth("XXXXXX"); + final var widthOfSixCharacterString = fontMetrics.stringWidth("XXXXXX"); // Padding must be added to width for columns to make them fully // visible in table header. - final int padding = 10; - final int widthOfColumnContainingSixCharacterString = + final var padding = 10; + final var widthOfColumnContainingSixCharacterString = widthOfSixCharacterString + padding; getColumn("Line").setMaxWidth(widthOfColumnContainingSixCharacterString); getColumn("Column").setMaxWidth(widthOfColumnContainingSixCharacterString); - final int preferredTreeColumnWidth = + final var preferredTreeColumnWidth = Math.toIntExact(Math.round(getPreferredSize().getWidth() * 0.6)); getColumn("Tree").setPreferredWidth(preferredTreeColumnWidth); // Twenty-eight character string to contain "Type" column - final int widthOfTwentyEightCharacterString = + final var widthOfTwentyEightCharacterString = fontMetrics.stringWidth("XXXXXXXXXXXXXXXXXXXXXXXXXXXX"); - final int preferredTypeColumnWidth = widthOfTwentyEightCharacterString + padding; + final var preferredTypeColumnWidth = widthOfTwentyEightCharacterString + padding; getColumn("Type").setPreferredWidth(preferredTypeColumnWidth); } @@ -302,7 +302,7 @@ public void updateUI() { */ @Override public int getEditingRow() { - int rowIndex = -1; + var rowIndex = -1; final Class editingClass = getColumnClass(editingColumn); if (editingClass != ParseTreeTableModel.class) { rowIndex = editingRow; @@ -397,7 +397,7 @@ public Component getTableCellEditorComponent(JTable table, @Override public boolean isCellEditable(EventObject event) { if (event instanceof MouseEvent mouseEvent) { - for (int counter = getColumnCount() - 1; counter >= 0; + for (var counter = getColumnCount() - 1; counter >= 0; counter--) { if (getColumnClass(counter) == ParseTreeTableModel.class) { final MouseEvent newMouseEvent = new MouseEvent(tree, mouseEvent.getID(), 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 1091a43645fe..95bd67b934df 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.java @@ -174,9 +174,9 @@ private static void populateModule(Element mod, ModuleDetails moduleDetails) { */ private static List createProperties(Element properties) { final NodeList propertyList = properties.getElementsByTagName("property"); - final int propertyListLength = propertyList.getLength(); + final var propertyListLength = propertyList.getLength(); final List result = new ArrayList<>(propertyListLength); - for (int i = 0; i < propertyListLength; i++) { + for (var i = 0; i < propertyListLength; i++) { final ModulePropertyDetails propertyDetails = new ModulePropertyDetails(); final Element prop = (Element) propertyList.item(i); propertyDetails.setName(getAttributeValue(prop, XML_TAG_NAME)); @@ -211,9 +211,9 @@ private static List getListContentByAttribute(Element element, String li List result = null; if (!children.isEmpty()) { final NodeList nodeList = children.get(0).getElementsByTagName(listOption); - final int nodeListLength = nodeList.getLength(); + final var nodeListLength = nodeList.getLength(); final List listContent = new ArrayList<>(nodeListLength); - for (int j = 0; j < nodeListLength; j++) { + for (var j = 0; j < nodeListLength; j++) { listContent.add(getAttributeValue((Element) nodeList.item(j), attribute)); } result = listContent; @@ -231,7 +231,7 @@ private static List getListContentByAttribute(Element element, String li private static List getDirectChildsByTag(Element element, String sTagName) { final NodeList children = element.getElementsByTagName(sTagName); final List res = new ArrayList<>(); - for (int i = 0; i < children.getLength(); i++) { + for (var i = 0; i < children.getLength(); i++) { if (children.item(i).getParentNode().equals(element)) { res.add((Element) children.item(i)); } 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 15a234655977..4dd3d2d8de33 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.java @@ -164,7 +164,7 @@ private static void writeToFile(Document document, ModuleDetails moduleDetails) .matcher(moduleDetails.getFullQualifiedName()) .replaceAll(fileSeparator); final String checkstyleString = "checkstyle"; - final int indexOfCheckstyle = + final var indexOfCheckstyle = moduleFilePath.indexOf(checkstyleString) + checkstyleString.length(); modifiedPath = rootOutputPath + DEFAULT_FILE_SEPARATOR diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/AllCheckSummaries.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/AllCheckSummaries.java index 95dcc895a177..99e7ed18b35b 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/site/AllCheckSummaries.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/AllCheckSummaries.java @@ -532,7 +532,7 @@ private static void addXmlHtmlMapping(Path path, Map map) { final Path fileName = path.getFileName(); if (fileName != null) { final String fileNameString = fileName.toString(); - final int extensionLength = 4; + final var extensionLength = 4; final String base = fileNameString.substring(0, fileNameString.length() - extensionLength) .toLowerCase(Locale.ROOT); @@ -567,7 +567,7 @@ private static String resolveHref(Map xmlMap, String category, result = href + ANCHOR_SEPARATOR + simpleName; } else { - final int lastSlash = href.lastIndexOf('/'); + final var lastSlash = href.lastIndexOf('/'); final String filename; if (lastSlash >= 0) { filename = href.substring(lastSlash + 1); @@ -672,8 +672,8 @@ private static String sanitizeAndFirstSentence(String html) { private static String extractFirstSentence(String text) { String result = ""; if (text != null && !text.isEmpty()) { - int end = -1; - for (int index = 0; index < text.length(); index++) { + var end = -1; + for (var index = 0; index < text.length(); index++) { if (text.charAt(index) == '.' && (index == text.length() - 1 || Character.isWhitespace(text.charAt(index + 1)) @@ -709,11 +709,11 @@ private static String wrapSummary(String text) { final String clean = sanitized.trim(); final StringBuilder result = new StringBuilder(CAPACITY); - int cleanIndex = 0; - final int cleanLen = clean.length(); + var cleanIndex = 0; + final var cleanLen = clean.length(); while (cleanIndex < cleanLen) { - final int remainingChars = cleanLen - cleanIndex; + final var remainingChars = cleanLen - cleanIndex; if (remainingChars <= MAX_CONTENT_WIDTH) { result.append(indent) @@ -722,8 +722,8 @@ private static String wrapSummary(String text) { break; } - final int idealBreak = cleanIndex + MAX_CONTENT_WIDTH; - final int actualBreak = calculateBreakPoint(clean, cleanIndex, idealBreak); + final var idealBreak = cleanIndex + MAX_CONTENT_WIDTH; + final var actualBreak = calculateBreakPoint(clean, cleanIndex, idealBreak); result.append(indent) .append(clean, cleanIndex, actualBreak); @@ -750,7 +750,7 @@ private static String wrapSummary(String text) { * @return the actual break position */ private static int calculateBreakPoint(String clean, int cleanIndex, int idealBreak) { - final int anchorStart = clean.indexOf("= idealBreak; } else { @@ -821,7 +821,7 @@ private static boolean shouldBreakAfterAnchorContent(int anchorStart, int anchor */ private static int findSafeBreakPoint(String text, int start, int idealBreak) { final int actualBreak; - final int lastSpace = text.lastIndexOf(' ', idealBreak); + final var lastSpace = text.lastIndexOf(' ', idealBreak); if (lastSpace > start && lastSpace >= start + MAX_CONTENT_WIDTH / 2) { actualBreak = lastSpace; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/ClassAndPropertiesSettersJavadocScraper.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/ClassAndPropertiesSettersJavadocScraper.java index b12932ace30c..9ef531c6739d 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/site/ClassAndPropertiesSettersJavadocScraper.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/ClassAndPropertiesSettersJavadocScraper.java @@ -94,7 +94,7 @@ else if (BlockCommentPosition.isOnClass(blockCommentAst)) { private static boolean isMethodOfScrapedModule(DetailAST methodDef) { final DetailAST classDef = getParentAst(methodDef, TokenTypes.CLASS_DEF); - boolean isMethodOfModule = false; + var isMethodOfModule = false; if (classDef != null) { final String className = classDef.findFirstToken(TokenTypes.IDENT).getText(); isMethodOfModule = className.equals(moduleName); @@ -140,7 +140,7 @@ private static String getPropertyName(String setterName) { * @return whether the AST represents a setter method */ private static boolean isSetterMethod(DetailAST ast) { - boolean setterMethod = false; + var setterMethod = false; if (ast.getType() == TokenTypes.METHOD_DEF) { final DetailAST type = ast.findFirstToken(TokenTypes.TYPE); 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 207f531903c7..37d389ba51fa 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/site/ExampleMacro.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/ExampleMacro.java @@ -175,7 +175,7 @@ private static String getCodeSnippet(Collection lines) { */ private static void writeSnippet(Sink sink, String snippet) { sink.rawText("
"); - final boolean isXml = isXml(snippet); + final var isXml = isXml(snippet); final String languageClass; if (isXml) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/ModuleJavadocParsingUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/ModuleJavadocParsingUtil.java index 40f52d1a45cc..506fe47cc281 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/site/ModuleJavadocParsingUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/ModuleJavadocParsingUtil.java @@ -116,7 +116,7 @@ public static void writeOutJavadocPortion(String javadocPortion, Sink sink) { sink.rawText(javadocPortionLinesSplit[0]); String lastHtmlTag = javadocPortionLinesSplit[0]; - for (int index = 1; index < javadocPortionLinesSplit.length; index++) { + for (var index = 1; index < javadocPortionLinesSplit.length; index++) { final String currentLine = javadocPortionLinesSplit[index].trim(); final String processedLine; @@ -151,7 +151,7 @@ else if (lastHtmlTag.contains(" tokens, String tokenTypesLink, boolean printDotAtTheEnd) throws MacroExecutionException { - for (int index = 0; index < tokens.size(); index++) { + for (var index = 0; index < tokens.size(); index++) { final String token = tokens.get(index); sink.rawText(ModuleJavadocParsingUtil.INDENT_LEVEL_16); if (index != 0) { 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 50023e213fab..08bbea42042a 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java @@ -520,7 +520,7 @@ private static void assertAllPropertySetterJavadocsAreFound( Set properties, String moduleName, Map javadocs) throws MacroExecutionException { for (String property : properties) { - final boolean isDocumented = javadocs.containsKey(property) + final var isDocumented = javadocs.containsKey(property) || SUPER_CLASS_PROPERTIES_JAVADOCS.containsKey(property) || TOKENS.equals(property) || JAVADOC_TOKENS.equals(property); if (!isDocumented) { @@ -948,7 +948,7 @@ else if (fieldClass == double[].class) { result = removeSquareBrackets(Arrays.toString((double[]) value).replace(".0", "")); } else if (fieldClass == String[].class) { - final boolean preserveOrder = hasPreserveOrderAnnotation(field); + final var preserveOrder = hasPreserveOrderAnnotation(field); result = getStringArrayPropertyValue(value, preserveOrder); } else if (fieldClass == Pattern.class) { @@ -1329,9 +1329,9 @@ public static String getModuleName(File file) { // -@cs[ExecutableStatementCount] Splitting would not make the code more readable. private static String getDescriptionFromJavadocForXdoc(DetailNode javadoc, String moduleName) throws MacroExecutionException { - boolean isInCodeLiteral = false; - boolean isInHtmlElement = false; - boolean isInHrefAttribute = false; + var isInCodeLiteral = false; + var isInHtmlElement = false; + var isInHrefAttribute = false; final StringBuilder description = new StringBuilder(128); final List descriptionNodes = getFirstJavadocParagraphNodes(javadoc); DetailNode node = descriptionNodes.get(0); @@ -1500,7 +1500,7 @@ private static void handleInternalLink(StringBuilder description, href = href.substring(1, href.length() - 1); final String relativeHref = getLinkToDocument(moduleName, href); - final char doubleQuote = '\"'; + final var doubleQuote = '\"'; description.append(doubleQuote).append(relativeHref).append(doubleQuote); } } 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 804bc592718e..91535c4f753c 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtil.java @@ -111,7 +111,7 @@ public static boolean containsAnnotation(DetailAST ast, Set annotations) if (annotations == null) { throw new IllegalArgumentException("annotations cannot be null"); } - boolean result = false; + var result = false; if (!annotations.isEmpty()) { final DetailAST firstMatchingAnnotation = findFirstAnnotation(ast, annotationNode -> { final String annotationFullIdent = getAnnotationFullIdent(annotationNode); 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 3ebe11b15907..8beda2c8feb1 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/BlockCommentPosition.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/BlockCommentPosition.java @@ -79,7 +79,7 @@ public static boolean isOnRecord(DetailAST blockComment) { * @return true if node is before package */ public static boolean isOnPackage(DetailAST blockComment) { - boolean result = isOnTokenWithAnnotation(blockComment, TokenTypes.PACKAGE_DEF); + var result = isOnTokenWithAnnotation(blockComment, TokenTypes.PACKAGE_DEF); if (!result) { DetailAST nextSibling = blockComment.getNextSibling(); @@ -209,7 +209,7 @@ public static boolean isOnCompactConstructor(DetailAST blockComment) { */ public static boolean isOnEnumConstant(DetailAST blockComment) { final DetailAST parent = blockComment.getParent(); - boolean result = false; + var result = false; if (parent.getType() == TokenTypes.ENUM_CONSTANT_DEF) { final DetailAST prevSibling = getPrevSiblingSkipComments(blockComment); if (prevSibling.getType() == TokenTypes.ANNOTATIONS && !prevSibling.hasChildren()) { 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 3210bea9c851..46a7bd626284 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.java @@ -114,8 +114,8 @@ public static Properties getResolvedProperties(Properties properties) * @return property name */ private static String getPropertyNameFromExpression(String variableExpression) { - final int propertyStartIndex = variableExpression.lastIndexOf('{') + 1; - final int propertyEndIndex = variableExpression.lastIndexOf('}'); + final var propertyStartIndex = variableExpression.lastIndexOf('{') + 1; + final var propertyEndIndex = variableExpression.lastIndexOf('}'); return variableExpression.substring(propertyStartIndex, propertyEndIndex); } 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 f0c716d8aab4..27ee3d96d00c 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java @@ -75,11 +75,11 @@ private CheckUtil() { * @return true if ast defines an equals covariant. */ public static boolean isEqualsMethod(DetailAST ast) { - boolean equalsMethod = false; + var equalsMethod = false; if (ast.getType() == TokenTypes.METHOD_DEF) { final DetailAST modifiers = ast.findFirstToken(TokenTypes.MODIFIERS); - final boolean staticOrAbstract = + final var staticOrAbstract = modifiers.findFirstToken(TokenTypes.LITERAL_STATIC) != null || modifiers.findFirstToken(TokenTypes.ABSTRACT) != null; @@ -113,7 +113,7 @@ public static double parseDouble(String text, int type) { case TokenTypes.NUM_FLOAT, TokenTypes.NUM_DOUBLE -> Double.parseDouble(txt); case TokenTypes.NUM_INT, TokenTypes.NUM_LONG -> { - int radix = BASE_10; + var radix = BASE_10; if (txt.startsWith("0x") || txt.startsWith("0X")) { radix = BASE_16; txt = txt.substring(2); @@ -151,7 +151,7 @@ private static double parseNumber(final String text, final int radix, final int } final double result; - final boolean negative = txt.charAt(0) == '-'; + final var negative = txt.charAt(0) == '-'; if (type == TokenTypes.NUM_INT) { if (negative) { result = Integer.parseInt(txt, radix); @@ -270,7 +270,7 @@ public static List getTypeParameters(final DetailAST node) { * @return true if method is a not void one. */ public static boolean isNonVoidMethod(DetailAST methodDefAst) { - boolean returnValue = false; + var returnValue = false; if (methodDefAst.getType() == TokenTypes.METHOD_DEF) { final DetailAST typeAST = methodDefAst.findFirstToken(TokenTypes.TYPE); if (typeAST.findFirstToken(TokenTypes.LITERAL_VOID) == null) { @@ -347,7 +347,7 @@ private static AccessModifierOption getAccessModifierFromModifiersTokenDirectly( AccessModifierOption accessModifier = AccessModifierOption.PACKAGE; for (DetailAST token = modifiersToken.getFirstChild(); token != null; token = token.getNextSibling()) { - final int tokenType = token.getType(); + final var tokenType = token.getType(); if (tokenType == TokenTypes.LITERAL_PUBLIC) { accessModifier = AccessModifierOption.PUBLIC; } @@ -372,7 +372,7 @@ public static AccessModifierOption getSurroundingAccessModifier(DetailAST node) for (DetailAST token = node; returnValue == null && !TokenUtil.isRootNode(token); token = token.getParent()) { - final int type = token.getType(); + final var type = token.getType(); if (type == TokenTypes.CLASS_DEF || type == TokenTypes.INTERFACE_DEF || type == TokenTypes.ANNOTATION_DEF @@ -414,7 +414,7 @@ public static String stripIndentAndInitialNewLineFromTextBlock(String textBlockC ALL_NEW_LINES.matcher(textBlockContent).replaceFirst(""); final List lines = Arrays.asList(ALL_NEW_LINES.split(contentWithInitialNewLineRemoved)); - final int indent = getSmallestIndent(lines); + final var indent = getSmallestIndent(lines); final String suffix = ""; return lines.stream() @@ -431,7 +431,7 @@ public static String stripIndentAndInitialNewLineFromTextBlock(String textBlockC * @return modified string with removed indent and trailing whitespace, or empty string. */ private static String stripIndentAndTrailingWhitespaceFromLine(String line, int indent) { - final int lastNonWhitespace = lastIndexOfNonWhitespace(line); + final var lastNonWhitespace = lastIndexOfNonWhitespace(line); String returnString = ""; if (lastNonWhitespace > 0) { returnString = line.substring(indent, lastNonWhitespace); @@ -486,9 +486,9 @@ private static int lastIndexOfNonWhitespace(String line) { */ public static int typeDeclarationNameMatchingCount(String patternClass, String classToBeMatched) { - final int length = Math.min(classToBeMatched.length(), patternClass.length()); - int result = 0; - for (int i = 0; i < length && patternClass.charAt(i) == classToBeMatched.charAt(i); ++i) { + final var length = Math.min(classToBeMatched.length(), patternClass.length()); + var result = 0; + for (var i = 0; i < length && patternClass.charAt(i) == classToBeMatched.charAt(i); ++i) { if (patternClass.charAt(i) == PACKAGE_SEPARATOR) { result = i; } 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 b4bca30fa83d..337dad03d8f1 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/CodePointUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/CodePointUtil.java @@ -62,7 +62,7 @@ public static boolean hasWhitespaceBefore(int index, int... codePoints) { * @return unicode code points array with trailing whitespaces removed */ public static int[] stripTrailing(int... codePoints) { - int lastIndex = codePoints.length; + var lastIndex = codePoints.length; while (CommonUtil.isCodePointWhitespace(codePoints, lastIndex - 1)) { lastIndex--; } @@ -78,7 +78,7 @@ public static int[] stripTrailing(int... codePoints) { * @return {@code true}, if the unicode code points array ends with provided suffix */ public static boolean endsWith(int[] codePoints, String suffix) { - final int startIndex = codePoints.length - suffix.length(); + final var startIndex = codePoints.length - suffix.length(); return startIndex > -1 && Arrays.equals(Arrays .copyOfRange(codePoints, startIndex, codePoints.length), suffix.codePoints().toArray()); 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 784a35e5d155..296712701987 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtil.java @@ -119,14 +119,14 @@ public static Pattern createPattern(String pattern, int flags) { * @return whether there is a match. */ public static boolean matchesFileExtension(File file, String... fileExtensions) { - boolean result = false; + var result = false; if (fileExtensions == null || fileExtensions.length == 0) { result = true; } else { // normalize extensions so all of them have a leading dot final String[] withDotExtensions = new String[fileExtensions.length]; - for (int i = 0; i < fileExtensions.length; i++) { + for (var i = 0; i < fileExtensions.length; i++) { final String extension = fileExtensions[i]; if (extension.startsWith(EXTENSION_SEPARATOR)) { withDotExtensions[i] = extension; @@ -158,8 +158,8 @@ public static boolean matchesFileExtension(File file, String... fileExtensions) * @return whether there is only whitespace */ public static boolean hasWhitespaceBefore(int index, String line) { - boolean result = true; - for (int i = 0; i < index; i++) { + var result = true; + for (var i = 0; i < index; i++) { if (!Character.isWhitespace(line.charAt(i))) { result = false; break; @@ -178,8 +178,8 @@ public static boolean hasWhitespaceBefore(int index, String line) { * @return the length of the string ignoring all trailing whitespace **/ public static int lengthMinusTrailingWhitespace(String line) { - int len = line.length(); - for (int i = len - 1; i >= 0; i--) { + var len = line.length(); + for (var i = len - 1; i >= 0; i--) { if (!Character.isWhitespace(line.charAt(i))) { break; } @@ -204,8 +204,8 @@ public static int lengthMinusTrailingWhitespace(String line) { public static int lengthExpandedTabs(String inputString, int toIdx, int tabWidth) { - int len = 0; - for (int idx = 0; idx < toIdx; idx++) { + var len = 0; + for (var idx = 0; idx < toIdx; idx++) { if (inputString.codePointAt(idx) == '\t') { len = (len / tabWidth + 1) * tabWidth; } @@ -224,7 +224,7 @@ public static int lengthExpandedTabs(String inputString, * @return true if the pattern is valid false otherwise */ public static boolean isPatternValid(String pattern) { - boolean isValid = true; + var isValid = true; try { Pattern.compile(pattern); } @@ -242,7 +242,7 @@ public static boolean isPatternValid(String pattern) { * @return the base class name from a fully qualified name */ public static String baseClassName(String type) { - final int index = type.lastIndexOf('.'); + final var index = type.lastIndexOf('.'); return type.substring(index + 1); } @@ -469,7 +469,7 @@ public static String fillTemplateWithStringsByRegexp( final Matcher matcher = regexp.matcher(lineToPlaceInTemplate); String result = template; if (matcher.find()) { - for (int i = 0; i <= matcher.groupCount(); i++) { + for (var i = 0; i <= matcher.groupCount(); i++) { // $n expands comment match like in Pattern.subst(). result = result.replaceAll("\\$" + i, matcher.group(i)); } @@ -487,7 +487,7 @@ public static String fillTemplateWithStringsByRegexp( */ public static String getFileNameWithoutExtension(String fullFilename) { final String fileName = new File(fullFilename).getName(); - final int dotIndex = fileName.lastIndexOf('.'); + final var dotIndex = fileName.lastIndexOf('.'); final String fileNameWithoutExtension; if (dotIndex == -1) { fileNameWithoutExtension = fileName; @@ -510,7 +510,7 @@ public static String getFileNameWithoutExtension(String fullFilename) { */ public static String getFileExtension(String fileNameWithExtension) { final String fileName = Path.of(fileNameWithExtension).toString(); - final int dotIndex = fileName.lastIndexOf('.'); + final var dotIndex = fileName.lastIndexOf('.'); final String extension; if (dotIndex == -1) { extension = ""; @@ -528,9 +528,9 @@ public static String getFileExtension(String fileNameWithExtension) { * @return true when the given string contains valid identifier. */ public static boolean isIdentifier(String str) { - boolean isIdentifier = !str.isEmpty(); + var isIdentifier = !str.isEmpty(); - for (int i = 0; isIdentifier && i < str.length(); i++) { + for (var i = 0; isIdentifier && i < str.length(); i++) { if (i == 0) { isIdentifier = Character.isJavaIdentifierStart(str.charAt(0)); } @@ -549,7 +549,7 @@ public static boolean isIdentifier(String str) { * @return true when the given string contains valid name. */ public static boolean isName(String str) { - boolean isName = false; + var isName = false; final String[] identifiers = str.split("\\.", -1); for (String identifier : identifiers) { @@ -581,10 +581,10 @@ public static boolean isBlank(String value) { * @return the index of the first non-whitespace character. */ public static int indexOfNonWhitespace(String value) { - final int length = value.length(); - int left = 0; + final var length = value.length(); + var left = 0; while (left < length) { - final int codePointAt = value.codePointAt(left); + final var codePointAt = value.codePointAt(left); if (!Character.isWhitespace(codePointAt)) { break; } @@ -606,7 +606,7 @@ public static int indexOfNonWhitespace(String value) { public static boolean isCodePointWhitespace(int[] codePoints, int index) { // We only need to check the first member of a surrogate pair to verify that // it is not whitespace. - final char character = Character.toChars(codePoints[index])[0]; + final var character = Character.toChars(codePoints[index])[0]; return Character.isWhitespace(character); } 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 405c658f63cb..d9305e3d8486 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java @@ -97,12 +97,12 @@ private JavadocUtil() { public static JavadocTags getJavadocTags(TextBlock textBlock, JavadocTagType tagType) { final List tags = new ArrayList<>(); - final boolean isBlockTags = tagType == JavadocTagType.ALL + final var isBlockTags = tagType == JavadocTagType.ALL || tagType == JavadocTagType.BLOCK; if (isBlockTags) { tags.addAll(BlockTagUtil.extractBlockTags(textBlock.getText())); } - final boolean isInlineTags = tagType == JavadocTagType.ALL + final var isInlineTags = tagType == JavadocTagType.ALL || tagType == JavadocTagType.INLINE; if (isInlineTags) { tags.addAll(InlineTagUtil.extractInlineTags(textBlock.getText())); @@ -112,12 +112,12 @@ public static JavadocTags getJavadocTags(TextBlock textBlock, final List invalidTags = new ArrayList<>(); for (TagInfo tag : tags) { - final int col = tag.getPosition().getColumn(); + final var col = tag.getPosition().getColumn(); // Add the starting line of the comment to the line number to get the actual line number // in the source. // Lines are one-indexed, so need an off-by-one correction. - final int line = textBlock.getStartLineNo() + tag.getPosition().getLine() - 1; + final var line = textBlock.getStartLineNo() + tag.getPosition().getLine() - 1; if (JavadocTagInfo.isValidName(tag.getName())) { validTags.add( @@ -140,10 +140,10 @@ public static JavadocTags getJavadocTags(TextBlock textBlock, * identifier. */ public static boolean isJavadocComment(String commentContent) { - boolean result = false; + var result = false; if (!commentContent.isEmpty()) { - final char docCommentIdentifier = commentContent.charAt(0); + final var docCommentIdentifier = commentContent.charAt(0); result = docCommentIdentifier == '*'; } @@ -240,7 +240,7 @@ public static List getAllNodesOfType(DetailNode detailNode, int type public static boolean isTag(DetailNode ast, String expectedTagName) { final DetailNode htmlTagStart = findFirstToken(ast, JavadocCommentsTokenTypes.HTML_TAG_START); - boolean isTag = false; + var isTag = false; if (htmlTagStart != null) { final String tagName = findFirstToken(htmlTagStart, JavadocCommentsTokenTypes.TAG_NAME).getText(); 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 a34498c2593f..2dbfdfbc7032 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.java @@ -86,7 +86,7 @@ && hasDefaultConstructor(clazz) * @return true if the class has a default constructor. */ private static boolean hasDefaultConstructor(Class clazz) { - boolean result = false; + var result = false; for (Constructor constructor : clazz.getDeclaredConstructors()) { if (constructor.getParameterCount() == 0) { result = true; 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 c5252f621b0d..0bc27a6051de 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ParserUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ParserUtil.java @@ -84,8 +84,8 @@ public static DetailAST createBlockCommentNode(CommonToken token) { final DetailAstImpl blockComment = new DetailAstImpl(); blockComment.initialize(TokenTypes.BLOCK_COMMENT_BEGIN, BLOCK_MULTIPLE_COMMENT_BEGIN); - final int tokenCharPositionInLine = token.getCharPositionInLine(); - final int tokenLine = token.getLine(); + final var tokenCharPositionInLine = token.getCharPositionInLine(); + final var tokenLine = token.getLine(); final String tokenText = token.getText(); blockComment.setColumnNo(tokenCharPositionInLine); @@ -122,9 +122,9 @@ public static DetailAST createBlockCommentNode(CommonToken token) { */ private static Map.Entry countLinesColumns( String text, int initialLinesCnt, int initialColumnsCnt) { - int lines = initialLinesCnt; - int columns = initialColumnsCnt; - boolean foundCr = false; + var lines = initialLinesCnt; + var columns = initialColumnsCnt; + var foundCr = false; for (char c : text.toCharArray()) { if (c == '\n') { foundCr = false; 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 414115111786..1edbd7674618 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtil.java @@ -128,7 +128,7 @@ public static Scope getSurroundingScope(DetailAST node) { for (DetailAST token = node; token != null; token = token.getParent()) { - final int type = token.getType(); + final var type = token.getType(); if (TokenUtil.isTypeDeclaration(type)) { final Scope tokenScope = getScope(token); if (returnValue == null || returnValue.isIn(tokenScope)) { @@ -193,7 +193,7 @@ public static boolean isInAnnotationBlock(DetailAST node) { * @return a {@code boolean} value */ public static boolean isInBlockOf(DetailAST node, int tokenType) { - boolean returnValue = false; + var returnValue = false; // Loop up looking for a containing interface block for (DetailAST token = node.getParent(); @@ -226,7 +226,7 @@ public static boolean isInInterfaceOrAnnotationBlock(DetailAST node) { * @return a {@code boolean} value */ public static boolean isInEnumBlock(DetailAST node) { - boolean returnValue = false; + var returnValue = false; // Loop up looking for a containing interface block for (DetailAST token = node.getParent(); @@ -250,7 +250,7 @@ public static boolean isInEnumBlock(DetailAST node) { * @return a {@code boolean} value */ public static boolean isInCodeBlock(DetailAST node) { - boolean returnValue = false; + var returnValue = false; final int[] tokenTypes = { TokenTypes.METHOD_DEF, TokenTypes.CTOR_DEF, @@ -280,7 +280,7 @@ public static boolean isInCodeBlock(DetailAST node) { * @return a {@code boolean} value */ public static boolean isOuterMostType(DetailAST node) { - boolean returnValue = true; + var returnValue = true; for (DetailAST parent = node.getParent(); parent != null; parent = parent.getParent()) { 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 25a0886c9fb7..38cd71b1b9ce 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java @@ -284,7 +284,7 @@ public static boolean isTypeDeclaration(int type) { * @return true if type matches one of the given types. */ public static boolean isOfType(int type, int... types) { - boolean matching = false; + var matching = false; for (int tokenType : types) { if (tokenType == type) { matching = true; @@ -336,8 +336,8 @@ public static boolean isRootNode(DetailAST ast) { * @return true if tokenType is LITERAL_TRUE or LITERAL_FALSE */ public static boolean isBooleanLiteralType(final int tokenType) { - final boolean isTrue = tokenType == TokenTypes.LITERAL_TRUE; - final boolean isFalse = tokenType == TokenTypes.LITERAL_FALSE; + final var isTrue = tokenType == TokenTypes.LITERAL_TRUE; + final var isFalse = tokenType == TokenTypes.LITERAL_FALSE; return isTrue || isFalse; } 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 04dc2704f94d..5346bf570e80 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/XpathUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/XpathUtil.java @@ -136,10 +136,10 @@ private XpathUtil() { public static List createChildren(AbstractNode root, AbstractNode parent, DetailAST firstChild) { DetailAST currentChild = firstChild; - final int depth = parent.getDepth() + 1; + final var depth = parent.getDepth() + 1; final List result = new ArrayList<>(); while (currentChild != null) { - final int index = result.size(); + final var index = result.size(); final ElementNode child = new ElementNode(root, parent, currentChild, depth, index); result.add(child); currentChild = currentChild.getNextSibling(); 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 075624027470..a12839a880ae 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.java @@ -98,7 +98,7 @@ protected AbstractElementNode(AbstractNode root, AbstractNode parent, */ @Override public int compareOrder(NodeInfo other) { - int result = 0; + var result = 0; if (other instanceof AbstractNode node) { result = Integer.compare(depth, node.getDepth()); if (result == 0) { @@ -125,8 +125,8 @@ private static int compareCommonAncestorChildrenOrder(NodeInfo first, NodeInfo s child1 = child1.getParent(); child2 = child2.getParent(); } - final int index1 = ((AbstractElementNode) child1).indexAmongSiblings; - final int index2 = ((AbstractElementNode) child2).indexAmongSiblings; + final var index1 = ((AbstractElementNode) child1).indexAmongSiblings; + final var index2 = ((AbstractElementNode) child2).indexAmongSiblings; return Integer.compare(index1, index2); } 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 55d225c44850..3a72369e3688 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.java @@ -206,7 +206,7 @@ public static String generateXpathQuery(DetailAST ast) { */ private static int findPositionAmongSiblings(DetailAST ast) { DetailAST cur = ast; - int pos = 0; + var pos = 0; while (cur != null) { if (cur.getType() == ast.getType()) { pos++; @@ -292,7 +292,7 @@ private static String getXpathQuery(DetailAST root, DetailAST ast) { * @return if the given ast element has unique {@code TokenTypes} among siblings */ private static boolean hasAtLeastOneSiblingWithSameTokenType(DetailAST ast) { - boolean result = false; + var result = false; DetailAST prev = ast.getPreviousSibling(); while (prev != null) { if (prev.getType() == ast.getType()) { diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractGuiTestSupport.java b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractGuiTestSupport.java index 0010a7c0052d..d7d50c026efd 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractGuiTestSupport.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractGuiTestSupport.java @@ -49,7 +49,7 @@ public abstract class AbstractGuiTestSupport extends AbstractPathTestSupport { */ @BeforeEach public void validateGraphicsEnvironment() { - final boolean isHeadless = GraphicsEnvironment.isHeadless(); + final var isHeadless = GraphicsEnvironment.isHeadless(); assumeFalse(isHeadless, "This test is incompatible with headless environment"); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractModuleTestSupport.java b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractModuleTestSupport.java index c881913e9006..de2f02ffca30 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractModuleTestSupport.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractModuleTestSupport.java @@ -706,7 +706,7 @@ private void verifyViolations(Configuration config, assertWithMessage("Violation lines for %s differ.", file) .that(actualViolationLines) .isEqualTo(expectedViolationLines); - for (int index = 0; index < actualViolations.size(); index++) { + for (var index = 0; index < actualViolations.size(); index++) { assertWithMessage("Actual and expected violations differ.") .that(actualViolations.get(index)) .matches(testInputViolations.get(index).toRegex()); @@ -733,7 +733,7 @@ private static void verifyViolations(String file, assertWithMessage("Violation lines for %s differ.", file) .that(actualViolationLines) .isEqualTo(expectedViolationLines); - for (int index = 0; index < actualViolations.size(); index++) { + for (var index = 0; index < actualViolations.size(); index++) { assertWithMessage("Actual and expected violations differ.") .that(actualViolations.get(index)) .matches(testInputViolations.get(index).toRegex()); @@ -922,7 +922,7 @@ private String getMessageBundle() { private static String getMessageBundle(String className) { final String messageBundle; final String messages = "messages"; - final int endIndex = className.lastIndexOf('.'); + final var endIndex = className.lastIndexOf('.'); final Map messageBundleMappings = new HashMap<>(); messageBundleMappings.put("SeverityMatchFilterExamplesTest", "com.puppycrawl.tools.checkstyle.checks.naming.messages"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractXmlTestSupport.java b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractXmlTestSupport.java index 58b62cc1c66b..edc4f69dd5ed 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractXmlTestSupport.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractXmlTestSupport.java @@ -86,7 +86,7 @@ protected static void verifyXml(String expectedOutputFile, BiPredicate ordered, String... messages) throws Exception { String expectedContents = readFile(expectedOutputFile); - for (int i = 0; i < messages.length; i++) { + for (var i = 0; i < messages.length; i++) { expectedContents = expectedContents.replace("$" + i, messages[i]); } @@ -229,7 +229,7 @@ private static void verifyXmlAttributes(NamedNodeMap expected, NamedNodeMap actu .that(actual) .isNotNull(); - for (int i = 0; i < expected.getLength(); i++) { + for (var i = 0; i < expected.getLength(); i++) { verifyXmlAttribute(expected.item(i), actual.item(i), path); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java index 0b5567a3c67d..ec0adde78c51 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java @@ -381,10 +381,10 @@ public void testFileExtensions() throws Exception { final String[] fileExtensions = {"java", "xml", "properties"}; checker.setFileExtensions(fileExtensions); checker.setCacheFile(createTempFile("junit").getPath()); - final int counter = checker.process(files); + final var counter = checker.process(files); // comparing to 1 as there is only one legal file in input - final int numLegalFiles = 1; + final var numLegalFiles = 1; final PropertyCacheFile cache = TestUtil.getInternalState(checker, "cacheFile", PropertyCacheFile.class); assertWithMessage("There were more legal files than expected") @@ -421,10 +421,10 @@ public void testIgnoredFileExtensions() throws Exception { final String[] fileExtensions = {"java", "xml", "properties"}; checker.setFileExtensions(fileExtensions); checker.setCacheFile(createTempFile("junit").getPath()); - final int counter = checker.process(allIgnoredFiles); + final var counter = checker.process(allIgnoredFiles); // comparing to 0 as there is no legal file in input - final int numLegalFiles = 0; + final var numLegalFiles = 0; assertWithMessage("There were more legal files than expected") .that(counter) .isEqualTo(numLegalFiles); @@ -678,7 +678,7 @@ public void testWithCacheWithNoViolation() throws Exception { } // There should 2 objects in cache: processed file (file.java) and checker configuration. - final int expectedNumberOfObjectsInCache = 2; + final var expectedNumberOfObjectsInCache = 2; assertWithMessage("Cache has unexpected size") .that(cache) .hasSize(expectedNumberOfObjectsInCache); @@ -737,7 +737,7 @@ public void testClearExistingCache() throws Exception { assertWithMessage("Cash have changed it hash") .that(cacheHash) .isEqualTo(cacheAfterClear.getProperty(PropertyCacheFile.CONFIG_HASH_KEY)); - final int expectedNumberOfObjectsInCacheAfterSecondRun = 2; + final var expectedNumberOfObjectsInCacheAfterSecondRun = 2; assertWithMessage("Cache has changed number of items") .that(cacheAfterSecondRun) .hasSize(expectedNumberOfObjectsInCacheAfterSecondRun); @@ -958,7 +958,7 @@ public void testCacheAndFilterWhichDoesNotImplementExternalResourceHolderInterfa assertWithMessage("Cache has changed its hash") .that(cacheHash) .isEqualTo(cacheAfterFirstRun.getProperty(PropertyCacheFile.CONFIG_HASH_KEY)); - final int expectedNumberOfObjectsInCache = 2; + final var expectedNumberOfObjectsInCache = 2; assertWithMessage("Number of items in cache differs from expected") .that(cacheAfterFirstRun) .hasSize(expectedNumberOfObjectsInCache); @@ -1005,7 +1005,7 @@ public void testCacheAndCheckWhichAddsNewResourceLocationButKeepsSameCheckerInst cacheAfterFirstRun.load(reader); } - final int expectedNumberOfObjectsInCacheAfterFirstRun = 4; + final var expectedNumberOfObjectsInCacheAfterFirstRun = 4; assertWithMessage("Number of items in cache differs from expected") .that(cacheAfterFirstRun) .hasSize(expectedNumberOfObjectsInCacheAfterFirstRun); @@ -1040,7 +1040,7 @@ public void testCacheAndCheckWhichAddsNewResourceLocationButKeepsSameCheckerInst assertWithMessage("Cache has null as a resource key") .that(cacheAfterFirstRun.getProperty(firstExternalResourceKey)) .isNotNull(); - final int expectedNumberOfObjectsInCacheAfterSecondRun = 4; + final var expectedNumberOfObjectsInCacheAfterSecondRun = 4; assertWithMessage("Number of items in cache differs from expected") .that(cacheAfterSecondRun) .hasSize(expectedNumberOfObjectsInCacheAfterSecondRun); @@ -1629,7 +1629,7 @@ public void testDuplicatedModule() throws Exception { // super.verify does not work here, for we change the logger out.flush(); - final int errs = checker.process(Collections.singletonList(new File(path))); + final var errs = checker.process(Collections.singletonList(new File(path))); try (ByteArrayInputStream inputStream = new ByteArrayInputStream(out.toByteArray()); LineNumberReader lnr = new LineNumberReader( @@ -1643,7 +1643,7 @@ public void testDuplicatedModule() throws Exception { .toList(); Arrays.sort(expected); - for (int i = 0; i < expected.length; i++) { + for (var i = 0; i < expected.length; i++) { final String expectedResult = "[ERROR] " + path + ":" + expected[i]; assertWithMessage("error message %s", i) .that(actual.get(i)) @@ -1926,7 +1926,7 @@ public void visitToken(DetailAST ast) { + " The check does not require comment nodes but there were comment nodes" + " in the AST."); } - final int childCount = ast.getChildCount(); + final var childCount = ast.getChildCount(); if (childCount != METHOD_DEF_CHILD_COUNT) { final String msg = String.format(Locale.ENGLISH, "AST node in no comment tree has wrong number of children. " @@ -1935,12 +1935,12 @@ public void visitToken(DetailAST ast) { log(ast, msg); } // count children where comment lives - int actualChildCount = 0; + var actualChildCount = 0; for (DetailAST child = ast.getFirstChild().getFirstChild(); child != null; child = child.getNextSibling()) { actualChildCount++; } - final int cacheChildCount = ast.getFirstChild().getChildCount(); + final var cacheChildCount = ast.getFirstChild().getChildCount(); if (cacheChildCount != actualChildCount) { final String msg = String.format(Locale.ENGLISH, "AST node with no comment has wrong number of children. " @@ -1984,7 +1984,7 @@ public void visitToken(DetailAST ast) { TokenTypes.BLOCK_COMMENT_BEGIN) == null) { log(ast, "Incorrect AST structure."); } - final int childCount = ast.getChildCount(); + final var childCount = ast.getChildCount(); if (childCount != METHOD_DEF_CHILD_COUNT) { final String msg = String.format(Locale.ENGLISH, "AST node in comment tree has wrong number of children. " @@ -1993,12 +1993,12 @@ public void visitToken(DetailAST ast) { log(ast, msg); } // count children where comment lives - int actualChildCount = 0; + var actualChildCount = 0; for (DetailAST child = ast.getFirstChild().getFirstChild(); child != null; child = child.getNextSibling()) { actualChildCount++; } - final int cacheChildCount = ast.getFirstChild().getChildCount(); + final var cacheChildCount = ast.getFirstChild().getChildCount(); if (cacheChildCount != actualChildCount) { final String msg = String.format(Locale.ENGLISH, "AST node with comment has wrong number of children. " diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java index b3c73300d2da..4c6756208d70 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java @@ -603,7 +603,7 @@ public void testConfigWithIgnore() throws Exception { new PropertiesExpander(new Properties()), IgnoredModulesOptions.OMIT); final Configuration[] children = config.getChildren(); - final int length = children[0].getChildren().length; + final var length = children[0].getChildren().length; assertWithMessage("Invalid children count") .that(length) .isEqualTo(0); @@ -618,7 +618,7 @@ public void testConfigWithIgnoreUsingInputSource() throws Exception { new PropertiesExpander(new Properties()), IgnoredModulesOptions.OMIT); final Configuration[] children = config.getChildren(); - final int length = children[0].getChildren().length; + final var length = children[0].getChildren().length; assertWithMessage("Invalid children count") .that(length) .isEqualTo(0); @@ -662,7 +662,7 @@ public void testLoadConfigurationDeprecated() throws Exception { new PropertiesExpander(new Properties()), IgnoredModulesOptions.OMIT); final Configuration[] children = config.getChildren(); - final int length = children[0].getChildren().length; + final var length = children[0].getChildren().length; assertWithMessage("Invalid children count") .that(length) .isEqualTo(0); @@ -676,7 +676,7 @@ public void testLoadConfigurationFromClassPath() throws Exception { new PropertiesExpander(new Properties()), IgnoredModulesOptions.OMIT); final Configuration[] children = config.getChildren(); - final int length = children[0].getChildren().length; + final var length = children[0].getChildren().length; assertWithMessage("Invalid children count") .that(length) .isEqualTo(0); @@ -717,7 +717,7 @@ public void testConstructors() throws Exception { ConfigurationLoader.IgnoredModulesOptions.EXECUTE); final Configuration[] children = configuration1.getChildren(); - final int length = children[0].getChildren().length; + final var length = children[0].getChildren().length; assertWithMessage("Unexpected children size") .that(length) .isEqualTo(1); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java index ece553a4a758..46c5d59851f1 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java @@ -147,7 +147,7 @@ public void testOldCtorWithTwoParametersCloseStreamOptions() { final OutputStream infoStream = new ByteArrayOutputStream(); final DefaultLogger dl = new DefaultLogger(infoStream, AutomaticBean.OutputStreamOptions.CLOSE); - final boolean closeInfo = TestUtil.getInternalState(dl, "closeInfo", Boolean.class); + final var closeInfo = TestUtil.getInternalState(dl, "closeInfo", Boolean.class); assertWithMessage("closeInfo should be true") .that(closeInfo) @@ -164,7 +164,7 @@ public void testOldCtorWithTwoParametersNoneStreamOptions() { final OutputStream infoStream = new ByteArrayOutputStream(); final DefaultLogger dl = new DefaultLogger(infoStream, AutomaticBean.OutputStreamOptions.NONE); - final boolean closeInfo = TestUtil.getInternalState(dl, "closeInfo", Boolean.class); + final var closeInfo = TestUtil.getInternalState(dl, "closeInfo", Boolean.class); assertWithMessage("closeInfo should be false") .that(closeInfo) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java index 43abd9c15b1e..acd9fe0ae5a6 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java @@ -203,23 +203,23 @@ public void testGetChildCountType() throws Exception { invokeSetParentMethod(firstLevelB, root); - final int childCountLevelB = firstLevelB.getChildCount(0); + final var childCountLevelB = firstLevelB.getChildCount(0); assertWithMessage("Invalid child count") .that(childCountLevelB) .isEqualTo(0); - final int childCountLevelA = firstLevelA.getChildCount(TokenTypes.EXPR); + final var childCountLevelA = firstLevelA.getChildCount(TokenTypes.EXPR); assertWithMessage("Invalid child count") .that(childCountLevelA) .isEqualTo(0); - final int identTypeCount = root.getChildCount(TokenTypes.IDENT); + final var identTypeCount = root.getChildCount(TokenTypes.IDENT); assertWithMessage("Invalid child count") .that(identTypeCount) .isEqualTo(1); - final int exprTypeCount = root.getChildCount(TokenTypes.EXPR); + final var exprTypeCount = root.getChildCount(TokenTypes.EXPR); assertWithMessage("Invalid child count") .that(exprTypeCount) .isEqualTo(1); - final int invalidTypeCount = root.getChildCount(0); + final var invalidTypeCount = root.getChildCount(0); assertWithMessage("Invalid child count") .that(invalidTypeCount) .isEqualTo(0); @@ -432,11 +432,11 @@ public void testClearChildCountCache() { ); for (Consumer method : clearChildCountCacheMethods) { - final int startCount = parent.getChildCount(); + final var startCount = parent.getChildCount(); method.accept(null); - final int intermediateCount = TestUtil.getInternalState(parent, "childCount", + final var intermediateCount = TestUtil.getInternalState(parent, "childCount", Integer.class); - final int finishCount = parent.getChildCount(); + final var finishCount = parent.getChildCount(); assertWithMessage("Child count has changed") .that(finishCount) .isEqualTo(startCount); @@ -445,10 +445,10 @@ public void testClearChildCountCache() { .isEqualTo(Integer.MIN_VALUE); } - final int startCount = child.getChildCount(); + final var startCount = child.getChildCount(); child.addChild(null); - final int intermediateCount = TestUtil.getInternalState(child, "childCount", Integer.class); - final int finishCount = child.getChildCount(); + final var intermediateCount = TestUtil.getInternalState(child, "childCount", Integer.class); + final var finishCount = child.getChildCount(); assertWithMessage("Child count has changed") .that(finishCount) .isEqualTo(startCount); @@ -690,7 +690,7 @@ public void testManyComments() throws Exception { */ """); bw.write("class C {\n"); - for (int i = 0; i <= 30000; i++) { + for (var i = 0; i <= 30000; i++) { bw.write("// " + i + "\n"); } bw.write("}\n"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/IndentationTrailingCommentsVerticalAlignmentTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/IndentationTrailingCommentsVerticalAlignmentTest.java index d5e0844d09e0..973ab7b3e8f7 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/IndentationTrailingCommentsVerticalAlignmentTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/IndentationTrailingCommentsVerticalAlignmentTest.java @@ -68,22 +68,22 @@ public void testTrailingCommentsAlignment(Path testFile) throws IOException { } final List lines = Files.readAllLines(testFile); - int expectedStartIndex = -1; + var expectedStartIndex = -1; - for (int idx = 0; idx < lines.size(); idx++) { + for (var idx = 0; idx < lines.size(); idx++) { final String line = lines.get(idx); if (line.trim().startsWith("import ") || line.trim().startsWith("package ")) { continue; } - final int commentStartIndex = line.indexOf("//indent:"); + final var commentStartIndex = line.indexOf("//indent:"); if (commentStartIndex > 0) { final String codePart = line.substring(0, commentStartIndex); if (!codePart.isBlank()) { - int actualStartIndex = + var actualStartIndex = CommonUtil.lengthExpandedTabs(line, commentStartIndex, TAB_WIDTH); // for unicode characters having supplementary code points - final long extraWidth = codePart.codePoints().filter( + final var extraWidth = codePart.codePoints().filter( Character::isSupplementaryCodePoint).count(); actualStartIndex -= Math.toIntExact(extraWidth); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/JavaAstVisitorTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/JavaAstVisitorTest.java index c50c259ec850..8a14c8e797bf 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/JavaAstVisitorTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/JavaAstVisitorTest.java @@ -173,14 +173,14 @@ public void countExprUsagesInParserGrammar() throws IOException { final String parserGrammarFilename = "src/main/resources/com/puppycrawl" + "/tools/checkstyle/grammar/java/JavaLanguageParser.g4"; - final int actualExprCount = Arrays.stream(new FileText(new File(parserGrammarFilename), + final var actualExprCount = Arrays.stream(new FileText(new File(parserGrammarFilename), StandardCharsets.UTF_8.name()).toLinesArray()) .mapToInt(JavaAstVisitorTest::countExprInLine) .sum(); // Any time we update this count, we should question why we are not building an imaginary // 'EXPR' node. - final int expectedExprCount = 44; + final var expectedExprCount = 44; assertWithMessage("The 'expr' parser rule does not build an imaginary" + " 'EXPR' node. Any usage of this rule should be questioned.") diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGeneratorTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGeneratorTest.java index d9fa0faa1e46..aad5b9061e98 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGeneratorTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGeneratorTest.java @@ -262,7 +262,7 @@ public void testEmptyJavadoc(@SysErr Capturable systemErr, @SysOut Capturable sy assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo(""); - final long size = FileUtils.sizeOf(DESTFILE); + final var size = FileUtils.sizeOf(DESTFILE); assertWithMessage("File '%s' must be empty", DESTFILE) .that(size) .isEqualTo(0); @@ -279,7 +279,7 @@ public void testNotConstants(@SysErr Capturable systemErr, @SysOut Capturable sy assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo(""); - final long size = FileUtils.sizeOf(DESTFILE); + final var size = FileUtils.sizeOf(DESTFILE); assertWithMessage("File '%s' must be empty", DESTFILE) .that(size) .isEqualTo(0); @@ -309,7 +309,7 @@ public void testJavadocParseError() throws Exception { .that(exc.getMessage()) .contains("mismatched input '' expecting JAVADOC_INLINE_TAG_END"); } - final long size = FileUtils.sizeOf(DESTFILE); + final var size = FileUtils.sizeOf(DESTFILE); assertWithMessage("File '%s' must be empty", DESTFILE) .that(size) .isEqualTo(0); @@ -327,7 +327,7 @@ public void testNotImplementedTag() throws Exception { .that(exc.getMessage()) .isEqualTo("Unsupported inline tag LINK_INLINE_TAG"); } - final long size = FileUtils.sizeOf(DESTFILE); + final var size = FileUtils.sizeOf(DESTFILE); assertWithMessage("File '%s' must be empty", DESTFILE) .that(size) .isEqualTo(0); @@ -345,7 +345,7 @@ public void testInvalidTokensInsideTag() throws Exception { .that(exc.getMessage()) .isEqualTo("Unsupported child in the inline tag NEWLINE"); } - final long size = FileUtils.sizeOf(DESTFILE); + final var size = FileUtils.sizeOf(DESTFILE); assertWithMessage("File '%s' must be empty", DESTFILE) .that(size) .isEqualTo(0); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java index 7faa61f5d2db..b6b858b743d4 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java @@ -239,7 +239,7 @@ public void setUp(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { LOG.setLevel(ORIGINAL_LOG_LEVEL); for (Handler handler : LOG.getHandlers()) { - boolean found = false; + var found = false; for (Handler savedHandler : HANDLERS) { if (handler == savedHandler) { @@ -831,10 +831,10 @@ public void testLoadPropertiesIoException() throws Exception { new String[] {""}, null, getClass(), null); final String causeMessage = exc.getCause().getLocalizedMessage(); final String violation = loadPropertiesMessage.getViolation(); - final boolean samePrefix = causeMessage.substring(0, causeMessage.indexOf(' ')) + final var samePrefix = causeMessage.substring(0, causeMessage.indexOf(' ')) .equals(violation .substring(0, violation.indexOf(' '))); - final boolean sameSuffix = + final var sameSuffix = causeMessage.substring(causeMessage.lastIndexOf(' ')) .equals(violation .substring(violation.lastIndexOf(' '))); @@ -855,7 +855,7 @@ public void testExistingDirectoryWithViolations(@SysErr Capturable systemErr, {"InputMainComplexityOverflow", "1", "172"}, }; - final int allowedLength = 170; + final var allowedLength = 170; final String msgKey = "maxLen.file"; final String bundle = "com.puppycrawl.tools.checkstyle.checks.sizes.messages"; diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java index 4bf624c4d3a6..c9245be1aea8 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java @@ -540,10 +540,10 @@ public void testPutNonExistentExternalResource(String rawMessages) throws Except // We mock getUriByFilename method of CommonUtil to guarantee that it will // throw CheckstyleException with the specific content. try (MockedStatic commonUtil = mockStatic(CommonUtil.class)) { - final int numberOfRuns = messages.size(); + final var numberOfRuns = messages.size(); final String[] configHashes = new String[numberOfRuns]; final String[] externalResourceHashes = new String[numberOfRuns]; - for (int i = 0; i < numberOfRuns; i++) { + for (var i = 0; i < numberOfRuns; i++) { commonUtil.when(() -> CommonUtil.getUriByFilename(any(String.class))) .thenThrow(new CheckstyleException(messages.get(i))); final Configuration config = new DefaultConfiguration("myConfig"); @@ -581,7 +581,7 @@ public void testPutNonExistentExternalResource(String rawMessages) throws Except assertWithMessage("Invalid config hash") .that(configHashes[0]) .isEqualTo(configHashes[1]); - final boolean sameException = messages.get(0).equals(messages.get(1)); + final var sameException = messages.get(0).equals(messages.get(1)); assertWithMessage("Invalid external resource hashes") .that(externalResourceHashes[0].equals(externalResourceHashes[1])) .isEqualTo(sameException); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/SarifLoggerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/SarifLoggerTest.java index 9658e488ab34..682d84d52c87 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/SarifLoggerTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/SarifLoggerTest.java @@ -308,7 +308,7 @@ public void testCtorWithTwoParametersCloseStreamOptions() throws IOException { final OutputStream infoStream = new ByteArrayOutputStream(); final SarifLogger logger = new SarifLogger(infoStream, AutomaticBean.OutputStreamOptions.CLOSE); - final boolean closeStream = TestUtil.getInternalState(logger, "closeStream", Boolean.class); + final var closeStream = TestUtil.getInternalState(logger, "closeStream", Boolean.class); assertWithMessage("closeStream should be true") .that(closeStream) @@ -323,7 +323,7 @@ public void testCtorWithTwoParametersNoneStreamOptions() throws IOException { final OutputStream infoStream = new ByteArrayOutputStream(); final SarifLogger logger = new SarifLogger(infoStream, AutomaticBean.OutputStreamOptions.NONE); - final boolean closeStream = TestUtil.getInternalState(logger, "closeStream", Boolean.class); + final var closeStream = TestUtil.getInternalState(logger, "closeStream", Boolean.class); assertWithMessage("closeStream should be false") .that(closeStream) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinterTest.java index 5a02303fe99b..623b41571b61 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinterTest.java @@ -55,7 +55,7 @@ public void testCorrect() throws Exception { final File input = new File(getPath("InputSuppressionsStringPrinter.java")); final String lineAndColumnNumber = "3:1"; - final int tabWidth = 2; + final var tabWidth = 2; final String result = SuppressionsStringPrinter.printSuppressions(input, lineAndColumnNumber, tabWidth); @@ -78,7 +78,7 @@ public void testCustomTabWidth() throws Exception { final File input = new File(getPath("InputSuppressionsStringPrinter.java")); final String lineAndColumnNumber = "5:13"; - final int tabWidth = 4; + final var tabWidth = 4; final String result = SuppressionsStringPrinter.printSuppressions(input, lineAndColumnNumber, tabWidth); @@ -91,7 +91,7 @@ public void testCustomTabWidth() throws Exception { public void testCustomTabWidthEmptyResult() throws Exception { final File input = new File(getPath("InputSuppressionsStringPrinter.java")); final String lineAndColumnNumber = "5:13"; - final int tabWidth = 6; + final var tabWidth = 6; final String result = SuppressionsStringPrinter.printSuppressions(input, lineAndColumnNumber, tabWidth); assertWithMessage("Invalid xpath queries") @@ -103,7 +103,7 @@ public void testCustomTabWidthEmptyResult() throws Exception { public void testInvalidLineAndColumnNumberParameter() throws Exception { final File input = new File(getPath("InputSuppressionsStringPrinter.java")); final String invalidLineAndColumnNumber = "abc-432"; - final int tabWidth = 2; + final var tabWidth = 2; try { SuppressionsStringPrinter.printSuppressions(input, invalidLineAndColumnNumber, tabWidth); @@ -120,7 +120,7 @@ public void testInvalidLineAndColumnNumberParameter() throws Exception { public void testParseFileTextThrowable() throws Exception { final File input = new File(getNonCompilablePath("InputSuppressionsStringPrinter.java")); final String lineAndColumnNumber = "2:3"; - final int tabWidth = 2; + final var tabWidth = 2; try { SuppressionsStringPrinter.printSuppressions(input, lineAndColumnNumber, tabWidth); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java index d631bc570fc3..974aa3ac9328 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java @@ -228,7 +228,7 @@ public void testOnEmptyFile() throws Exception { final File emptyFile = new File(temporaryFolder, uniqueFileName); emptyFile.createNewFile(); execute(checkConfig, emptyFile.getPath()); - final long fileSize = Files.size(emptyFile.toPath()); + final var fileSize = Files.size(emptyFile.toPath()); assertWithMessage("File should be empty") .that(fileSize) .isEqualTo(0); @@ -279,7 +279,7 @@ public void testSettersForParameters() throws Exception { treeWalker.setTabWidth(1); treeWalker.configure(config); - final int tabWidth = TestUtil.getInternalState(treeWalker, "tabWidth", Integer.class); + final var tabWidth = TestUtil.getInternalState(treeWalker, "tabWidth", Integer.class); assertWithMessage("Invalid setter result") .that(tabWidth) .isEqualTo(1); @@ -490,7 +490,7 @@ public void testSetupChild() throws Exception { final Set filters = TestUtil.getInternalStateSetTreeWalkerFilter(treeWalker, "filters"); - final int tabWidth = TestUtil.getInternalState(filters.iterator().next(), + final var tabWidth = TestUtil.getInternalState(filters.iterator().next(), "tabWidth", Integer.class); assertWithMessage("expected tab width") @@ -648,7 +648,7 @@ public void testExternalResourceFiltersWithNoExternalResource() throws Exception execute(checkerConfig, filePath.toString()); - final long cacheSize = Files.size(cacheFile.toPath()); + final var cacheSize = Files.size(cacheFile.toPath()); assertWithMessage("cacheFile should not be empty") .that(cacheSize) .isNotEqualTo(0); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java index 30434ff5ac0e..0349090ded9d 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java @@ -435,7 +435,7 @@ public void testFinishLocalSetup() { @Test public void testCtorWithTwoParametersCloseStreamOptions() { final XMLLogger logger = new XMLLogger(outStream, AutomaticBean.OutputStreamOptions.CLOSE); - final boolean closeStream = TestUtil.getInternalState(logger, "closeStream", Boolean.class); + final var closeStream = TestUtil.getInternalState(logger, "closeStream", Boolean.class); assertWithMessage("closeStream should be true") .that(closeStream) @@ -451,7 +451,7 @@ public void testCtorWithTwoParametersCloseStreamOptions() { @Test public void testCtorWithTwoParametersNoneStreamOptions() { final XMLLogger logger = new XMLLogger(outStream, AutomaticBean.OutputStreamOptions.NONE); - final boolean closeStream = TestUtil.getInternalState(logger, "closeStream", Boolean.class); + final var closeStream = TestUtil.getInternalState(logger, "closeStream", Boolean.class); assertWithMessage("closeStream should be false") .that(closeStream) 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 479236495f0f..474f94c94967 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTaskTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTaskTest.java @@ -200,7 +200,7 @@ public final void testBaseDirPresence() throws IOException { final List loggedMessages = antTask.getLoggedMessages(); final String expectedPath = new File(getPath(".")).getAbsolutePath(); - final boolean containsBaseDir = loggedMessages.stream() + final var containsBaseDir = loggedMessages.stream() .anyMatch(msg -> msg.getMsg().contains(expectedPath)); assertWithMessage("Base directory should be present in logs.") @@ -520,7 +520,7 @@ public final void testConfigurationByUrl() throws IOException { antTask.execute(); final List output = readWholeFile(outputFile); - final int sizeOfOutputWithNoViolations = 2; + final var sizeOfOutputWithNoViolations = 2; assertWithMessage("No violations expected") .that(output) .hasSize(sizeOfOutputWithNoViolations); @@ -545,7 +545,7 @@ public final void testConfigurationByResource() throws IOException { antTask.execute(); final List output = readWholeFile(outputFile); - final int sizeOfOutputWithNoViolations = 2; + final var sizeOfOutputWithNoViolations = 2; assertWithMessage("No violations expected") .that(output) .hasSize(sizeOfOutputWithNoViolations); @@ -612,7 +612,7 @@ public final void testXmlOutput() throws IOException { final List expected = readWholeFile( new File(getPath("ExpectedCheckstyleAntTaskXmlOutput.xml"))); final List actual = readWholeFile(outputFile); - for (int i = 0; i < expected.size(); i++) { + for (var i = 0; i < expected.size(); i++) { final String line = expected.get(i); if (!line.startsWith(" expected = readWholeFile( new File(getPath("ExpectedCheckstyleAntTaskSarifOutput.sarif"))); final List actual = readWholeFile(outputFile); - for (int lineNumber = 0; lineNumber < expected.size(); lineNumber++) { + for (var lineNumber = 0; lineNumber < expected.size(); lineNumber++) { final String line = expected.get(lineNumber); final StandardSubjectBuilder assertWithMessage = assertWithMessage("Content of file with violations differs from expected"); @@ -917,7 +917,7 @@ public final void testExecuteLogOutput() throws Exception { .that(loggedMessages) .hasSize(expectedList.size()); - for (int i = 0; i < expectedList.size(); i++) { + for (var i = 0; i < expectedList.size(); i++) { final MessageLevelPair expected = expectedList.get(i); final MessageLevelPair actual = loggedMessages.get(i); assertWithMessage("Log messages should match") @@ -950,10 +950,10 @@ public void testLoggedTime() throws IOException { antTask.setConfig(getPath(CONFIG_FILE)); antTask.setProject(new Project()); antTask.setFile(new File(getPath(FLAWLESS_INPUT))); - final long startTime = System.currentTimeMillis(); + final var startTime = System.currentTimeMillis(); antTask.execute(); - final long endTime = System.currentTimeMillis(); - final long testingTime = endTime - startTime; + final var endTime = System.currentTimeMillis(); + final var testingTime = endTime - startTime; final List loggedMessages = antTask.getLoggedMessages(); assertLoggedTime(loggedMessages, testingTime, "Total execution"); @@ -972,7 +972,7 @@ private static void assertLoggedTime(List loggedMessages, .that(optionalMessageLevelPair.isPresent()) .isTrue(); - final long actualTime = getNumberFromLine(optionalMessageLevelPair.orElseThrow().getMsg()); + final var actualTime = getNumberFromLine(optionalMessageLevelPair.orElseThrow().getMsg()); assertWithMessage("Logged time in '%s' must be less than the testing time", expectedMsg) .that(actualTime) 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 79fd5211ca96..ce47ff496588 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractCheckTest.java @@ -228,7 +228,7 @@ public int[] getRequiredTokens() { return getDefaultTokens(); } }; - final int tabWidth = 4; + final var tabWidth = 4; check.setTabWidth(tabWidth); assertWithMessage("Invalid tab width") 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 f9ed3dfa06cd..eb6e1363ef88 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/api/LineColumnTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/LineColumnTest.java @@ -30,7 +30,7 @@ public class LineColumnTest { @Test public void testCompareToBothEqual() { - final int actual = new LineColumn(0, 0).compareTo(new LineColumn(0, 0)); + final var actual = new LineColumn(0, 0).compareTo(new LineColumn(0, 0)); assertWithMessage("Invalid LineColumn comparing result") .that(actual) .isEqualTo(0); @@ -40,11 +40,11 @@ public void testCompareToBothEqual() { public void testCompareToFirstLarger() { final LineColumn lineColumn = new LineColumn(0, 0); - final int line1column0 = new LineColumn(1, 0).compareTo(lineColumn); + final var line1column0 = new LineColumn(1, 0).compareTo(lineColumn); assertWithMessage("Invalid LineColumn comparison result") .that(line1column0) .isEqualTo(1); - final int line2Column1 = new LineColumn(0, 1).compareTo(lineColumn); + final var line2Column1 = new LineColumn(0, 1).compareTo(lineColumn); assertWithMessage("Invalid LineColumn comparison result") .that(line2Column1) .isEqualTo(1); @@ -54,11 +54,11 @@ public void testCompareToFirstLarger() { public void testCompareToFirstSmaller() { final Comparable lineColumn = new LineColumn(0, 0); - final int line1Column0 = lineColumn.compareTo(new LineColumn(1, 0)); + final var line1Column0 = lineColumn.compareTo(new LineColumn(1, 0)); assertWithMessage("Invalid LineColumn comparison result") .that(line1Column0) .isEqualTo(-1); - final int line0Column1 = lineColumn.compareTo(new LineColumn(0, 1)); + final var line0Column1 = lineColumn.compareTo(new LineColumn(0, 1)); assertWithMessage("Invalid LineColumn comparison result") .that(line0Column1) .isEqualTo(-1); 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 c159ddf279d7..6a69cbf4e27b 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/api/ViolationTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/ViolationTest.java @@ -162,7 +162,7 @@ public void testCompareToWithDifferentLines() { assertWithMessage("Invalid comparing result") .that(message2.compareTo(message1) > 0) .isTrue(); - final int actual = message1.compareTo(message1a); + final var actual = message1.compareTo(message1a); assertWithMessage("Invalid comparing result") .that(actual) .isEqualTo(0); @@ -180,7 +180,7 @@ public void testCompareToWithDifferentColumns() { assertWithMessage("Invalid comparing result") .that(message2.compareTo(message1) > 0) .isTrue(); - final int actual = message1.compareTo(message1a); + final var actual = message1.compareTo(message1a); assertWithMessage("Invalid comparing result") .that(actual) .isEqualTo(0); 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 83c8f55e51e1..36b3576965f2 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/bdd/InlineConfigParser.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/bdd/InlineConfigParser.java @@ -499,7 +499,7 @@ public static List getViolationsFromInputFile(String inputFi final List lines = readFile(filePath); try { - for (int lineNo = 0; lineNo < lines.size(); lineNo++) { + for (var lineNo = 0; lineNo < lines.size(); lineNo++) { setViolations(testInputConfigBuilder, lines, false, lineNo, true); } } @@ -518,7 +518,7 @@ public static List getFilteredViolationsFromInputFile(String final List lines = readFile(filePath); try { - for (int lineNo = 0; lineNo < lines.size(); lineNo++) { + for (var lineNo = 0; lineNo < lines.size(); lineNo++) { setViolations(testInputConfigBuilder, lines, true, lineNo, true); } } @@ -643,7 +643,7 @@ private static void handleXmlConfig(TestInputConfiguration.Builder testInputConf private static void handleKeyValueConfig(TestInputConfiguration.Builder testInputConfigBuilder, String inputFilePath, List lines) throws CheckstyleException, IOException, ReflectiveOperationException { - int lineNo = 0; + var lineNo = 0; while (lineNo < lines.size()) { final ModuleInputConfiguration.Builder moduleInputConfigBuilder = new ModuleInputConfiguration.Builder(); @@ -662,7 +662,7 @@ private static void handleKeyValueConfig(TestInputConfiguration.Builder testInpu private static Map getDefaultProperties(String fullyQualifiedClassName) { final Map defaultProperties = new HashMap<>(); - final boolean isSuppressedModule = SUPPRESSED_MODULES.contains(fullyQualifiedClassName); + final var isSuppressedModule = SUPPRESSED_MODULES.contains(fullyQualifiedClassName); if (PUBLIC_MODULE_DETAILS_MAP.isEmpty()) { XmlMetaReader.readAllModulesIncludingThirdPartyIfAny().forEach(module -> { @@ -697,12 +697,12 @@ else if (moduleName.startsWith("com.")) { } else { final String path = SLASH_PATTERN.matcher(filePath).replaceAll("."); - final int endIndex = path.lastIndexOf(moduleName.toLowerCase(Locale.ROOT)); + final var endIndex = path.lastIndexOf(moduleName.toLowerCase(Locale.ROOT)); if (endIndex == -1) { throw new CheckstyleException("Unable to resolve module name: " + moduleName + ". Please check for spelling errors or specify fully qualified class name."); } - final int beginIndex = path.indexOf("com.puppycrawl"); + final var beginIndex = path.indexOf("com.puppycrawl"); fullyQualifiedClassName = path.substring(beginIndex, endIndex) + moduleName; if (!fullyQualifiedClassName.endsWith("Filter")) { fullyQualifiedClassName += "Check"; @@ -712,7 +712,7 @@ else if (moduleName.startsWith("com.")) { } private static String getFilePath(String fileName, String inputFilePath) { - final int lastSlashIndex = Math.max(inputFilePath.lastIndexOf('\\'), + final var lastSlashIndex = Math.max(inputFilePath.lastIndexOf('\\'), inputFilePath.lastIndexOf('/')); final String root = inputFilePath.substring(0, lastSlashIndex + 1); return root + fileName; @@ -720,7 +720,7 @@ private static String getFilePath(String fileName, String inputFilePath) { private static String getResourcePath(String fileName, String inputFilePath) { final String filePath = getUriPath(fileName, inputFilePath); - final int lastSlashIndex = filePath.lastIndexOf('/'); + final var lastSlashIndex = filePath.lastIndexOf('/'); final String root = filePath.substring(filePath.indexOf("puppycrawl") - 5, lastSlashIndex + 1); return root + fileName; @@ -943,7 +943,7 @@ private static Object createCheckInstance(String className) throws private static String readPropertiesContent(int beginLineNo, List lines) { final StringBuilder stringBuilder = new StringBuilder(128); - int lineNo = beginLineNo; + var lineNo = beginLineNo; String line = lines.get(lineNo); while (!line.isEmpty() && !"*/".equals(line)) { stringBuilder.append(line).append('\n'); @@ -1076,7 +1076,7 @@ private static boolean shouldSpecifyViolationMessage( TestInputConfiguration.Builder inputConfigBuilder, String inputFilePath) { - boolean result = false; + var result = false; final List moduleLists = inputConfigBuilder.getChildrenModules(); @@ -1103,10 +1103,10 @@ private static void setViolations(TestInputConfiguration.Builder inputConfigBuil String inputFilePath) throws CheckstyleException { - final boolean specifyViolationMessage = + final var specifyViolationMessage = shouldSpecifyViolationMessage(inputConfigBuilder, inputFilePath); - for (int lineNo = 0; lineNo < lines.size(); lineNo++) { + for (var lineNo = 0; lineNo < lines.size(); lineNo++) { setViolations(inputConfigBuilder, lines, useFilteredViolations, lineNo, specifyViolationMessage); } @@ -1170,7 +1170,7 @@ private static void setViolations(TestInputConfiguration.Builder inputConfigBuil VIOLATION_DEFAULT.matcher(lines.get(lineNo)); if (violationMatcher.matches()) { final String violationMessage = violationMatcher.group(1); - final int violationLineNum = lineNo + 1; + final var violationLineNum = lineNo + 1; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addViolation(violationLineNum, violationMessage); @@ -1182,7 +1182,7 @@ else if (violationAboveMatcher.matches()) { } else if (violationBelowMatcher.matches()) { final String violationMessage = violationBelowMatcher.group(1); - final int violationLineNum = lineNo + 2; + final var violationLineNum = lineNo + 2; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addViolation(violationLineNum, violationMessage); @@ -1194,27 +1194,27 @@ else if (violationAboveWithExplanationMatcher.matches()) { } else if (violationBelowWithExplanationMatcher.matches()) { final String violationMessage = violationBelowWithExplanationMatcher.group(1); - final int violationLineNum = lineNo + 2; + final var violationLineNum = lineNo + 2; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addViolation(violationLineNum, violationMessage); } else if (violationWithExplanationMatcher.matches()) { - final int violationLineNum = lineNo + 1; + final var violationLineNum = lineNo + 1; inputConfigBuilder.addViolation(violationLineNum, null); } else if (violationSomeLinesAboveMatcher.matches()) { final String violationMessage = violationSomeLinesAboveMatcher.group(2); - final int linesAbove = Integer.parseInt(violationSomeLinesAboveMatcher.group(1)) - 1; - final int violationLineNum = lineNo - linesAbove; + final var linesAbove = Integer.parseInt(violationSomeLinesAboveMatcher.group(1)) - 1; + final var violationLineNum = lineNo - linesAbove; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addViolation(violationLineNum, violationMessage); } else if (violationSomeLinesBelowMatcher.matches()) { final String violationMessage = violationSomeLinesBelowMatcher.group(2); - final int linesBelow = Integer.parseInt(violationSomeLinesBelowMatcher.group(1)) + 1; - final int violationLineNum = lineNo + linesBelow; + final var linesBelow = Integer.parseInt(violationSomeLinesBelowMatcher.group(1)) + 1; + final var violationLineNum = lineNo + linesBelow; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addViolation(violationLineNum, violationMessage); @@ -1261,7 +1261,7 @@ else if (useFilteredViolations) { lines.get(lineNo), specifyViolationMessage); } else if (violationsDefault.matches()) { - final int violationLineNum = lineNo + 1; + final var violationLineNum = lineNo + 1; inputConfigBuilder.addViolation(violationLineNum, null); } } @@ -1271,9 +1271,9 @@ private static List getExpectedViolationsForSpecificLine( Matcher matcher) { final List results = new ArrayList<>(); - final int expectedMessageCount = + final var expectedMessageCount = Integer.parseInt(matcher.group(1)); - for (int index = 1; index <= expectedMessageCount; index++) { + for (var index = 1; index <= expectedMessageCount; index++) { final String lineWithMessage = lines.get(lineNo + index); final Matcher messageMatcher = VIOLATION_MESSAGE_PATTERN.matcher(lineWithMessage); if (messageMatcher.find()) { @@ -1293,7 +1293,7 @@ private static List getExpectedViolationsForSpecificLine( private static List getExpectedViolations( List lines, int lineNo, Matcher matcher, boolean isAbove) { - final int violationLine = + final var violationLine = Integer.parseInt(matcher.group(2)); final int violationLineNum; if (isAbove) { @@ -1327,30 +1327,30 @@ private static void setFilteredViolation(TestInputConfiguration.Builder inputCon } else if (violationAboveMatcher.matches()) { final String violationMessage = violationAboveMatcher.group(1); - final int violationLineNum = lineNo - 1; + final var violationLineNum = lineNo - 1; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addFilteredViolation(violationLineNum, violationMessage); } else if (violationBelowMatcher.matches()) { final String violationMessage = violationBelowMatcher.group(1); - final int violationLineNum = lineNo + 1; + final var violationLineNum = lineNo + 1; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addFilteredViolation(violationLineNum, violationMessage); } else if (violationSomeLinesAboveMatcher.matches()) { final String violationMessage = violationSomeLinesAboveMatcher.group(2); - final int linesAbove = Integer.parseInt(violationSomeLinesAboveMatcher.group(1)); - final int violationLineNum = lineNo - linesAbove; + final var linesAbove = Integer.parseInt(violationSomeLinesAboveMatcher.group(1)); + final var violationLineNum = lineNo - linesAbove; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addFilteredViolation(violationLineNum, violationMessage); } else if (violationSomeLinesBelowMatcher.matches()) { final String violationMessage = violationSomeLinesBelowMatcher.group(2); - final int linesBelow = Integer.parseInt(violationSomeLinesBelowMatcher.group(1)); - final int violationLineNum = lineNo + linesBelow; + final var linesBelow = Integer.parseInt(violationSomeLinesBelowMatcher.group(1)); + final var violationLineNum = lineNo + linesBelow; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addFilteredViolation(violationLineNum, violationMessage); 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 b02b3846b7da..e5f2adabeb0a 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckTest.java @@ -473,7 +473,7 @@ public void testGetAcceptableTokens() { @Test public void testAllowEscapesForControlCharacterSetForAllCharacters() throws Exception { - final int indexOfStartLineInInputFile = 16; + final var indexOfStartLineInInputFile = 16; final String message = getCheckMessage(MSG_KEY); final String[] expected = IntStream.rangeClosed(0, 0xFFFF) .parallel() @@ -498,7 +498,7 @@ public void testAllowEscapesForControlCharacterSetForAllCharacters() throws Exce @Test public void testCountMatches() throws Exception { final AvoidEscapedUnicodeCharactersCheck check = new AvoidEscapedUnicodeCharactersCheck(); - final int actual = TestUtil.invokeMethod(check, "countMatches", Integer.class, + final var actual = TestUtil.invokeMethod(check, "countMatches", Integer.class, Pattern.compile("\\\\u[a-fA-F\\d]{4}"), "\\u1234"); assertWithMessage("Unexpected matches count") .that(actual) @@ -523,7 +523,7 @@ public void testNonPrintableCharsAreSorted() { } // Replacing duplications like "\\uF{3}9" with "\\uFFF9" - for (int i = 4; i > 1; i--) { + for (var i = 4; i > 1; i--) { final String regex = "([A-F])\\{" + i + "}"; String replacement = "$1$1{" + (i - 1) + "}"; if (i == 2) { @@ -536,7 +536,7 @@ public void testNonPrintableCharsAreSorted() { final List expressionParts = Splitter.on("|").splitToList(expression); final Pattern unicodeCharPattern = Pattern.compile("^\\\\\\\\u[\\dA-F]{4}$"); String lastChar = null; - for (int i = 0; i < expressionParts.size(); i++) { + for (var i = 0; i < expressionParts.size(); i++) { final String currentChar = expressionParts.get(i); final Matcher matcher = unicodeCharPattern.matcher(currentChar); if (!matcher.matches()) { 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 d2544be8434c..c75237de6f07 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 @@ -541,7 +541,7 @@ private static final class CheckIfStatefulFieldCleared implements Predicate result = new ArrayList<>(); try (BufferedReader br = Files.newBufferedReader(Path.of(aFileName))) { - int lineNumber = 1; + var lineNumber = 1; String line = br.readLine(); IndentComment pendingBelowComment = null; while (line != null) { final Matcher match = LINE_WITH_COMMENT_REGEX.matcher(line); if (pendingBelowComment != null) { - final int actualIndent = getLineStart(line, tabWidth); + final var actualIndent = getLineStart(line, tabWidth); processPendingBelowComment(pendingBelowComment, actualIndent, lineNumber, result); @@ -77,14 +77,14 @@ private static IndentComment[] getLinesWithWarnAndCheckComments(String aFileName pendingBelowComment = null; } else if (match.matches()) { - final boolean isBelow = line.contains("//below indent:"); + final var isBelow = line.contains("//below indent:"); final IndentComment warn = new IndentComment(match, lineNumber); if (isBelow) { pendingBelowComment = warn; } else { - final int actualIndent = getLineStart(line, tabWidth); + final var actualIndent = getLineStart(line, tabWidth); processInlineComment(warn, actualIndent, lineNumber, aFileName, result); } } @@ -154,17 +154,17 @@ private static void processInlineComment(IndentComment warn, int actualIndent, private static boolean isCommentConsistent(IndentComment comment) { final String[] levels = comment.getExpectedWarning().split(", "); - final int indent = comment.getIndent() + comment.getIndentOffset(); + final var indent = comment.getIndent() + comment.getIndentOffset(); final boolean result; if (levels.length > 1) { // multi - final boolean containsActualLevel = + final var containsActualLevel = Arrays.asList(levels).contains(String.valueOf(indent)); result = containsActualLevel != comment.isWarning(); } else { - final int expectedWarning = Integer.parseInt(comment.getExpectedWarning()); + final var expectedWarning = Integer.parseInt(comment.getExpectedWarning()); final boolean test; if (comment.isExpectedNonStrict()) { @@ -182,8 +182,8 @@ private static boolean isCommentConsistent(IndentComment comment) { } private static int getLineStart(String line, final int tabWidth) { - int lineStart = 0; - for (int index = 0; index < line.length(); ++index) { + var lineStart = 0; + for (var index = 0; index < line.length(); ++index) { if (!Character.isWhitespace(line.charAt(index))) { lineStart = CommonUtil.lengthExpandedTabs(line, index, tabWidth); break; @@ -195,7 +195,7 @@ private static int getLineStart(String line, final int tabWidth) { private void verifyWarns(Configuration config, String filePath, String... expected) throws Exception { - final int tabWidth = Integer.parseInt(config.getProperty("tabWidth")); + final var tabWidth = Integer.parseInt(config.getProperty("tabWidth")); final IndentComment[] linesWithWarn = getLinesWithWarnAndCheckComments(filePath, tabWidth); verify(config, filePath, expected, linesWithWarn); @@ -3348,8 +3348,8 @@ public void testArgumentOrderOfErrorMessages() { getCheckMessage(MSG_ERROR_MULTI, arguments), getCheckMessage(MSG_CHILD_ERROR_MULTI, arguments), }; - final boolean isInOrder = Arrays.stream(messages).allMatch(msg -> { - final int indexOfArgumentZero = msg.indexOf((String) arguments[0]); + final var isInOrder = Arrays.stream(messages).allMatch(msg -> { + final var indexOfArgumentZero = msg.indexOf((String) arguments[0]); return Arrays.stream(arguments) .map(String.class::cast) .mapToInt(msg::indexOf) @@ -4185,7 +4185,7 @@ public void fileFinished(AuditEvent event) { @Override public void addError(AuditEvent event) { - final int line = event.getLine(); + final var line = event.getLine(); final String message = event.getMessage(); assertWithMessage( @@ -4272,7 +4272,7 @@ private String[] getExpectedMessages() { private String getExpectedMessagePostfix(final String messageKey) { final String msg = getCheckMessage(IndentationCheck.class, messageKey, FAKE_ARGUMENT_ZERO, indent + indentOffset, expectedWarning); - final int indexOfMsgPostfix = msg.indexOf(FAKE_ARGUMENT_ZERO) + final var indexOfMsgPostfix = msg.indexOf(FAKE_ARGUMENT_ZERO) + FAKE_ARGUMENT_ZERO.length(); return msg.substring(indexOfMsgPostfix); } 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 94df732d0ce1..b59a89ea4d2a 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 @@ -47,7 +47,7 @@ public void testGetColumnNumber() { final JavadocNodeImpl javadocNode = new JavadocNodeImpl(); javadocNode.setColumnNumber(1); - final int result = javadocNode.getColumnNumber(); + final var result = javadocNode.getColumnNumber(); assertWithMessage("Invalid column number") .that(result) 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 c9187c9b8c4a..d384651ce65b 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 @@ -208,7 +208,7 @@ public void testResetSeverityLevel() throws Exception { final Matcher matcher = severityPattern.matcher(output); // First log is just the normal tag one - final boolean firstMatchFound = matcher.find(); + final var firstMatchFound = matcher.find(); assertWithMessage("Severity level should be wrapped in a square bracket []") .that(firstMatchFound) .isTrue(); @@ -222,7 +222,7 @@ public void testResetSeverityLevel() throws Exception { // Now we check for the second log which should log error if // the previous log did not have an issue while resetting the original severity level - final boolean secondMatchFound = matcher.find(); + final var secondMatchFound = matcher.find(); assertWithMessage("Severity level should be wrapped in a square bracket []") .that(secondMatchFound) .isTrue(); @@ -312,14 +312,14 @@ protected void verify(Checker checker, getStream().flush(); final List theFiles = new ArrayList<>(); Collections.addAll(theFiles, processedFiles); - final int errs = checker.process(theFiles); + final var errs = checker.process(theFiles); // process each of the lines try (ByteArrayInputStream localStream = new ByteArrayInputStream(getStream().toByteArray()); LineNumberReader lnr = new LineNumberReader( new InputStreamReader(localStream, StandardCharsets.UTF_8))) { - for (int i = 0; i < expected.length; i++) { + for (var i = 0; i < expected.length; i++) { final String expectedResult = messageFileName + ":" + expected[i]; final String actual = lnr.readLine(); assertWithMessage("error message %s", i) 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 d17dc4df1e32..49b5ef97cc55 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 @@ -99,7 +99,7 @@ public void testSmall() throws Exception { @Test public void testBooleanExpressionComplexityRecordsAndCompactCtors() throws Exception { - final int max = 3; + final var max = 3; final String[] expected = { "16:12: " + getCheckMessage(MSG_KEY, 4, max), @@ -136,7 +136,7 @@ public void testRecordLeaves() throws Exception { @Test public void testWhenExpression() throws Exception { - final int max = 0; + final var max = 0; final String[] expected = { "17:21: " + getCheckMessage(MSG_KEY, 6, max), 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 8519aa7337cb..523097068b4d 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 @@ -188,7 +188,7 @@ public void testEmptyRegularExpression() throws Exception { @Test public void testClassDataAbstractionCouplingRecords() throws Exception { - final int maxAbstraction = 1; + final var maxAbstraction = 1; final String[] expected = { "31:1: " + getCheckMessage(MSG_KEY, 2, maxAbstraction, "[Date, Time]"), "36:1: " + getCheckMessage(MSG_KEY, 2, maxAbstraction, "[Date, Time]"), 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 67feb58e2dc7..8957174b346f 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 @@ -90,7 +90,7 @@ public void test() throws Exception { @Test public void testCyclomaticComplexityRecords() throws Exception { - final int max = 0; + final var max = 0; final String[] expected = { "17:9: " + getCheckMessage(MSG_KEY, 11, max), 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 4f81dc102f74..dcaee5a55274 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 @@ -108,7 +108,7 @@ public void testCalculation3() throws Exception { @Test public void testIntegerOverflow() throws Exception { - final long largerThanMaxInt = 3_486_784_401L; + final var largerThanMaxInt = 3_486_784_401L; final String[] expected = { "20:5: " + getCheckMessage(MSG_KEY, largerThanMaxInt, 0), @@ -193,7 +193,7 @@ public void testDefaultConfiguration() throws Exception { @Test public void testNpathComplexityRecords() throws Exception { - final int max = 1; + final var max = 1; final String[] expected = { "15:5: " + getCheckMessage(MSG_KEY, 3, max), @@ -209,7 +209,7 @@ public void testNpathComplexityRecords() throws Exception { @Test public void testNpathComplexitySwitchExpression() throws Exception { - final int max = 1; + final var max = 1; final String[] expected = { "12:5: " + getCheckMessage(MSG_KEY, 5, max), 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 0fe1b52f9c5e..9fe8b2140eea 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 @@ -35,7 +35,7 @@ public String getPackageLocation() { @Test public void testDefault() throws Exception { - final int expectedCapitalCount = 4; + final var expectedCapitalCount = 4; final String[] expected = { "24:16: " + getWarningMessage("FactoryWithBADNAme", expectedCapitalCount), @@ -54,7 +54,7 @@ public void testDefault() throws Exception { @Test public void testTypeNamesForThreePermittedCapitalLetters() throws Exception { - final int expectedCapitalCount = 4; + final var expectedCapitalCount = 4; final String[] expected = { "22:16: " + getWarningMessage("FactoryWithBADNAme2", expectedCapitalCount), @@ -69,7 +69,7 @@ public void testTypeNamesForThreePermittedCapitalLetters() throws Exception { @Test public void testTypeNamesForFourPermittedCapitalLetters() throws Exception { - final int expectedCapitalCount = 5; + final var expectedCapitalCount = 5; final String[] expected = { "45:11: " + getWarningMessage("AbstractINNERRClass", expectedCapitalCount), @@ -81,7 +81,7 @@ public void testTypeNamesForFourPermittedCapitalLetters() throws Exception { @Test public void testTypeNamesForFivePermittedCapitalLetters() throws Exception { - final int expectedCapitalCount = 6; + final var expectedCapitalCount = 6; final String[] expected = { "45:11: " + getWarningMessage("AbstractINNERRClass", expectedCapitalCount), "50:11: " + getWarningMessage("WellNamedFACTORY", expectedCapitalCount), @@ -93,7 +93,7 @@ public void testTypeNamesForFivePermittedCapitalLetters() throws Exception { @Test public void testTypeAndVariablesAndMethodNames() throws Exception { - final int expectedCapitalCount = 6; + final var expectedCapitalCount = 6; final String[] expected = { "46:11: " + getWarningMessage("AbstractINNERRClass", expectedCapitalCount), @@ -109,7 +109,7 @@ public void testTypeAndVariablesAndMethodNames() throws Exception { @Test public void testTypeAndVariablesAndMethodNamesWithNoIgnores() throws Exception { - final int expectedCapitalCount = 6; + final var expectedCapitalCount = 6; final String[] expected = { "48:15: " + getWarningMessage("AbstractINNERRClass", expectedCapitalCount), @@ -127,7 +127,7 @@ public void testTypeAndVariablesAndMethodNamesWithNoIgnores() throws Exception { @Test public void testTypeAndVariablesAndMethodNamesWithNoIgnoresPart2() throws Exception { - final int expectedCapitalCount = 6; + final var expectedCapitalCount = 6; final String[] expected = { "43:17: " + getWarningMessage("InnerClassOneVIOLATION", expectedCapitalCount), @@ -140,7 +140,7 @@ public void testTypeAndVariablesAndMethodNamesWithNoIgnoresPart2() throws Except @Test public void testTypeAndVariablesAndMethodNamesWithIgnores() throws Exception { - final int expectedCapitalCount = 6; + final var expectedCapitalCount = 6; final String[] expected = { "48:15: " + getWarningMessage("AbstractINNERRClass", expectedCapitalCount), @@ -154,7 +154,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnores() throws Exception { @Test public void testTypeAndVariablesAndMethodNamesWithIgnoresPart2() throws Exception { - final int expectedCapitalCount = 6; + final var expectedCapitalCount = 6; final String[] expected = { "44:17: " + getWarningMessage("InnerClassOneVIOLATION", expectedCapitalCount), @@ -167,7 +167,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnoresPart2() throws Exceptio @Test public void testTypeAndVariablesAndMethodNamesWithIgnoresFinal() throws Exception { - final int expectedCapitalCount = 5; + final var expectedCapitalCount = 5; final String[] expected = { "28:20: " + getWarningMessage("AbstractCLASSName", expectedCapitalCount), @@ -187,7 +187,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnoresFinal() throws Exceptio @Test public void testTypeAndVariablesAndMethodNamesWithIgnoresStatic() throws Exception { - final int expectedCapitalCount = 5; + final var expectedCapitalCount = 5; final String[] expected = { "28:20: " + getWarningMessage("AbstractCLASSName", expectedCapitalCount), @@ -207,7 +207,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnoresStatic() throws Excepti @Test public void testTypeAndVariablesAndMethodNamesWithIgnoresStaticFinal() throws Exception { - final int expectedCapitalCount = 5; + final var expectedCapitalCount = 5; final String[] expected = { "28:20: " + getWarningMessage("AbstractCLASSName", expectedCapitalCount), @@ -229,7 +229,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnoresStaticFinal() throws Ex @Test public void testTypeAndVariablesAndMethodNamesWithIgnoresNonStaticFinal() throws Exception { - final int expectedCapitalCount = 5; + final var expectedCapitalCount = 5; final String[] expected = { "28:20: " + getWarningMessage("AbstractCLASSName", expectedCapitalCount), @@ -258,7 +258,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnoresNonStaticFinal() throws @Test public void testTypeAndVariablesAndMethodNamesWithIgnoresNonStaticFinalPart2() throws Exception { - final int expectedCapitalCount = 5; + final var expectedCapitalCount = 5; final String[] expected = { "28:16: " + getWarningMessage("VALUEEEE", expectedCapitalCount), @@ -277,7 +277,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnoresNonStaticFinalPart2() @Test public void testTypeAndVariablesAndMethodNamesWithIgnoresFinalKeepStaticFinal() throws Exception { - final int expectedCapitalCount = 5; + final var expectedCapitalCount = 5; final String[] expected = { "28:20: " + getWarningMessage("AbstractCLASSName", expectedCapitalCount), @@ -308,7 +308,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnoresFinalKeepStaticFinal() @Test public void testTypeAndVariablesAndMethodNamesWithIgnoresStaticKeepStaticFinal() throws Exception { - final int expectedCapitalCount = 5; + final var expectedCapitalCount = 5; final String[] expected = { "28:20: " + getWarningMessage("AbstractCLASSName", expectedCapitalCount), @@ -339,7 +339,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnoresStaticKeepStaticFinal() @Test public void testTypeNamesForThreePermittedCapitalLettersWithOverriddenMethod() throws Exception { - final int expectedCapitalCount = 4; + final var expectedCapitalCount = 4; final String[] expected = { "35:20: " + getWarningMessage("oveRRRRRrriddenMethod", expectedCapitalCount), @@ -352,7 +352,7 @@ public void testTypeNamesForThreePermittedCapitalLettersWithOverriddenMethod() @Test public void testOverriddenMethod() throws Exception { - final int expectedCapitalCount = 4; + final var expectedCapitalCount = 4; final String[] expected = { "21:16: " + getWarningMessage("serialNUMBER", expectedCapitalCount), @@ -367,7 +367,7 @@ public void testOverriddenMethod() @Test public void testTypeNamesForZeroPermittedCapitalLetter() throws Exception { - final int expectedCapitalCount = 1; + final var expectedCapitalCount = 1; final String[] expected = { "20:16: " + getWarningMessage("NonAAAAbstractClassName6", expectedCapitalCount), "23:16: " + getWarningMessage("FactoryWithBADNAme66", expectedCapitalCount), @@ -400,7 +400,7 @@ public void testTypeNamesForZeroPermittedCapitalLetter() throws Exception { @Test public void testTypeNamesForZeroPermittedCapitalLetterPart2() throws Exception { - final int expectedCapitalCount = 1; + final var expectedCapitalCount = 1; final String[] expected = { "20:9: " + getWarningMessage("userID", expectedCapitalCount), @@ -429,7 +429,7 @@ public void testNullPointerException() throws Exception { public void testAbbreviationAsWordInNameCheckEnhancedInstanceof() throws Exception { - final int expectedCapitalCount = 4; + final var expectedCapitalCount = 4; final String[] expected = { "25:36: " + getWarningMessage("STRING", expectedCapitalCount), @@ -448,7 +448,7 @@ public void testAbbreviationAsWordInNameCheckEnhancedInstanceof() public void testAbbreviationAsWordInNameCheckEnhancedInstanceofAllowXmlLength1() throws Exception { - final int expectedCapitalCount = 2; + final var expectedCapitalCount = 2; final String[] expected = { "25:36: " + getWarningMessage("STRING", expectedCapitalCount), @@ -469,7 +469,7 @@ public void testAbbreviationAsWordInNameCheckEnhancedInstanceofAllowXmlLength1() public void testAbbreviationAsWordInNameCheckRecords() throws Exception { - final int expectedCapitalCount = 4; + final var expectedCapitalCount = 4; final String[] expected = { "22:11: " + getWarningMessage("myCLASS", expectedCapitalCount), @@ -499,7 +499,7 @@ public void testAbbreviationAsWordInNameCheckRecords() public void testAbbreviationAsWordInNameCheckRecordPatterns() throws Exception { - final int expectedCapitalCount = 4; + final var expectedCapitalCount = 4; final String[] expected = { "23:39: " + getWarningMessage("POINT", expectedCapitalCount), 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 8233b6635faf..5aba3ecf27f9 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 @@ -229,7 +229,7 @@ public void testMinimumWithCustomMessage() throws Exception { private static CharSequence makeLargeXyString() { // now needs 10'000 or 100'000, as just 1000 is no longer enough today to provoke the // StackOverflowError - final int size = 100_000; + final var size = 100_000; return "xy".repeat(size / 2); } 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 bee26476f8f3..81f87c58c0a8 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 @@ -172,7 +172,7 @@ public void testDefaultConfiguration() throws Exception { @Test public void testExecutableStatementCountRecords() throws Exception { - final int max = 1; + final var max = 1; final String[] expected = { "15:9: " + getCheckMessage(MSG_KEY, 3, max), @@ -191,7 +191,7 @@ public void testExecutableStatementCountRecords() throws Exception { @Test public void testExecutableStatementCountLambdas() throws Exception { - final int max = 1; + final var max = 1; final String[] expected = { "16:22: " + getCheckMessage(MSG_KEY, 6, max), 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 f628dc8db044..cad0bdf10311 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 @@ -187,7 +187,7 @@ public void testInterfaceMemberScopeIsPublic() throws Exception { @Test public void testMethodCountRecords() throws Exception { - final int max = 2; + final var max = 2; final String[] expected = { "18:5: " + getCheckMessage(MSG_MANY_METHODS, 3, max), 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 156766ba63f3..c1e060b45d92 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 @@ -108,7 +108,7 @@ public void testWithComments() throws Exception { @Test public void testCountEmpty() throws Exception { - final int max = 2; + final var max = 2; final String[] expected = { "24:5: " + getCheckMessage(MSG_KEY, 3, max, "AA"), "41:5: " + getCheckMessage(MSG_KEY, 3, max, "threeLines"), @@ -136,7 +136,7 @@ public void testAbstractTwo() throws Exception { @Test public void testTextBlocks() throws Exception { - final int max = 2; + final var max = 2; final String[] expected = { "14:5: " + getCheckMessage(MSG_KEY, 21, max, "longEmptyTextBlock"), @@ -153,7 +153,7 @@ public void testTextBlocks() throws Exception { @Test public void testRecordsAndCompactCtors() throws Exception { - final int max = 2; + final var max = 2; final String[] expected = { "26:9: " + getCheckMessage(MSG_KEY, 6, max, "MyTestRecord2"), @@ -170,7 +170,7 @@ public void testRecordsAndCompactCtors() throws Exception { @Test public void testRecordsAndCompactCtorsCountEmpty() throws Exception { - final int max = 2; + final var max = 2; final String[] expected = { "25:9: " + getCheckMessage(MSG_KEY, 3, max, "MyTestRecord2"), 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 ae3d4cf2687e..8375efcc157d 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 @@ -100,7 +100,7 @@ public void testWithInnerClass() throws Exception { @Test public void testWithRecords() throws Exception { - final int max = 1; + final var max = 1; final String[] expected = { "9:1: " + getCheckMessage(MSG_KEY, 2, max), 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 5b4254a81cc5..eb0e8bfaec79 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 @@ -67,7 +67,7 @@ public void testGetAcceptableTokens() { @Test public void testDefaultOne() throws Exception { - final int max = 8; + final var max = 8; final String[] expected = { "57:5: " + getCheckMessage(MSG_KEY, 14, max), @@ -84,7 +84,7 @@ public void testDefaultOne() throws Exception { @Test public void testDefaultTwo() throws Exception { - final int max = 8; + final var max = 8; final String[] expected = { "38:3: " + getCheckMessage(MSG_KEY, 15, max), @@ -98,7 +98,7 @@ public void testDefaultTwo() throws Exception { @Test public void testRecordComponentNumberTopLevel1() throws Exception { - final int max = 8; + final var max = 8; final String[] expected = { "12:1: " + getCheckMessage(MSG_KEY, 15, max), @@ -122,7 +122,7 @@ public void testRecordComponentNumberTopLevel2() throws Exception { @Test public void testRecordComponentNumberMax1() throws Exception { - final int max = 1; + final var max = 1; final String[] expected = { "28:5: " + getCheckMessage(MSG_KEY, 2, max), @@ -156,7 +156,7 @@ public void testRecordComponentNumberMax20() throws Exception { @Test public void testRecordComponentNumberPrivateModifierOne() throws Exception { - final int max = 8; + final var max = 8; final String[] expected = { "70:9: " + getCheckMessage(MSG_KEY, 14, max), @@ -170,7 +170,7 @@ public void testRecordComponentNumberPrivateModifierOne() throws Exception { @Test public void testRecordComponentNumberPrivateModifierTwo() throws Exception { - final int max = 8; + final var max = 8; final String[] expected = { "70:9: " + getCheckMessage(MSG_KEY, 14, max), 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 92095633beb6..c260d980fd9a 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilterTest.java @@ -59,7 +59,7 @@ public String getPackageLocation() { @Test public void testDefaultConfig() throws Exception { - final int expectedLineLength = 90; + final var expectedLineLength = 90; final String pattern = "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"; final String[] violationMessages = { @@ -87,7 +87,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testNearbyTextPattern() throws Exception { - final int expectedLineLength = 90; + final var expectedLineLength = 90; final String[] violationMessages = { "15: " + getRegexpSinglelineCheckMessage(), @@ -118,7 +118,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testCheckPattern() throws Exception { - final int expectedLineLength = 80; + final var expectedLineLength = 80; final String[] violationMessages = { "15: " + getRegexpSinglelineCheckMessage(), @@ -140,7 +140,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testMessagePattern() throws Exception { - final int expectedLineLength = 90; + final var expectedLineLength = 90; final String[] violationMessages = { "15: " + getRegexpSinglelineCheckMessage(), @@ -162,7 +162,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testIdPattern() throws Exception { - final int expectedLineLength = 80; + final var expectedLineLength = 80; final String[] violationMessages = { "16: " + getRegexpSinglelineCheckMessage(), @@ -184,7 +184,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testLineRangePositive3() throws Exception { - final int expectedLineLength = 92; + final var expectedLineLength = 92; final String[] violationMessages = { "15: " + getRegexpSinglelineCheckMessage(), @@ -216,7 +216,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testLineRangeNegative2() throws Exception { - final int expectedLineLength = 91; + final var expectedLineLength = 91; final String[] violationMessages = { "15: " + getRegexpSinglelineCheckMessage(), @@ -247,7 +247,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testVariableCheckPatternAndLineRange() throws Exception { - final int expectedLineLength = 85; + final var expectedLineLength = 85; final String[] violationMessages = { "19: " + getLineLengthCheckMessage(expectedLineLength, 89), @@ -276,7 +276,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testNearbyTextPatternAny() throws Exception { - final int expectedLineLength = 76; + final var expectedLineLength = 76; final String[] violationMessages = { "18: " + getLineLengthCheckMessage(expectedLineLength, 80), @@ -312,7 +312,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testNearbyTextPatternUrlLineLengthSuppression() throws Exception { - final int expectedLineLength = 90; + final var expectedLineLength = 90; final String[] violationMessages = { "32: " + getLineLengthCheckMessage(expectedLineLength, 98), @@ -443,7 +443,7 @@ public void testCachingExecution() throws Exception { Object.class, null) ); suppressFilter.accept(auditEvent1); - final boolean deleted = tempFile.delete(); + final var deleted = tempFile.delete(); assertWithMessage("Temporary file should be deleted.") .that(deleted).isTrue(); final AuditEvent auditEvent2 = new AuditEvent( 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 3f569a142fb9..eb5ead6e1b14 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilterTest.java @@ -389,7 +389,7 @@ public void testCachingExecution() throws Exception { Object.class, null) ); filter.accept(auditEvent1); - final boolean deleted = tempFile.delete(); + final var deleted = tempFile.delete(); assertWithMessage("Temporary file should be deleted.") .that(deleted).isTrue(); final AuditEvent auditEvent2 = new AuditEvent( 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 eb1582ea9e4c..3119112a85b4 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java @@ -348,7 +348,7 @@ public void testCompareToOfTagClass() { assertWithMessage("Invalid comparing result") .that(tag3.compareTo(tag1) > 0) .isTrue(); - final int actual = tag1.compareTo(tag4); + final var actual = tag1.compareTo(tag4); assertWithMessage("Invalid comparing result") .that(actual) .isEqualTo(0); @@ -608,7 +608,7 @@ public void testFindNearestMatchDontAllowSameColumn() { contents.reportSingleLineComment(1, 0); final TreeWalkerAuditEvent dummyEvent = new TreeWalkerAuditEvent(contents, "filename", new Violation(1, null, null, null, null, Object.class, null), null); - final boolean result = suppressionCommentFilter.accept(dummyEvent); + final var result = suppressionCommentFilter.accept(dummyEvent); assertWithMessage("Filter should not accept event") .that(result) .isFalse(); @@ -646,8 +646,8 @@ private static List> getTagsAfterExecution(SuppressionComment String filename, String... lines) { final FileContents contents = new FileContents( new FileText(new File(filename), Arrays.asList(lines))); - for (int lineNo = 0; lineNo < lines.length; lineNo++) { - final int colNo = lines[lineNo].indexOf("//"); + for (var lineNo = 0; lineNo < lines.length; lineNo++) { + final var colNo = lines[lineNo].indexOf("//"); if (colNo >= 0) { contents.reportSingleLineComment(lineNo + 1, colNo); } @@ -666,8 +666,8 @@ public void testCachingByFileContentsInstance() throws Exception { 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("//"); + for (var lineNo = 0; lineNo < lines.length; lineNo++) { + final var colNo = lines[lineNo].indexOf("//"); if (colNo >= 0) { fileContents.reportSingleLineComment(lineNo + 1, colNo); } 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 01d098cb1bad..af82adb5ec61 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java @@ -55,7 +55,7 @@ public String getPackageLocation() { @Test public void testAccept() throws Exception { final String fileName = getPath("InputSuppressionFilterNone.xml"); - final boolean optional = false; + final var optional = false; final SuppressionFilter filter = createSuppressionFilter(fileName, optional); final AuditEvent ev = new AuditEvent(this, "ATest.java", null); @@ -68,7 +68,7 @@ public void testAccept() throws Exception { @Test public void testAcceptFalse() throws Exception { final String fileName = getPath("InputSuppressionFilterSuppress.xml"); - final boolean optional = false; + final var optional = false; final SuppressionFilter filter = createSuppressionFilter(fileName, optional); final Violation message = new Violation(1, 1, null, "msg", null, @@ -83,7 +83,7 @@ public void testAcceptFalse() throws Exception { @Test public void testAcceptOnNullFile() throws CheckstyleException { final String fileName = null; - final boolean optional = false; + final var optional = false; final SuppressionFilter filter = createSuppressionFilter(fileName, optional); final AuditEvent ev = new AuditEvent(this, "AnyJava.java", null); @@ -96,7 +96,7 @@ public void testAcceptOnNullFile() throws CheckstyleException { public void testNonExistentSuppressionFileWithFalseOptional() { final String fileName = "non_existent_suppression_file.xml"; try { - final boolean optional = false; + final var optional = false; createSuppressionFilter(fileName, optional); assertWithMessage("Exception is expected").fail(); } @@ -111,7 +111,7 @@ public void testNonExistentSuppressionFileWithFalseOptional() { public void testExistingInvalidSuppressionFileWithTrueOptional() throws IOException { final String fileName = getPath("InputSuppressionFilterInvalidFile.xml"); try { - final boolean optional = true; + final var optional = true; createSuppressionFilter(fileName, optional); assertWithMessage("Exception is expected").fail(); } @@ -126,7 +126,7 @@ public void testExistingInvalidSuppressionFileWithTrueOptional() throws IOExcept @Test public void testExistingSuppressionFileWithTrueOptional() throws Exception { final String fileName = getPath("InputSuppressionFilterNone.xml"); - final boolean optional = true; + final var optional = true; final SuppressionFilter filter = createSuppressionFilter(fileName, optional); final AuditEvent ev = new AuditEvent(this, "AnyFile.java", null); @@ -139,7 +139,7 @@ public void testExistingSuppressionFileWithTrueOptional() throws Exception { @Test public void testNonExistentSuppressionFileWithTrueOptional() throws Exception { final String fileName = "non_existent_suppression_file.xml"; - final boolean optional = true; + final var optional = true; final SuppressionFilter filter = createSuppressionFilter(fileName, optional); final AuditEvent ev = new AuditEvent(this, "AnyFile.java", null); @@ -153,7 +153,7 @@ public void testNonExistentSuppressionFileWithTrueOptional() throws Exception { public void testNonExistentSuppressionUrlWithTrueOptional() throws Exception { final String fileName = "https://checkstyle.org/non_existent_suppression.xml"; - final boolean optional = true; + final var optional = true; final SuppressionFilter filter = createSuppressionFilter(fileName, optional); final AuditEvent ev = new AuditEvent(this, "AnyFile.java", null); @@ -224,11 +224,11 @@ public void testUseCacheRemoteFileExternalResourceContentDoesNotChange() throws } private static boolean isConnectionAvailableAndStable(String url) throws Exception { - boolean available = false; + var available = false; if (isUrlReachable(url)) { - final int attemptLimit = 5; - int attemptCount = 0; + final var attemptLimit = 5; + var attemptCount = 0; while (attemptCount <= attemptLimit) { try (InputStream stream = new URL(url).openStream()) { @@ -254,7 +254,7 @@ private static boolean isConnectionAvailableAndStable(String url) throws Excepti } private static boolean isUrlReachable(String url) { - boolean result = true; + var result = true; try { final URL verifiableUrl = new URL(url); final HttpURLConnection urlConnect = (HttpURLConnection) verifiableUrl.openConnection(); @@ -277,7 +277,7 @@ private static SuppressionFilter createSuppressionFilter(String fileName, boolea @Test public void testXpathSuppression() throws Exception { - for (int test = 1; test <= 6; test++) { + for (var test = 1; test <= 6; test++) { final String pattern = "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"; final String[] expected = { "19:29: " + getCheckMessage(ConstantNameCheck.class, MSG_INVALID_PATTERN, 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 6b1c51abab69..89618fe10643 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilterTest.java @@ -82,7 +82,7 @@ public void testAcceptOnNullFile() throws Exception { public void testNonExistentSuppressionFileWithFalseOptional() throws Exception { final String fileName = getPath("non_existent_suppression_file.xml"); try { - final boolean optional = false; + final var optional = false; createSuppressionXpathFilter(fileName, optional); assertWithMessage("Exception is expected").fail(); } @@ -97,7 +97,7 @@ public void testNonExistentSuppressionFileWithFalseOptional() throws Exception { public void testExistingInvalidSuppressionFileWithTrueOptional() throws Exception { final String fileName = getPath("InputSuppressionXpathFilterInvalidFile.xml"); try { - final boolean optional = true; + final var optional = true; createSuppressionXpathFilter(fileName, optional); assertWithMessage("Exception is expected").fail(); } @@ -149,7 +149,7 @@ public void testEqualsAndHashCode() { @Test public void testExternalResource() throws Exception { - final boolean optional = false; + final var optional = false; final String fileName = getPath("InputSuppressionXpathFilterIdAndQuery.xml"); final SuppressionXpathFilter filter = createSuppressionXpathFilter(fileName, optional); final Set expected = Collections.singleton(fileName); @@ -221,7 +221,7 @@ public void testFalseEncodeChar() throws Exception { @Test public void testXpathSuppression() throws Exception { - for (int test = 1; test <= 4; test++) { + for (var test = 1; test <= 4; test++) { final String[] expected = { "20:29: " + getCheckMessage(ConstantNameCheck.class, MSG_INVALID_PATTERN, 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 ea4b3da219bc..d4f1b8b3b348 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java @@ -193,8 +193,8 @@ private static FilterSet loadFilterSet(String url) throws Exception { FilterSet filterSet = null; if (isUrlReachable(url)) { - int attemptCount = 0; - final int attemptLimit = 5; + var attemptCount = 0; + final var attemptLimit = 5; while (attemptCount <= attemptLimit) { try { @@ -218,7 +218,7 @@ private static FilterSet loadFilterSet(String url) throws Exception { } private static boolean isUrlReachable(String url) { - boolean result = true; + var result = true; try { final URL verifiableUrl = new URL(url); final HttpURLConnection urlConnect = (HttpURLConnection) verifiableUrl.openConnection(); 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 b5d2141a7d06..a13acbd65adf 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJavaTokenTypesTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJavaTokenTypesTest.java @@ -747,7 +747,7 @@ public void testTokenNumbering() { final Set modeNames = Set.of(JavaLanguageLexer.modeNames); final Set channelNames = Set.of(JavaLanguageLexer.channelNames); - final int tokenCount = (int) Arrays.stream(JavaLanguageLexer.class.getDeclaredFields()) + final var tokenCount = (int) Arrays.stream(JavaLanguageLexer.class.getDeclaredFields()) .filter(GeneratedJavaTokenTypesTest::isPublicStaticFinalInt) .filter(field -> !modeNames.contains(field.getName())) .filter(field -> !channelNames.contains(field.getName())) @@ -779,9 +779,9 @@ public void testTokenHasBeenAddedToTokensBlockInLexerGrammar() { // Get the starting index of the sublist of tokens, or -1 if sublist // is not present. - final int lastIndexOfSublist = + final var lastIndexOfSublist = Collections.lastIndexOfSubList(allTokenNames, INTERNAL_TOKENS); - final int expectedNumberOfUsedTokens = allTokenNames.size() - INTERNAL_TOKENS.size(); + final var expectedNumberOfUsedTokens = allTokenNames.size() - INTERNAL_TOKENS.size(); assertWithMessage("New tokens must be added to the 'tokens' block in the lexer grammar.") .that(lastIndexOfSublist) @@ -796,7 +796,7 @@ public void testTokenHasBeenAddedToTokensBlockInLexerGrammar() { */ private static boolean isPublicStaticFinalInt(Field field) { final Class fieldType = field.getType(); - final int mods = field.getModifiers(); + final var mods = field.getModifiers(); return fieldType.equals(Integer.TYPE) && Modifier.isPublic(mods) && Modifier.isStatic(mods) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/GeneratedJavadocCommentsTokenTypesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/GeneratedJavadocCommentsTokenTypesTest.java index 6ddf0e41aca6..9fe30b33fb97 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/GeneratedJavadocCommentsTokenTypesTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/GeneratedJavadocCommentsTokenTypesTest.java @@ -346,7 +346,7 @@ public void testTokenNumbers() { final Set modeNames = Set.of(JavadocCommentsLexer.modeNames); final Set channelNames = Set.of(JavadocCommentsLexer.channelNames); - final int tokenCount = (int) Arrays.stream(JavadocCommentsLexer.class.getDeclaredFields()) + final var tokenCount = (int) Arrays.stream(JavadocCommentsLexer.class.getDeclaredFields()) .filter(GeneratedJavadocCommentsTokenTypesTest::isPublicStaticFinalInt) .filter(field -> !modeNames.contains(field.getName())) .filter(field -> !channelNames.contains(field.getName())) @@ -369,7 +369,7 @@ public void testTokenNumbers() { */ private static boolean isPublicStaticFinalInt(Field field) { final Class fieldType = field.getType(); - final int mods = field.getModifiers(); + final var mods = field.getModifiers(); return fieldType.equals(Integer.TYPE) && Modifier.isPublic(mods) && Modifier.isStatic(mods) 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 04df1cdb8d03..547dbd1745f5 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentationTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentationTest.java @@ -66,9 +66,9 @@ public String getPackageLocation() { */ private static List convertLinesToPosition(List systemLinesToPosition) { final List convertedLinesToPosition = new ArrayList<>(); - final int lineSeparationCorrection = System.lineSeparator().length() - 1; + final var lineSeparationCorrection = System.lineSeparator().length() - 1; convertedLinesToPosition.add(0, systemLinesToPosition.get(0)); - for (int i = 1; i < systemLinesToPosition.size(); i++) { + for (var i = 1; i < systemLinesToPosition.size(); i++) { convertedLinesToPosition.add(i, systemLinesToPosition.get(i) - lineSeparationCorrection * (i - 1)); } @@ -137,7 +137,7 @@ public void testDetailNodeLeafSelection() { .getChild(tree.getFirstChild().getNextSibling().getFirstChild(), 0); DetailNode javadocLeaf = null; DetailNode node = javadoc.getFirstChild(); - for (int index = 0; node != null; index++, node = node.getNextSibling()) { + for (var index = 0; node != null; index++, node = node.getNextSibling()) { if (index == 2) { javadocLeaf = node; break; 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 64b0961b87a0..d68d2858b764 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModelTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModelTest.java @@ -175,7 +175,7 @@ private void verifyCorrectTestDataInFrameModel() throws IOException { .that(model.isReloadActionEnabled()) .isTrue(); - final int expectedLines = 19; + final var expectedLines = 19; assertWithMessage("Invalid lines to position") .that(model.getLinesToPosition()) .hasSize(expectedLines); 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 4e2ff49559b4..22a13917016a 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainTest.java @@ -48,7 +48,7 @@ public String getPackageLocation() { @ValueSource(strings = {";", "InputMain.java"}) public void testMain(String argList) throws Exception { final String[] args = argList.split(";"); - for (int i = 0; i < args.length; i++) { + for (var i = 0; i < args.length; i++) { args[i] = getPath(args[i]); } @@ -57,7 +57,7 @@ public void testMain(String argList) throws Exception { SwingUtilities.invokeAndWait(() -> { // Close the main window - final long mainFrameCount = Arrays.stream(Window.getWindows()) + final var mainFrameCount = Arrays.stream(Window.getWindows()) .filter(wnd -> wnd instanceof MainFrame && wnd.isVisible()) .peek(Window::dispose) .count(); 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 ff1d8b9b3aad..d06bea850cbe 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModelTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModelTest.java @@ -57,7 +57,7 @@ public void loadTree() throws Exception { @Test public void testChildCount() { - final int childCount = new ParseTreeTableModel(null).getChildCount(classDef); + final var childCount = new ParseTreeTableModel(null).getChildCount(classDef); assertWithMessage("Invalid child count") .that(childCount) .isEqualTo(5); @@ -69,7 +69,7 @@ public void testChild() { assertWithMessage("Invalid child type") .that(child) .isInstanceOf(DetailAST.class); - final int type = ((DetailAST) child).getType(); + final var type = ((DetailAST) child).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(BLOCK_COMMENT_BEGIN); @@ -81,7 +81,7 @@ public void testCommentChildCount() { .findFirstToken(BLOCK_COMMENT_BEGIN).findFirstToken(COMMENT_CONTENT); final ParseTreeTableModel parseTree = new ParseTreeTableModel(null); parseTree.setParseMode(ParseMode.JAVA_WITH_COMMENTS); - final int javadocCommentChildCount = parseTree.getChildCount(commentContentNode); + final var javadocCommentChildCount = parseTree.getChildCount(commentContentNode); assertWithMessage("Invalid child count") .that(javadocCommentChildCount) .isEqualTo(0); @@ -91,7 +91,7 @@ public void testCommentChildCount() { public void testChildCountInJavaAndJavadocMode() { final ParseTreeTableModel parseTree = new ParseTreeTableModel(null); parseTree.setParseMode(ParseMode.JAVA_WITH_JAVADOC_AND_COMMENTS); - final int childCount = parseTree.getChildCount(classDef); + final var childCount = parseTree.getChildCount(classDef); assertWithMessage("Invalid child count") .that(childCount) .isEqualTo(5); @@ -105,7 +105,7 @@ public void testChildInJavaAndJavadocMode() { assertWithMessage("Invalid child type") .that(child) .isInstanceOf(DetailAST.class); - final int type = ((DetailAST) child).getType(); + final var type = ((DetailAST) child).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(BLOCK_COMMENT_BEGIN); @@ -117,7 +117,7 @@ public void testCommentChildCountInJavaAndJavadocMode() { .findFirstToken(BLOCK_COMMENT_BEGIN).findFirstToken(COMMENT_CONTENT); final ParseTreeTableModel parseTree = new ParseTreeTableModel(null); parseTree.setParseMode(ParseMode.JAVA_WITH_JAVADOC_AND_COMMENTS); - final int commentChildCount = parseTree.getChildCount(commentContentNode); + final var commentChildCount = parseTree.getChildCount(commentContentNode); assertWithMessage("Invalid child count") .that(commentChildCount) .isEqualTo(1); @@ -140,12 +140,12 @@ public void testJavadocCommentChildCount() { final DetailAST commentContentNode = classDef .findFirstToken(BLOCK_COMMENT_BEGIN).findFirstToken(COMMENT_CONTENT); final ParseTreeTableModel parseTree = new ParseTreeTableModel(null); - final int commentChildCount = parseTree.getChildCount(commentContentNode); + final var commentChildCount = parseTree.getChildCount(commentContentNode); assertWithMessage("Invalid child count") .that(commentChildCount) .isEqualTo(0); parseTree.setParseMode(ParseMode.JAVA_WITH_JAVADOC_AND_COMMENTS); - final int javadocCommentChildCount = parseTree.getChildCount(commentContentNode); + final var javadocCommentChildCount = parseTree.getChildCount(commentContentNode); assertWithMessage("Invalid child count") .that(javadocCommentChildCount) .isEqualTo(1); @@ -161,7 +161,7 @@ public void testJavadocCommentChild() { assertWithMessage("Invalid child type") .that(child) .isInstanceOf(DetailNode.class); - final int type = ((DetailNode) child).getType(); + final var type = ((DetailNode) child).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(JavadocCommentsTokenTypes.JAVADOC_CONTENT); @@ -169,7 +169,7 @@ public void testJavadocCommentChild() { assertWithMessage("Invalid child type") .that(childSame) .isInstanceOf(DetailNode.class); - final int sameType = ((DetailNode) childSame).getType(); + final var sameType = ((DetailNode) childSame).getType(); assertWithMessage("Invalid child token type") .that(sameType) .isEqualTo(JavadocCommentsTokenTypes.JAVADOC_CONTENT); @@ -185,11 +185,11 @@ public void testJavadocChildCount() { assertWithMessage("Invalid child type") .that(javadoc) .isInstanceOf(DetailNode.class); - final int type = ((DetailNode) javadoc).getType(); + final var type = ((DetailNode) javadoc).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(JavadocCommentsTokenTypes.JAVADOC_CONTENT); - final int javadocChildCount = parseTree.getChildCount(javadoc); + final var javadocChildCount = parseTree.getChildCount(javadoc); assertWithMessage("Invalid child count") .that(javadocChildCount) .isEqualTo(4); @@ -205,7 +205,7 @@ public void testJavadocChild() { assertWithMessage("Invalid child type") .that(javadoc) .isInstanceOf(DetailNode.class); - final int type = ((DetailNode) javadoc).getType(); + final var type = ((DetailNode) javadoc).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(JavadocCommentsTokenTypes.JAVADOC_CONTENT); @@ -213,7 +213,7 @@ public void testJavadocChild() { assertWithMessage("Invalid child type") .that(javadocChild) .isInstanceOf(DetailNode.class); - final int childType = ((DetailNode) javadocChild).getType(); + final var childType = ((DetailNode) javadocChild).getType(); assertWithMessage("Invalid child token type") .that(childType) .isEqualTo(JavadocCommentsTokenTypes.TEXT); @@ -226,16 +226,16 @@ public void testGetIndexOfChild() { .that(child) .isNotNull(); final ParseTreeTableModel parseTree = new ParseTreeTableModel(null); - int index = 0; + var index = 0; while (child != null) { - final int indexOfChild = parseTree.getIndexOfChild(classDef, child); + final var indexOfChild = parseTree.getIndexOfChild(classDef, child); assertWithMessage("Invalid child index") .that(indexOfChild) .isEqualTo(index); child = child.getNextSibling(); index++; } - final int indexOfChild = parseTree.getIndexOfChild(classDef, new DetailAstImpl()); + final var indexOfChild = parseTree.getIndexOfChild(classDef, new DetailAstImpl()); assertWithMessage("Invalid child index") .that(indexOfChild) .isEqualTo(-1); @@ -251,8 +251,8 @@ public void testGetValueAt() { final ParseTreeTableModel parseTree = new ParseTreeTableModel(null); final Object treeModel = parseTree.getValueAt(classIdentNode, 0); final String type = (String) parseTree.getValueAt(classIdentNode, 1); - final int line = (int) parseTree.getValueAt(classIdentNode, 2); - final int column = (int) parseTree.getValueAt(classIdentNode, 3); + final var line = (int) parseTree.getValueAt(classIdentNode, 2); + final var column = (int) parseTree.getValueAt(classIdentNode, 3); final String text = (String) parseTree.getValueAt(classIdentNode, 4); assertWithMessage("Node should be an Identifier") @@ -289,7 +289,7 @@ public void testGetValueAtDetailNode() { assertWithMessage("Comment classDef cannot be null") .that(commentContentNode) .isNotNull(); - final int nodeType = commentContentNode.getType(); + final var nodeType = commentContentNode.getType(); assertWithMessage("Comment classDef should be a comment type") .that(TokenUtil.isCommentType(nodeType)) .isTrue(); @@ -309,8 +309,8 @@ public void testGetValueAtDetailNode() { final Object treeModel = parseTree.getValueAt(child, 0); final String type = (String) parseTree.getValueAt(child, 1); - final int line = (int) parseTree.getValueAt(child, 2); - final int column = (int) parseTree.getValueAt(child, 3); + final var line = (int) parseTree.getValueAt(child, 2); + final var column = (int) parseTree.getValueAt(child, 3); final String text = (String) parseTree.getValueAt(child, 4); final String expectedText = "JAVADOC_CONTENT"; 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 e5d951c983a0..da2d3fa8068f 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentationTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentationTest.java @@ -63,7 +63,7 @@ public void testRoot() throws Exception { @Test public void testChildCount() { - final int childCount = new ParseTreeTablePresentation(null).getChildCount(tree); + final var childCount = new ParseTreeTablePresentation(null).getChildCount(tree); assertWithMessage("Invalid child count") .that(childCount) .isEqualTo(5); @@ -73,7 +73,7 @@ public void testChildCount() { public void testChildCountInJavaAndJavadocMode() { final ParseTreeTablePresentation parseTree = new ParseTreeTablePresentation(null); parseTree.setParseMode(ParseMode.JAVA_WITH_JAVADOC_AND_COMMENTS); - final int childCount = parseTree.getChildCount(tree); + final var childCount = parseTree.getChildCount(tree); assertWithMessage("Invalid child count") .that(childCount) .isEqualTo(5); @@ -85,7 +85,7 @@ public void testChild() { assertWithMessage("Invalid child type") .that(child) .isInstanceOf(DetailAST.class); - final int type = ((DetailAST) child).getType(); + final var type = ((DetailAST) child).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(TokenTypes.BLOCK_COMMENT_BEGIN); @@ -99,7 +99,7 @@ public void testChildInJavaAndJavadocMode() { assertWithMessage("Invalid child type") .that(child) .isInstanceOf(DetailAST.class); - final int type = ((DetailAST) child).getType(); + final var type = ((DetailAST) child).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(TokenTypes.BLOCK_COMMENT_BEGIN); @@ -110,7 +110,7 @@ public void testCommentChildCount() { final DetailAST commentContentNode = tree.getFirstChild().getNextSibling().getFirstChild(); final ParseTreeTablePresentation parseTree = new ParseTreeTablePresentation(null); parseTree.setParseMode(ParseMode.JAVA_WITH_COMMENTS); - final int javadocCommentChildCount = parseTree.getChildCount(commentContentNode); + final var javadocCommentChildCount = parseTree.getChildCount(commentContentNode); assertWithMessage("Invalid child count") .that(javadocCommentChildCount) .isEqualTo(0); @@ -122,7 +122,7 @@ public void testCommentChildCountInJavaAndJavadocMode() { parseTree.setParseMode(ParseMode.JAVA_WITH_JAVADOC_AND_COMMENTS); final DetailAST commentContentNode = tree.getLastChild().getLastChild() .getPreviousSibling().getLastChild().getFirstChild().getFirstChild(); - final int commentChildCount = parseTree.getChildCount(commentContentNode); + final var commentChildCount = parseTree.getChildCount(commentContentNode); assertWithMessage("Invalid child count") .that(commentChildCount) .isEqualTo(0); @@ -144,12 +144,12 @@ public void testCommentChildInJavaAndJavadocMode() { public void testJavadocCommentChildCount() { final DetailAST commentContentNode = tree.getFirstChild().getNextSibling().getFirstChild(); final ParseTreeTablePresentation parseTree = new ParseTreeTablePresentation(null); - final int commentChildCount = parseTree.getChildCount(commentContentNode); + final var commentChildCount = parseTree.getChildCount(commentContentNode); assertWithMessage("Invalid child count") .that(commentChildCount) .isEqualTo(0); parseTree.setParseMode(ParseMode.JAVA_WITH_JAVADOC_AND_COMMENTS); - final int javadocCommentChildCount = parseTree.getChildCount(commentContentNode); + final var javadocCommentChildCount = parseTree.getChildCount(commentContentNode); assertWithMessage("Invalid child count") .that(javadocCommentChildCount) .isEqualTo(1); @@ -164,7 +164,7 @@ public void testJavadocCommentChild() { assertWithMessage("Invalid child type") .that(child) .isInstanceOf(DetailNode.class); - final int type = ((DetailNode) child).getType(); + final var type = ((DetailNode) child).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(JavadocCommentsTokenTypes.JAVADOC_CONTENT); @@ -173,7 +173,7 @@ public void testJavadocCommentChild() { assertWithMessage("Invalid child type") .that(childSame) .isInstanceOf(DetailNode.class); - final int sameType = ((DetailNode) childSame).getType(); + final var sameType = ((DetailNode) childSame).getType(); assertWithMessage("Invalid child token type") .that(sameType) .isEqualTo(JavadocCommentsTokenTypes.JAVADOC_CONTENT); @@ -188,11 +188,11 @@ public void testJavadocChildCount() { assertWithMessage("Invalid child type") .that(javadoc) .isInstanceOf(DetailNode.class); - final int type = ((DetailNode) javadoc).getType(); + final var type = ((DetailNode) javadoc).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(JavadocCommentsTokenTypes.JAVADOC_CONTENT); - final int javadocChildCount = parseTree.getChildCount(javadoc); + final var javadocChildCount = parseTree.getChildCount(javadoc); assertWithMessage("Invalid child count") .that(javadocChildCount) .isEqualTo(4); @@ -207,7 +207,7 @@ public void testJavadocChild() { assertWithMessage("Invalid child type") .that(javadoc) .isInstanceOf(DetailNode.class); - final int type = ((DetailNode) javadoc).getType(); + final var type = ((DetailNode) javadoc).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(JavadocCommentsTokenTypes.JAVADOC_CONTENT); @@ -215,7 +215,7 @@ public void testJavadocChild() { assertWithMessage("Invalid child type") .that(javadocChild) .isInstanceOf(DetailNode.class); - final int childType = ((DetailNode) javadocChild).getType(); + final var childType = ((DetailNode) javadocChild).getType(); assertWithMessage("Invalid child token type") .that(childType) .isEqualTo(JavadocCommentsTokenTypes.TEXT); @@ -228,9 +228,9 @@ public void testGetIndexOfChild() { .that(ithChild) .isNotNull(); final ParseTreeTablePresentation parseTree = new ParseTreeTablePresentation(null); - int index = 0; + var index = 0; while (ithChild != null) { - final int indexOfChild = parseTree.getIndexOfChild(tree, ithChild); + final var indexOfChild = parseTree.getIndexOfChild(tree, ithChild); assertWithMessage("Invalid child index") .that(indexOfChild) .isEqualTo(index); @@ -238,7 +238,7 @@ public void testGetIndexOfChild() { index++; } - final int indexOfChild = parseTree.getIndexOfChild(tree, new DetailAstImpl()); + final var indexOfChild = parseTree.getIndexOfChild(tree, new DetailAstImpl()); assertWithMessage("Invalid child index") .that(indexOfChild) .isEqualTo(-1); @@ -273,8 +273,8 @@ public void testGetValueAt() { final ParseTreeTablePresentation parseTree = new ParseTreeTablePresentation(null); final Object treeModel = parseTree.getValueAt(node, 0); final String type = (String) parseTree.getValueAt(node, 1); - final int line = (int) parseTree.getValueAt(node, 2); - final int column = (int) parseTree.getValueAt(node, 3); + final var line = (int) parseTree.getValueAt(node, 2); + final var column = (int) parseTree.getValueAt(node, 3); final String text = (String) parseTree.getValueAt(node, 4); assertWithMessage("Node should be an Identifier") @@ -310,7 +310,7 @@ public void testGetValueAtDetailNode() { assertWithMessage("Comment node cannot be null") .that(commentContentNode) .isNotNull(); - final int nodeType = commentContentNode.getType(); + final var nodeType = commentContentNode.getType(); assertWithMessage("Comment node should be a comment type") .that(TokenUtil.isCommentType(nodeType)) .isTrue(); @@ -330,8 +330,8 @@ public void testGetValueAtDetailNode() { final Object treeModel = parseTree.getValueAt(child, 0); final String type = (String) parseTree.getValueAt(child, 1); - final int line = (int) parseTree.getValueAt(child, 2); - final int column = (int) parseTree.getValueAt(child, 3); + final var line = (int) parseTree.getValueAt(child, 2); + final var column = (int) parseTree.getValueAt(child, 3); final String text = (String) parseTree.getValueAt(child, 4); final String expectedText = "JAVADOC_CONTENT"; 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 443277c2ec2f..0832b2077b3c 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java @@ -630,7 +630,7 @@ private static void verifyCheckstyleMessage(Map> usedMessag */ private static boolean isSubset(int[] array, int... arrayToCheckIn) { Arrays.sort(arrayToCheckIn); - boolean result = true; + var result = true; for (final int element : array) { if (Arrays.binarySearch(arrayToCheckIn, element) < 0) { result = false; 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 1aecf4836726..de2d849953dd 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllTestsTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllTestsTest.java @@ -125,7 +125,7 @@ private static void grabAllTests(Map> allTests, File file) path += "Check"; } - final int slash = path.lastIndexOf(File.separatorChar); + final var slash = path.lastIndexOf(File.separatorChar); final String packge = path.substring(0, slash); final List classes = allTests.computeIfAbsent(packge, key -> new ArrayList<>()); @@ -144,7 +144,7 @@ private static void grabAllFiles(Map> allTests, File file) throw new IllegalStateException(exc); } - final int slash = path.lastIndexOf(File.separatorChar); + final var slash = path.lastIndexOf(File.separatorChar); final String packge = path.substring(0, slash); final List classes = allTests.computeIfAbsent(packge, key -> new ArrayList<>()); @@ -166,7 +166,7 @@ private static void verifyInputFile(Map> allTests, File fil // until https://github.com/checkstyle/checkstyle/issues/5105 if (shouldSkipFileProcessing(path)) { String fileName = file.getName(); - final boolean skipFileNaming = shouldSkipInputFileNameCheck(path, fileName); + final var skipFileNaming = shouldSkipInputFileNameCheck(path, fileName); if (!skipFileNaming) { assertWithMessage("Resource must start with 'Input' or 'Expected': %s", path) @@ -180,7 +180,7 @@ private static void verifyInputFile(Map> allTests, File fil fileName = fileName.substring(8); } - final int period = fileName.lastIndexOf('.'); + final var period = fileName.lastIndexOf('.'); if (period > 0) { fileName = fileName.substring(0, period); @@ -195,11 +195,11 @@ private static void verifyInputFile(Map> allTests, File fil private static void verifyInputFile(Map> allTests, boolean skipFileNaming, String path, String fileName) { List classes; - int slash = path.lastIndexOf(File.separatorChar); + var slash = path.lastIndexOf(File.separatorChar); String packge = path.substring(0, slash); - boolean found = false; + var found = false; - for (int depth = 0; depth < 4; depth++) { + for (var depth = 0; depth < 4; depth++) { // -@cs[MoveVariableInsideIf] assignment value is modified later, so it can't be // moved final String folderPath = packge; @@ -252,7 +252,7 @@ private static void verifyHasProductionFile(Map> allTests, if (!path.contains(File.separatorChar + "grammar" + File.separatorChar) && !path.contains(File.separatorChar + "internal" + File.separatorChar)) { - final int slash = path.lastIndexOf(File.separatorChar); + final var slash = path.lastIndexOf(File.separatorChar); final String packge = path.substring(0, slash); final List classes = allTests.get(packge); @@ -279,7 +279,7 @@ private static boolean isTarget(File file, String fileName) { private static boolean checkInputMatchCorrectFileStructure(List classes, String folderPath, boolean skipFileNaming, String fileName) { - boolean result = false; + var result = false; for (String clss : classes) { if (folderPath.endsWith(File.separatorChar + clss.toLowerCase(Locale.ENGLISH)) 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 cc6411d72f02..bb6c480deb6a 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java @@ -211,7 +211,7 @@ public void testCommitMessageHasProperStructure() throws Exception { final List lastCommits = getCommitsToCheck(); for (RevCommit commit : filterValidCommits(lastCommits)) { final String commitMessage = commit.getFullMessage(); - final int error = validateCommitMessage(commitMessage); + final var error = validateCommitMessage(commitMessage); if (error != 0) { final String commitId = commit.getId().getName(); @@ -338,7 +338,7 @@ private static List getCommitsByLastCommitAuthor( final String lastCommitAuthor = lastCommit.getAuthorIdent().getName(); commits.add(lastCommit); - boolean wasLastCheckedCommitAuthorSameAsLastCommit = true; + var wasLastCheckedCommitAuthorSameAsLastCommit = true; while (wasLastCheckedCommitAuthorSameAsLastCommit && previousCommitsIterator.hasNext()) { final RevCommit currentCommit = previousCommitsIterator.next(); 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 0e458458a178..69b2dfb87866 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/ImmutabilityTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/ImmutabilityTest.java @@ -359,7 +359,7 @@ private static boolean isEnumConstantOrEmptyArray(JavaField javaField) { * if it contains parameterized type */ private static boolean isParameterizedTypeImmutable(JavaField javaField) { - boolean isParameterizedTypeImmutable = false; + var isParameterizedTypeImmutable = false; final JavaType javaType = javaField.getType(); if (javaType instanceof JavaParameterizedType parameterizedType) { @@ -401,7 +401,7 @@ private ModulePropertyPredicate() { * @return {@code true} if field is a module property */ private static boolean isModuleProperty(JavaField javaField) { - boolean result = false; + var result = false; final JavaClass containingClass = javaField.getOwner(); final ModuleDetails moduleDetails = MODULE_DETAILS_MAP.get( containingClass.getFullName()); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsCategoryIndexTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsCategoryIndexTest.java index 8aa020390e08..97db636196f1 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsCategoryIndexTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsCategoryIndexTest.java @@ -162,7 +162,7 @@ private static String getMainSectionName(Path checkXdocFile) final Document document = XmlUtil.getRawXml(checkXdocFile.toString(), content, content); final NodeList sections = document.getElementsByTagName("section"); - for (int sectionIndex = 0; sectionIndex < sections.getLength(); sectionIndex++) { + for (var sectionIndex = 0; sectionIndex < sections.getLength(); sectionIndex++) { final Node sectionNode = sections.item(sectionIndex); if (sectionNode instanceof Element sectionElement && sectionElement.hasAttribute("name")) { @@ -194,7 +194,7 @@ private static String getCheckDescriptionFromXdoc(Path checkXdocFile) final Document document = XmlUtil.getRawXml(checkXdocFile.toString(), content, content); final NodeList subsections = document.getElementsByTagName("subsection"); - for (int subsectionIdx = 0; subsectionIdx < subsections.getLength(); subsectionIdx++) { + for (var subsectionIdx = 0; subsectionIdx < subsections.getLength(); subsectionIdx++) { final Node subsectionNode = subsections.item(subsectionIdx); if (subsectionNode instanceof Element subsectionElement && "Description".equals(subsectionElement.getAttribute("name"))) { @@ -283,7 +283,7 @@ private static Optional findTextInChildElements(Element parent, String t private static Optional getAggregatedDirectText(Element parent) { final StringBuilder directTextContent = new StringBuilder(32); final NodeList directChildren = parent.getChildNodes(); - for (int childIdx = 0; childIdx < directChildren.getLength(); childIdx++) { + for (var childIdx = 0; childIdx < directChildren.getLength(); childIdx++) { final Node directChild = directChildren.item(childIdx); if (directChild.getNodeType() == Node.TEXT_NODE) { directTextContent.append(directChild.getNodeValue()); @@ -321,7 +321,7 @@ private static Map parseCategoryIndex(Path categoryIndex throw new AssertionError(errorMsg); } - for (int tableIdx = 0; tableIdx < tableNodes.getLength(); tableIdx++) { + for (var tableIdx = 0; tableIdx < tableNodes.getLength(); tableIdx++) { final Node tableNode = tableNodes.item(tableIdx); if (tableNode instanceof Element element) { processTableElement(element, indexedChecks); @@ -340,7 +340,7 @@ private static Map parseCategoryIndex(Path categoryIndex private static void processTableElement(Element tableElement, Map indexedChecks) { final List rowElements = getChildrenElementsByTagName(tableElement, "tr"); - boolean isFirstRowInTable = true; + var isFirstRowInTable = true; for (final Element rowElement : rowElements) { if (isFirstRowInTable) { @@ -400,7 +400,7 @@ private static List getChildrenElementsByTagName(Node parent, String ta final List elements = new ArrayList<>(); if (parent != null) { final NodeList children = parent.getChildNodes(); - for (int childIdx = 0; childIdx < children.getLength(); childIdx++) { + for (var childIdx = 0; childIdx < children.getLength(); childIdx++) { final Node child = children.item(childIdx); if (child instanceof Element element && tagName.equals(child.getNodeName())) { elements.add(element); @@ -422,7 +422,7 @@ private static Optional getFirstChildElementByTagName(Node parent, Stri Optional result = Optional.empty(); if (parent != null) { final NodeList children = parent.getChildNodes(); - for (int childIdx = 0; childIdx < children.getLength(); childIdx++) { + for (var childIdx = 0; childIdx < children.getLength(); childIdx++) { final Node child = children.item(childIdx); if (child instanceof Element element && tagName.equals(child.getNodeName())) { result = Optional.of(element); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsExamplesAstConsistencyTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsExamplesAstConsistencyTest.java index bb6115ac0769..e3d9ad50d648 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsExamplesAstConsistencyTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsExamplesAstConsistencyTest.java @@ -399,14 +399,14 @@ private static String extractIndependentPattern(String violation) { */ private static String extractMismatchFileName(String violation) { final String prefix = "Mismatch: "; - final int startIndex = violation.indexOf(prefix); + final var startIndex = violation.indexOf(prefix); final String result; if (startIndex == -1) { result = null; } else { - final int endIndex = violation.indexOf('\n', startIndex); + final var endIndex = violation.indexOf('\n', startIndex); if (endIndex == -1) { result = violation.substring(startIndex + prefix.length()).trim(); } @@ -457,14 +457,14 @@ private static String getRelativePath(Path dir) { */ private static String extractDirectoryPath(String violation) { final String prefix = "Directory: "; - final int startIndex = violation.indexOf(prefix); + final var startIndex = violation.indexOf(prefix); final String result; if (startIndex == -1) { result = null; } else { - final int endIndex = violation.indexOf('\n', startIndex); + final var endIndex = violation.indexOf('\n', startIndex); if (endIndex == -1) { result = null; } @@ -483,7 +483,7 @@ private static String extractDirectoryPath(String violation) { * @return true if the directory contains 2 or more Example*.java files */ private static boolean containsMultipleExamples(Path dir) { - boolean result = false; + var result = false; try (Stream pathStream = Files.list(dir)) { result = pathStream @@ -588,7 +588,7 @@ private static List validateAllMatch(Path dir, List examples) if (referenceDetailAst != null) { final StructuralAstNode referenceAst = toStructuralAst(referenceDetailAst); - for (int index = 1; index < examples.size(); index++) { + for (var index = 1; index < examples.size(); index++) { final Path example = examples.get(index); final String violation = compareSingleExample( dir, example, reference, referenceAst @@ -615,10 +615,10 @@ private static List validateAllMatch(Path dir, List examples) */ private static String extractXdocSection(Path file) throws IOException { final List lines = Files.readAllLines(file, StandardCharsets.UTF_8); - int startIndex = -1; - int endIndex = -1; + var startIndex = -1; + var endIndex = -1; - for (int index = 0; index < lines.size(); index++) { + for (var index = 0; index < lines.size(); index++) { final String line = lines.get(index); if (line.contains(XDOC_START_MARKER)) { startIndex = index + 1; @@ -735,7 +735,7 @@ private static StructuralAstNode toStructuralAst(DetailAST ast) { * @return true if the node is a comment */ private static boolean isCommentNode(DetailAST ast) { - final int type = ast.getType(); + final var type = ast.getType(); return type == TokenTypes.SINGLE_LINE_COMMENT || type == TokenTypes.BLOCK_COMMENT_BEGIN || type == TokenTypes.COMMENT_CONTENT; @@ -761,7 +761,7 @@ private void addChild(StructuralAstNode child) { public boolean equals(Object obj) { final boolean result; if (obj instanceof StructuralAstNode other) { - final boolean childrenEqual = children.equals(other.children); + final var childrenEqual = children.equals(other.children); result = type == other.type && childrenEqual; } else { 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 c0239edf9638..5c503e15c991 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsJavaDocsTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsJavaDocsTest.java @@ -100,7 +100,7 @@ public void testAllCheckSectionJavaDocs() throws Exception { final Document document = XmlUtil.getRawXml(fileName, input, input); final NodeList sources = document.getElementsByTagName("section"); - for (int position = 0; position < sources.getLength(); position++) { + for (var position = 0; position < sources.getLength(); position++) { final Node section = sources.item(position); final String sectionName = XmlUtil.getNameAttributeOfNode(section); @@ -169,13 +169,13 @@ private static String getNodeText(Node node) { // -@cs[CyclomaticComplexity] No simple way to split this apart. private static void appendNodeText(StringBuilder result, Node node) { final String name = transformXmlToJavaDocName(node.getNodeName()); - final boolean list = "ol".equals(name) || "ul".equals(name); - final boolean newLineOpenBefore = list || "p".equals(name) || "pre".equals(name) + final var list = "ol".equals(name) || "ul".equals(name); + final var newLineOpenBefore = list || "p".equals(name) || "pre".equals(name) || "li".equals(name); - final boolean newLineOpenAfter = newLineOpenBefore && !list; - final boolean newLineClose = newLineOpenAfter || list; - final boolean sanitize = "pre".equals(name); - final boolean changeToTag = "code".equals(name); + final var newLineOpenAfter = newLineOpenBefore && !list; + final var newLineClose = newLineOpenAfter || list; + final var sanitize = "pre".equals(name); + final var changeToTag = "code".equals(name); if (newLineOpenBefore) { result.append('\n'); @@ -228,7 +228,7 @@ private static boolean shouldAppendSpace(StringBuilder text, char firstCharToApp result = false; } else { - final char last = text.charAt(text.length() - 1); + final var last = text.charAt(text.length() - 1); result = (firstCharToAppend == '@' || Character.getType(firstCharToAppend) == Character.DASH_PUNCTUATION @@ -259,7 +259,7 @@ else if ("h4".equals(name)) { private static String getAttributeText(String nodeName, NamedNodeMap attributes) { final StringBuilder result = new StringBuilder(20); - for (int i = 0; i < attributes.getLength(); i++) { + for (var i = 0; i < attributes.getLength(); i++) { result.append(' '); final Node attribute = attributes.item(i); @@ -362,7 +362,7 @@ public void visitToken(DetailAST ast) { private static DetailAST getParent(DetailAST node) { DetailAST result = node.getParent(); - int type = result.getType(); + var type = result.getType(); while (type == TokenTypes.MODIFIERS || type == TokenTypes.ANNOTATION) { result = result.getParent(); @@ -413,16 +413,16 @@ private static void visitMethod(DetailAST node, DetailAST parentNode) { * @return whether the AST represents a setter method. */ private static boolean isSetterMethod(DetailAST ast) { - boolean setterMethod = false; + var setterMethod = false; if (ast.getType() == TokenTypes.METHOD_DEF) { final DetailAST type = ast.findFirstToken(TokenTypes.TYPE); final String name = type.getNextSibling().getText(); - final boolean matchesSetterFormat = SETTER_PATTERN.matcher(name).matches(); - final boolean voidReturnType = type.findFirstToken(TokenTypes.LITERAL_VOID) != null; + final var matchesSetterFormat = SETTER_PATTERN.matcher(name).matches(); + final var voidReturnType = type.findFirstToken(TokenTypes.LITERAL_VOID) != null; final DetailAST params = ast.findFirstToken(TokenTypes.PARAMETERS); - final boolean singleParam = params.getChildCount(TokenTypes.PARAMETER_DEF) == 1; + final var singleParam = params.getChildCount(TokenTypes.PARAMETER_DEF) == 1; if (matchesSetterFormat && voidReturnType && singleParam) { final DetailAST slist = ast.findFirstToken(TokenTypes.SLIST); @@ -452,7 +452,7 @@ private static String getJavaDocText(DetailAST node) { } private static String makeFirstUpper(String str) { - final char ch = str.charAt(0); + final var ch = str.charAt(0); final String result; if (Character.isLowerCase(ch)) { 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 9e64ae2b3733..d5193e3b0518 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsMobileWrapperTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsMobileWrapperTest.java @@ -56,7 +56,7 @@ public void testAllCheckSectionMobileWrapper() throws Exception { final Document document = XmlUtil.getRawXml(fileName, input, input); final NodeList sources = document.getElementsByTagName("section"); - for (int position = 0; position < sources.getLength(); position++) { + for (var position = 0; position < sources.getLength(); position++) { final Node section = sources.item(position); final String sectionName = XmlUtil.getNameAttributeOfNode(section); 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 2e8ca836f58a..dbd537af04ec 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java @@ -318,10 +318,10 @@ public void testAllConfigsHaveLinkInSite() throws Exception { .replace(".xml", ".html") .replaceAll("\\\\", "/") .replaceAll("src[\\\\/]site[\\\\/]xdoc[\\\\/]", ""); - final boolean isConfigHtmlFile = Pattern.matches("config_[a-z]+.html", expectedFile); - final boolean isChecksIndexHtmlFile = "checks/index.html".equals(expectedFile); - final boolean isOldReleaseNotes = path.toString().contains("releasenotes_"); - final boolean isInnerPage = "report_issue.html".equals(expectedFile); + final var isConfigHtmlFile = Pattern.matches("config_[a-z]+.html", expectedFile); + final var isChecksIndexHtmlFile = "checks/index.html".equals(expectedFile); + final var isOldReleaseNotes = path.toString().contains("releasenotes_"); + final var isInnerPage = "report_issue.html".equals(expectedFile); if (!isConfigHtmlFile && !isChecksIndexHtmlFile && !isOldReleaseNotes && !isInnerPage) { @@ -368,7 +368,7 @@ private static void validateModulesSyncWithTheirSummaries(Path availablePagePath final Map summaries = readSummaries(availablePagePath); final NodeList subsectionSources = getTagSourcesNode(path, "subsection"); - for (int position = 0; position < subsectionSources.getLength(); position++) { + for (var position = 0; position < subsectionSources.getLength(); position++) { final Node subsection = subsectionSources.item(position); final String subsectionName = XmlUtil.getNameAttributeOfNode(subsection); if (!"Description".equals(subsectionName)) { @@ -413,7 +413,7 @@ public void testCategoryIndexPageTableInSyncWithAllChecksPageTable() throws Exce final NodeList sources = getTagSourcesNode(path, "tr"); - for (int position = 0; position < sources.getLength(); position++) { + for (var position = 0; position < sources.getLength(); position++) { final Node tableRow = sources.item(position); final Iterator cells = XmlUtil .findChildElementsByTag(tableRow, "td").iterator(); @@ -439,7 +439,7 @@ private static void validateFilterTypeIndexPage(Path availablePath) throws Exception { final NodeList tableRowSources = getTagSourcesNode(availablePath, "tr"); - for (int position = 0; position < tableRowSources.getLength(); position++) { + for (var position = 0; position < tableRowSources.getLength(); position++) { final Node tableRow = tableRowSources.item(position); final Iterator tdCells = XmlUtil .findChildElementsByTag(tableRow, "td").iterator(); @@ -489,7 +489,7 @@ private static NodeList getTagSourcesNode(Path availablePath, String tagName) public void testAlphabetOrderInNames() throws Exception { final NodeList nodes = getTagSourcesNode(SITE_PATH, "item"); - for (int nodeIndex = 0; nodeIndex < nodes.getLength(); nodeIndex++) { + for (var nodeIndex = 0; nodeIndex < nodes.getLength(); nodeIndex++) { final Node current = nodes.item(nodeIndex); if ("Checks".equals(XmlUtil.getNameAttributeOfNode(current))) { @@ -504,8 +504,8 @@ public void testAlphabetOrderInNames() throws Exception { .inOrder(); Node groupNode = current.getFirstChild(); - int index = 0; - final int totalGroups = XmlUtil.getChildrenElements(current).size(); + var index = 0; + final var totalGroups = XmlUtil.getChildrenElements(current).size(); while (index < totalGroups) { if ("item".equals(groupNode.getNodeName())) { final List checkNames = getNames(groupNode); @@ -565,7 +565,7 @@ public void testAlphabetOrderAtIndexPages() throws Exception { public static void validateOrder(Path path, String name) throws Exception { final NodeList nodes = getTagSourcesNode(path, "div"); - for (int nodeIndex = 0; nodeIndex < nodes.getLength(); nodeIndex++) { + for (var nodeIndex = 0; nodeIndex < nodes.getLength(); nodeIndex++) { final Node current = nodes.item(nodeIndex); final List names = getNamesFromIndexPage(current); final List namesSorted = names.stream() @@ -585,8 +585,8 @@ private static List getNamesFromIndexPage(Node node) { Node current = node.getFirstChild(); Node treeNode = current; - boolean getFirstChild = false; - int index = 0; + var getFirstChild = false; + var index = 0; while (current != null && index < children.size()) { if ("tr".equals(current.getNodeName())) { treeNode = current.getNextSibling(); @@ -615,7 +615,7 @@ private static List getNames(Node node) { final Set children = XmlUtil.getChildrenElements(node); final List result = new ArrayList<>(); Node current = node.getFirstChild(); - int index = 0; + var index = 0; while (index < children.size()) { if ("item".equals(current.getNodeName())) { final String name = XmlUtil.getNameAttributeOfNode(current); @@ -631,7 +631,7 @@ private static Map readSummaries(Path availablePath) throws Exce final NodeList rows = getTagSourcesNode(availablePath, "tr"); final Map result = new HashMap<>(); - for (int position = 0; position < rows.getLength(); position++) { + for (var position = 0; position < rows.getLength(); position++) { final Node row = rows.item(position); final Iterator cells = XmlUtil.findChildElementsByTag(row, "td").iterator(); final String name = XmlUtil.sanitizeXml(cells.next().getTextContent()); @@ -649,7 +649,7 @@ public void testAllSubSections() throws Exception { final String fileName = path.getFileName().toString(); final NodeList subSections = getTagSourcesNode(path, "subsection"); - for (int position = 0; position < subSections.getLength(); position++) { + for (var position = 0; position < subSections.getLength(); position++) { final Node subSection = subSections.item(position); final Node name = subSection.getAttributes().getNamedItem("name"); @@ -701,7 +701,7 @@ public void testAllXmlExamples() throws Exception { final String fileName = path.getFileName().toString(); final NodeList sources = getTagSourcesNode(path, "source"); - for (int position = 0; position < sources.getLength(); position++) { + for (var position = 0; position < sources.getLength(); position++) { final String unserializedSource = sources.item(position).getTextContent() .replace("...", "").trim(); @@ -752,7 +752,7 @@ private static String buildXml(String unserializedSource) throws IOException { } private static boolean hasFileSetClass(String xml) { - boolean found = false; + var found = false; for (String find : XML_FILESET_LIST) { if (xml.contains(find)) { @@ -819,7 +819,7 @@ public void testAllCheckSections() throws Exception { final NodeList sources = getTagSourcesNode(path, "section"); String lastSectionName = null; - for (int position = 0; position < sources.getLength(); position++) { + for (var position = 0; position < sources.getLength(); position++) { final Node section = sources.item(position); final String sectionName = XmlUtil.getNameAttributeOfNode(section); @@ -864,7 +864,7 @@ public void testAllCheckSectionsEx() throws Exception { final NodeList sources = getTagSourcesNode(path, "section"); - for (int position = 0; position < sources.getLength(); position++) { + for (var position = 0; position < sources.getLength(); position++) { final Node section = sources.item(position); final String sectionName = XmlUtil.getNameAttributeOfNode(section); @@ -887,7 +887,7 @@ private static void validateCheckSection(ModuleFactory moduleFactory, String fil throw new CheckstyleException(fileName + " couldn't find class: " + sectionName, exc); } - int subSectionPos = 0; + var subSectionPos = 0; for (Node subSection : XmlUtil.getChildrenElements(section)) { if (subSectionPos == 0 && "p".equals(subSection.getNodeName())) { validateSinceDescriptionSection(fileName, sectionName, subSection); @@ -1142,9 +1142,9 @@ else if (AbstractCheck.class.isAssignableFrom(clss)) { private static void validatePropertySectionProperties(String fileName, String sectionName, Node table, Object instance, Set properties) throws Exception { - boolean skip = true; - boolean didJavadocTokens = false; - boolean didTokens = false; + var skip = true; + var didJavadocTokens = false; + var didTokens = false; for (Node row : XmlUtil.getChildrenElements(table)) { final List columns = new ArrayList<>(XmlUtil.getChildrenElements(row)); @@ -1430,7 +1430,7 @@ else if (fieldClass == double[].class) { } } else if (fieldClass == String[].class) { - final boolean preserveOrder = hasPreserveOrderAnnotation(field); + final var preserveOrder = hasPreserveOrderAnnotation(field); result = getStringArrayPropertyValue(propertyName, value, preserveOrder); } else if (fieldClass == URI.class || fieldClass == String.class) { @@ -1483,7 +1483,7 @@ private static String getPatternArrayPropertyValue(Object fieldValue) { if (value instanceof Collection collection) { final Pattern[] newArray = new Pattern[collection.size()]; final Iterator iterator = collection.iterator(); - int index = 0; + var index = 0; while (iterator.hasNext()) { final Object next = iterator.next(); @@ -1497,7 +1497,7 @@ private static String getPatternArrayPropertyValue(Object fieldValue) { if (value != null && Array.getLength(value) > 0) { final String[] newArray = new String[Array.getLength(value)]; - for (int i = 0; i < newArray.length; i++) { + for (var i = 0; i < newArray.length; i++) { newArray[i] = ((Pattern) Array.get(value, i)).pattern(); } @@ -1747,9 +1747,9 @@ private static void validateUsageExample(String fileName, String sectionName, No .that(text) .isEmpty(); - boolean hasCheckstyle = false; - boolean hasGoogle = false; - boolean hasSun = false; + var hasCheckstyle = false; + var hasGoogle = false; + var hasSun = false; for (Node node : XmlUtil.findChildElementsByTag(subSection, "a")) { final String url = node.getAttributes().getNamedItem("href").getTextContent(); @@ -1837,7 +1837,7 @@ private static void validateParentSection(String fileName, String sectionName, private static boolean hasParentModule(String sectionName) { final String search = "\"" + sectionName + "\""; - boolean result = true; + var result = true; for (String find : XML_FILESET_LIST) { if (find.contains(search)) { @@ -1886,7 +1886,7 @@ public void testAllStyleRules() throws Exception { String lastRuleName = null; String[] lastRuleNumberParts = null; - for (int position = 0; position < sources.getLength(); position++) { + for (var position = 0; position < sources.getLength(); position++) { final Node row = sources.item(position); final List columns = new ArrayList<>( XmlUtil.findChildElementsByTag(row, "td")); @@ -1936,11 +1936,11 @@ private static String[] validateRuleNameOrder(String fileName, String lastRuleNa final String[] ruleNumberParts = ruleName.split(" ", 2)[0].split("\\."); if (lastRuleName != null) { - final int ruleNumberPartsAmount = ruleNumberParts.length; - final int lastRuleNumberPartsAmount = lastRuleNumberParts.length; + final var ruleNumberPartsAmount = ruleNumberParts.length; + final var lastRuleNumberPartsAmount = lastRuleNumberParts.length; final String outOfOrderReason = fileName + " rule '" + ruleName + "' is out of order compared to '" + lastRuleName + "'"; - boolean lastRuleNumberPartWasEqual = false; + var lastRuleNumberPartWasEqual = false; int partIndex; for (partIndex = 0; partIndex < ruleNumberPartsAmount; partIndex++) { if (lastRuleNumberPartsAmount <= partIndex) { @@ -1951,14 +1951,14 @@ private static String[] validateRuleNameOrder(String fileName, String lastRuleNa final String ruleNumberPart = ruleNumberParts[partIndex]; final String lastRuleNumberPart = lastRuleNumberParts[partIndex]; - final boolean ruleNumberPartsAreNumeric = IntStream.concat( + final var ruleNumberPartsAreNumeric = IntStream.concat( ruleNumberPart.chars(), lastRuleNumberPart.chars() ).allMatch(Character::isDigit); if (ruleNumberPartsAreNumeric) { - final int numericRuleNumberPart = parseInt(ruleNumberPart); - final int numericLastRuleNumberPart = parseInt(lastRuleNumberPart); + final var numericRuleNumberPart = parseInt(ruleNumberPart); + final var numericLastRuleNumberPart = parseInt(lastRuleNumberPart); assertWithMessage(outOfOrderReason) .that(numericRuleNumberPart) .isAtLeast(numericLastRuleNumberPart); @@ -1994,7 +1994,7 @@ private static void validateStyleAnchors(Set anchors, String fileName, Str .that(anchors) .hasSize(2); - final int space = ruleName.indexOf(' '); + final var space = ruleName.indexOf(' '); assertWithMessage( "%s rule '%s' must have have a space between the rule's number and the rule's name", fileName, ruleName) @@ -2003,7 +2003,7 @@ private static void validateStyleAnchors(Set anchors, String fileName, Str final String ruleNumber = ruleName.substring(0, space); - int position = 1; + var position = 1; for (Node anchor : anchors) { final String actualUrl; @@ -2031,7 +2031,7 @@ private static void validateStyleModules(Set checks, Set configs, Set styleChecks, String styleName, String ruleName) { final Iterator itrChecks = checks.iterator(); final Iterator itrConfigs = configs.iterator(); - final boolean isGoogleDocumentation = "google".equals(styleName); + final var isGoogleDocumentation = "google".equals(styleName); if (isGoogleDocumentation) { validateChapterWiseTesting(itrChecks, itrConfigs, styleChecks, styleName, ruleName); @@ -2051,7 +2051,7 @@ private static void validateModuleWiseTesting(Iterator itrChecks, final Node module = itrChecks.next(); final String moduleName = module.getTextContent().trim(); final String href = module.getAttributes().getNamedItem("href").getTextContent(); - final boolean moduleIsCheck = href.startsWith("checks/"); + final var moduleIsCheck = href.startsWith("checks/"); if (!moduleIsCheck) { continue; @@ -2123,14 +2123,14 @@ else if ("test".equals(configName)) { private static void validateChapterWiseTesting(Iterator itrChecks, Iterator itrSample, Set styleChecks, String styleName, String ruleName) { - boolean hasChecks = false; + var hasChecks = false; final Set usedModules = new HashSet<>(); while (itrChecks.hasNext()) { final Node module = itrChecks.next(); final String moduleName = module.getTextContent().trim(); final String href = module.getAttributes().getNamedItem("href").getTextContent(); - final boolean moduleIsCheck = href.startsWith("checks/"); + final var moduleIsCheck = href.startsWith("checks/"); final String partialConfigUrl = "https://github.com/search?q=" + "path%3Asrc%2Fmain%2Fresources%20path%3A**%2F" + styleName; @@ -2246,7 +2246,7 @@ public void testAllExampleMacrosHaveParagraphWithIdBeforeThem() throws Exception final String fileName = path.getFileName().toString(); final NodeList sources = getTagSourcesNode(path, "macro"); - for (int position = 0; position < sources.getLength(); position++) { + for (var position = 0; position < sources.getLength(); position++) { final Node macro = sources.item(position); final String macroName = macro.getAttributes() .getNamedItem("name").getTextContent(); @@ -2277,7 +2277,7 @@ private static void validatePrecedingParagraphId( String exampleName = ""; String exampleType = ""; final NodeList params = macro.getChildNodes(); - for (int paramPosition = 0; paramPosition < params.getLength(); paramPosition++) { + for (var paramPosition = 0; paramPosition < params.getLength(); paramPosition++) { final Node item = params.item(paramPosition); if (!"param".equals(item.getNodeName())) { @@ -2330,7 +2330,7 @@ public void validateExampleSectionSeparation() throws Exception { final Document doc = parseXmlToDomDocument(template); final NodeList subsectionList = doc.getElementsByTagName("subsection"); - for (int index = 0; index < subsectionList.getLength(); index++) { + for (var index = 0; index < subsectionList.getLength(); index++) { final Element subsection = (Element) subsectionList.item(index); if (!"Examples".equals(subsection.getAttribute("name"))) { continue; @@ -2338,9 +2338,9 @@ public void validateExampleSectionSeparation() throws Exception { final NodeList children = subsection.getChildNodes(); String lastExampleIdPrefix = null; - boolean separatorSeen = false; + var separatorSeen = false; - for (int childIndex = 0; childIndex < children.getLength(); childIndex++) { + for (var childIndex = 0; childIndex < children.getLength(); childIndex++) { final Node child = children.item(childIndex); if (child.getNodeType() != Node.ELEMENT_NODE) { continue; @@ -2392,7 +2392,7 @@ private static Document parseXmlToDomDocument(Path template) throws Exception { } private static String getExamplePrefix(String id) { - final int dash = id.indexOf('-'); + final var dash = id.indexOf('-'); final String result; if (dash == -1) { result = id; diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/VerifyPositionAfterLastTabFileSet.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/VerifyPositionAfterLastTabFileSet.java index 4d9ae7639a62..0d3e4c23c4ec 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/VerifyPositionAfterLastTabFileSet.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/VerifyPositionAfterLastTabFileSet.java @@ -28,9 +28,9 @@ public class VerifyPositionAfterLastTabFileSet extends AbstractFileSetCheck { @Override protected void processFiltered(File file, FileText fileText) { - int lineNumber = 0; + var lineNumber = 0; for (String line : getFileContents().getLines()) { - final int position = line.lastIndexOf('\t'); + final var position = line.lastIndexOf('\t'); lineNumber++; if (position != -1) { 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 7d280a26f490..4d34c01ac0ae 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 @@ -37,7 +37,7 @@ public String format(AuditEvent event) { final String message = event.getMessage(); // avoid StringBuffer.expandCapacity - final int bufLen = event.getFileName().length() + event.getMessage().length() + final var bufLen = event.getFileName().length() + event.getMessage().length() + LENGTH_OF_ALL_SEPARATORS; final StringBuilder sb = new StringBuilder(bufLen); 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 7b9eb97214a9..6d814cf97abf 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 @@ -125,7 +125,7 @@ private static Set getCheckStyleModulesReferencedInConfig(String configF final NodeList nodeList = document.getElementsByTagName("module"); final Set checksReferencedInCheckstyleChecksXml = new HashSet<>(); - for (int i = 0; i < nodeList.getLength(); i++) { + for (var i = 0; i < nodeList.getLength(); i++) { final Node currentNode = nodeList.item(i); if (currentNode.getNodeType() == Node.ELEMENT_NODE) { final Element module = (Element) currentNode; @@ -297,10 +297,10 @@ public static String getTokenText(int[] tokens, int... subtractions) { } else { final StringBuilder result = new StringBuilder(50); - boolean first = true; + var first = true; for (int token : tokens) { - boolean found = false; + var found = false; for (int subtraction : subtractions) { if (subtraction == token) { @@ -344,10 +344,10 @@ public static Set getTokenNameSet(int... tokens) { public static String getJavadocTokenText(int[] tokens, int... subtractions) { final StringBuilder result = new StringBuilder(50); - boolean first = true; + var first = true; for (int token : tokens) { - boolean found = false; + var found = false; for (int subtraction : subtractions) { if (subtraction == token) { 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 e512001c62c1..0962e081e63a 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 @@ -81,7 +81,7 @@ private TestUtil() { public static boolean isUtilsClassHasPrivateConstructor(final Class utilClass) throws ReflectiveOperationException { final Constructor constructor = utilClass.getDeclaredConstructor(); - final boolean result = Modifier.isPrivate(constructor.getModifiers()); + final var result = Modifier.isPrivate(constructor.getModifiers()); constructor.setAccessible(true); constructor.newInstance(); return result; @@ -266,7 +266,7 @@ public static int getJdkVersion() { * @return adjusted flush count */ public static int adjustFlushCountForOutputStreamClose(int flushCount) { - int result = flushCount; + var result = flushCount; if (getJdkVersion() >= 13) { ++result; } 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 e8d0de3806ac..2c8cd84bf74f 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 @@ -167,7 +167,7 @@ public static Set getModulesNamesWhichHaveXdoc() throws Exception { final NodeList nodeList = document.getElementsByTagName("section"); - for (int i = 0; i < nodeList.getLength(); i++) { + for (var i = 0; i < nodeList.getLength(); i++) { final Node currentNode = nodeList.item(i); if (currentNode.getNodeType() == Node.ELEMENT_NODE) { final Element module = (Element) currentNode; 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 a63da80e3f04..19a06d0de31b 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtilTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtilTest.java @@ -214,7 +214,7 @@ public void testContainsAnnotationListWithNullList() { public void testContainsAnnotationListWithEmptyList() { final DetailAST ast = new DetailAstImpl(); final Set annotations = Set.of(); - final boolean result = AnnotationUtil.containsAnnotation(ast, annotations); + final var result = AnnotationUtil.containsAnnotation(ast, annotations); assertWithMessage("An empty set should lead to a false result") .that(result) .isFalse(); @@ -227,7 +227,7 @@ public void testContainsAnnotationListWithNoAnnotationNode() { modifiersAst.setType(TokenTypes.MODIFIERS); ast.addChild(modifiersAst); final Set annotations = Set.of("Override"); - final boolean result = AnnotationUtil.containsAnnotation(ast, annotations); + final var result = AnnotationUtil.containsAnnotation(ast, annotations); assertWithMessage("An empty ast should lead to a false result") .that(result) .isFalse(); @@ -250,7 +250,7 @@ public void testContainsAnnotationListWithNoMatchingAnnotation() { ); ast.addChild(modifiersAst); final Set annotations = Set.of("Deprecated"); - final boolean result = AnnotationUtil.containsAnnotation(ast, annotations); + final var result = AnnotationUtil.containsAnnotation(ast, annotations); assertWithMessage("No matching annotation found") .that(result) .isFalse(); 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 25e8dfe97b1a..55c15d0cf5da 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/BlockCommentPositionTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/BlockCommentPositionTest.java @@ -76,7 +76,7 @@ public void testJavaDocsRecognition() throws Exception { for (BlockCommentPositionTestMetadata metadata : metadataList) { final DetailAST ast = JavaParser.parseFile(new File(getPath(metadata.getFileName())), JavaParser.Options.WITH_COMMENTS); - final int matches = getJavadocsCount(ast, metadata.getAssertion()); + final var matches = getJavadocsCount(ast, metadata.getAssertion()); assertWithMessage("Invalid javadoc count") .that(matches) .isEqualTo(metadata.getMatchesNum()); @@ -96,7 +96,7 @@ public void testJavaDocsRecognitionNonCompilable() throws Exception { final DetailAST ast = JavaParser.parseFile( new File(getPath(metadata.getFileName())), JavaParser.Options.WITH_COMMENTS); - final int matches = getJavadocsCount(ast, metadata.getAssertion()); + final var matches = getJavadocsCount(ast, metadata.getAssertion()); assertWithMessage("Invalid javadoc count") .that(matches) .isEqualTo(metadata.getMatchesNum()); @@ -105,7 +105,7 @@ public void testJavaDocsRecognitionNonCompilable() throws Exception { private static int getJavadocsCount(DetailAST detailAST, Function assertion) { - int matchFound = 0; + var matchFound = 0; DetailAST node = detailAST; while (node != null) { if (node.getType() == TokenTypes.BLOCK_COMMENT_BEGIN 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 013002a880d4..42b7cda0a3b1 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/CheckUtilTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/CheckUtilTest.java @@ -63,7 +63,7 @@ public void testIsProperUtilsClass() throws ReflectiveOperationException { @Test public void testParseDoubleWithIncorrectToken() { - final double parsedDouble = CheckUtil.parseDouble("1_02", TokenTypes.ASSIGN); + final var parsedDouble = CheckUtil.parseDouble("1_02", TokenTypes.ASSIGN); assertWithMessage("Invalid parse result") .that(parsedDouble) .isEqualTo(Double.NaN); @@ -448,7 +448,7 @@ private static DetailAST getNode(DetailAST root, int type) { @Test public void testPackageInfo() { - final boolean result = CheckUtil.isPackageInfo("/"); + final var result = CheckUtil.isPackageInfo("/"); assertWithMessage("Expected isPackageInfo() to return false for ('/')") .that(result) 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 9cb30beb3b64..d3f4c373b3db 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/CommonUtilTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/CommonUtilTest.java @@ -235,7 +235,7 @@ public void testRelativeNormalizedPathWithDenormalizedBaseDirectory() throws IOE @Test public void testPattern() { - final boolean result = CommonUtil.isPatternValid("someValidPattern"); + final var result = CommonUtil.isPatternValid("someValidPattern"); assertWithMessage("Should return true when pattern is valid") .that(result) .isTrue(); @@ -243,7 +243,7 @@ public void testPattern() { @Test public void testInvalidPattern() { - final boolean result = CommonUtil.isPatternValid("some[invalidPattern"); + final var result = CommonUtil.isPatternValid("some[invalidPattern"); assertWithMessage("Should return false when pattern is invalid") .that(result) .isFalse(); 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 c2ae45ce8af7..31c0fc1eea2f 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtilTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtilTest.java @@ -161,11 +161,11 @@ public void testInlineTagPositions() { assertWithMessage("Invalid tags size") .that(tags) .hasSize(1); - final int lineNo = tags.get(0).getLineNo(); + final var lineNo = tags.get(0).getLineNo(); assertWithMessage("Unexpected line number") .that(lineNo) .isEqualTo(0); - final int columnNo = tags.get(0).getColumnNo(); + final var columnNo = tags.get(0).getColumnNo(); assertWithMessage("Unexpected column number") .that(columnNo) .isEqualTo(10); @@ -330,7 +330,7 @@ public void testGetTokenIdThatIsUnknown() { @Test public void testGetTokenId() { - final int tokenId = JavadocUtil.getTokenId("JAVADOC_CONTENT"); + final var tokenId = JavadocUtil.getTokenId("JAVADOC_CONTENT"); assertWithMessage("Invalid token id") .that(tokenId) 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 f18379ddb9aa..ac93f89ad73a 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtilTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtilTest.java @@ -378,7 +378,7 @@ public void testisInInterfaceOrAnnotationBlock() { private static DetailAstImpl getNode(int... nodeTypes) { DetailAstImpl ast = new DetailAstImpl(); ast.setType(nodeTypes[0]); - for (int i = 1; i < nodeTypes.length; i++) { + for (var i = 1; i < nodeTypes.length; i++) { final DetailAstImpl astChild = new DetailAstImpl(); astChild.setType(nodeTypes[i]); ast.addChild(astChild); 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 47a46a045670..a13ab3555e9d 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilTest.java @@ -48,7 +48,7 @@ public void testIsProperUtilsClass() throws ReflectiveOperationException { @Test public void testGetIntFromAccessibleField() throws NoSuchFieldException { final Field field = Integer.class.getField("MAX_VALUE"); - final int maxValue = TokenUtil.getIntFromField(field, 0); + final var maxValue = TokenUtil.getIntFromField(field, 0); assertWithMessage("Invalid getIntFromField result") .that(maxValue) @@ -110,7 +110,7 @@ public void testInvertMap() { @Test public void testTokenValueIncorrect() throws IllegalAccessException { - int maxId = 0; + var maxId = 0; final Field[] fields = TokenTypes.class.getDeclaredFields(); for (final Field field : fields) { // Only process the int declarations. @@ -119,13 +119,13 @@ public void testTokenValueIncorrect() throws IllegalAccessException { } final String name = field.getName(); - final int id = field.getInt(name); + final var id = field.getInt(name); if (id > maxId) { maxId = id; } } - final int nextAfterMaxId = maxId + 1; + final var nextAfterMaxId = maxId + 1; try { TokenUtil.getTokenName(nextAfterMaxId); assertWithMessage("IllegalArgumentException is expected").fail(); @@ -147,7 +147,7 @@ public void testTokenValueCorrect() throws IllegalAccessException { } final String name = field.getName(); - final int id = field.getInt(name); + final var id = field.getInt(name); assertWithMessage("Invalid token name") .that(TokenUtil.getTokenName(id)) @@ -157,7 +157,7 @@ public void testTokenValueCorrect() throws IllegalAccessException { @Test public void testTokenValueIncorrect2() { - final int id = 0; + final var id = 0; try { TokenUtil.getTokenName(id); assertWithMessage("IllegalArgumentException is expected").fail(); @@ -224,7 +224,7 @@ public void testIsCommentType() { @Test public void testGetTokenTypesTotalNumber() { - final int tokenTypesTotalNumber = TokenUtil.getTokenTypesTotalNumber(); + final var tokenTypesTotalNumber = TokenUtil.getTokenTypesTotalNumber(); assertWithMessage("Invalid token total number") .that(tokenTypesTotalNumber) @@ -234,7 +234,7 @@ public void testGetTokenTypesTotalNumber() { @Test public void testGetAllTokenIds() { final int[] allTokenIds = TokenUtil.getAllTokenIds(); - final int sum = Arrays.stream(allTokenIds).sum(); + final var sum = Arrays.stream(allTokenIds).sum(); assertWithMessage("Invalid token length") .that(allTokenIds.length) @@ -246,7 +246,7 @@ public void testGetAllTokenIds() { @Test public void testGetTokenNameWithGreatestPossibleId() { - final int id = TokenTypes.COMMENT_CONTENT; + final var id = TokenTypes.COMMENT_CONTENT; final String tokenName = TokenUtil.getTokenName(id); assertWithMessage("Invalid token name") @@ -342,12 +342,12 @@ public void testIsTypeDeclaration() { @Test public void testIsOfTypeTrue() { - final int type = TokenTypes.LITERAL_CATCH; + final var type = TokenTypes.LITERAL_CATCH; final DetailAstImpl astForTest = new DetailAstImpl(); astForTest.setType(type); - final boolean result1 = TokenUtil.isOfType(type, TokenTypes.LITERAL_FOR, + final var result1 = TokenUtil.isOfType(type, TokenTypes.LITERAL_FOR, TokenTypes.LITERAL_IF, TokenTypes.LITERAL_CATCH); - final boolean result2 = TokenUtil.isOfType(astForTest, TokenTypes.LITERAL_FOR, + final var result2 = TokenUtil.isOfType(astForTest, TokenTypes.LITERAL_FOR, TokenTypes.LITERAL_IF, TokenTypes.LITERAL_CATCH); assertWithMessage("Token type did not match") @@ -360,15 +360,15 @@ public void testIsOfTypeTrue() { @Test public void testIsOfTypeFalse() { - final int type = TokenTypes.LITERAL_CATCH; + final var type = TokenTypes.LITERAL_CATCH; final DetailAstImpl astForTest1 = new DetailAstImpl(); final DetailAstImpl astForTest2 = null; astForTest1.setType(type); - final boolean result1 = TokenUtil.isOfType(type, TokenTypes.LITERAL_FOR, + final var result1 = TokenUtil.isOfType(type, TokenTypes.LITERAL_FOR, TokenTypes.LITERAL_IF, TokenTypes.LITERAL_ELSE); - final boolean result2 = TokenUtil.isOfType(astForTest1, TokenTypes.LITERAL_FOR, + final var result2 = TokenUtil.isOfType(astForTest1, TokenTypes.LITERAL_FOR, TokenTypes.LITERAL_IF, TokenTypes.LITERAL_ELSE); - final boolean result3 = TokenUtil.isOfType(astForTest2, TokenTypes.LITERAL_FOR, + final var result3 = TokenUtil.isOfType(astForTest2, TokenTypes.LITERAL_FOR, TokenTypes.LITERAL_IF, TokenTypes.LITERAL_ELSE); assertWithMessage("Token type should not match") 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 af0f609f0c38..018fb2e34511 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/ElementNodeTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/ElementNodeTest.java @@ -104,7 +104,7 @@ public void testSiblingsOrdering() { public void testCompareOrderWrongInstance() throws Exception { final String xpath = "//OBJBLOCK"; final List nodes = getXpathItems(xpath, rootNode); - final int result = nodes.get(0).compareOrder(null); + final var result = nodes.get(0).compareOrder(null); assertWithMessage("Expected result wrong") .that(result) .isEqualTo(0); @@ -146,7 +146,7 @@ public void testGetNodeByValueNumInt() throws Exception { assertWithMessage("Invalid number of nodes") .that(nodes) .hasSize(1); - final int tokenType = ((AbstractNode) nodes.get(0)).getTokenType(); + final var tokenType = ((AbstractNode) nodes.get(0)).getTokenType(); assertWithMessage("Invalid token type") .that(tokenType) .isEqualTo(TokenTypes.NUM_INT); @@ -159,7 +159,7 @@ public void testGetNodeByValueStringLiteral() throws Exception { assertWithMessage("Invalid number of nodes") .that(nodes) .hasSize(2); - final int tokenType = ((AbstractNode) nodes.get(0)).getTokenType(); + final var tokenType = ((AbstractNode) nodes.get(0)).getTokenType(); assertWithMessage("Invalid token type") .that(tokenType) .isEqualTo(TokenTypes.STRING_LITERAL); 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 31d7f61bb0c4..5bc857144553 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathMapperTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathMapperTest.java @@ -45,7 +45,7 @@ public void testNodeOrdering() throws Exception { final String xpath = "//METHOD_DEF/SLIST/*"; final RootNode rootNode = getRootNode("InputXpathMapperAst.java"); final List nodes = getXpathItems(xpath, rootNode); - for (int i = 1; i < nodes.size(); i++) { + for (var i = 1; i < nodes.size(); i++) { final NodeInfo curr = nodes.get(i); final NodeInfo prev = nodes.get(i - 1); @@ -1258,7 +1258,7 @@ private RootNode getRootNodeWithComments(String fileName) throws Exception { private static DetailAST[] convertToArray(List nodes) { final DetailAST[] result = new DetailAST[nodes.size()]; - for (int i = 0; i < nodes.size(); i++) { + for (var i = 0; i < nodes.size(); i++) { final ElementNode abstractNode = (ElementNode) nodes.get(i); result[i] = abstractNode.getUnderlyingNode(); } 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 2ef30c441697..fd3acad7b77d 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGeneratorTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGeneratorTest.java @@ -62,8 +62,8 @@ public void init() throws Exception { @Test public void testClassDef() { - final int lineNumber = 12; - final int columnNumber = 1; + final var lineNumber = 12; + final var columnNumber = 1; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -79,8 +79,8 @@ public void testClassDef() { @Test public void testMethodDef() { - final int lineNumber = 45; - final int columnNumber = 5; + final var lineNumber = 45; + final var columnNumber = 5; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -98,8 +98,8 @@ public void testMethodDef() { @Test public void testVariableDef() { - final int lineNumber = 53; - final int columnNumber = 13; + final var lineNumber = 53; + final var columnNumber = 13; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -127,8 +127,8 @@ public void testVariableDef() { @Test public void testLcurly() { - final int lineNumber = 37; - final int columnNumber = 20; + final var lineNumber = 37; + final var columnNumber = 20; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -142,8 +142,8 @@ public void testLcurly() { @Test public void testRcurly() { - final int lineNumber = 25; - final int columnNumber = 5; + final var lineNumber = 25; + final var columnNumber = 5; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -157,8 +157,8 @@ public void testRcurly() { @Test public void testExpr() { - final int lineNumber = 17; - final int columnNumber = 50; + final var lineNumber = 17; + final var columnNumber = 50; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -174,8 +174,8 @@ public void testExpr() { @Test public void testLparen() { - final int lineNumber = 45; - final int columnNumber = 31; + final var lineNumber = 45; + final var columnNumber = 31; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -189,8 +189,8 @@ public void testLparen() { @Test public void testEmpty() { - final int lineNumber = 300; - final int columnNumber = 300; + final var lineNumber = 300; + final var columnNumber = 300; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -201,8 +201,8 @@ public void testEmpty() { @Test public void testPackage() { - final int lineNumber = 2; - final int columnNumber = 1; + final var lineNumber = 2; + final var columnNumber = 1; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -216,8 +216,8 @@ public void testPackage() { @Test public void testImport() { - final int lineNumber = 5; - final int columnNumber = 1; + final var lineNumber = 5; + final var columnNumber = 1; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -230,8 +230,8 @@ public void testImport() { @Test public void testMethodParams() { - final int lineNumber = 72; - final int columnNumber = 30; + final var lineNumber = 72; + final var columnNumber = 30; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -261,8 +261,8 @@ public void testMethodParams() { @Test public void testSwitch() { - final int lineNumber = 37; - final int columnNumber = 9; + final var lineNumber = 37; + final var columnNumber = 9; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -276,8 +276,8 @@ public void testSwitch() { @Test public void testSwitchCase() { - final int lineNumber = 38; - final int columnNumber = 13; + final var lineNumber = 38; + final var columnNumber = 13; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -295,8 +295,8 @@ public void testSwitchCase() { @Test public void testVariableStringLiteral() { - final int lineNumber = 47; - final int columnNumber = 26; + final var lineNumber = 47; + final var columnNumber = 26; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -316,8 +316,8 @@ public void testVariableStringLiteral() { @Test public void testComma() { - final int lineNumber = 66; - final int columnNumber = 36; + final var lineNumber = 66; + final var columnNumber = 36; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -332,8 +332,8 @@ public void testComma() { @Test public void testLiteralVoid() { - final int lineNumber = 65; - final int columnNumber = 12; + final var lineNumber = 65; + final var columnNumber = 12; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -349,8 +349,8 @@ public void testLiteralVoid() { @Test public void testFirstImport() { - final int lineNumber = 4; - final int columnNumber = 1; + final var lineNumber = 4; + final var columnNumber = 1; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -363,8 +363,8 @@ public void testFirstImport() { @Test public void testLastImport() { - final int lineNumber = 8; - final int columnNumber = 1; + final var lineNumber = 8; + final var columnNumber = 1; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -377,8 +377,8 @@ public void testLastImport() { @Test public void testImportByText() { - final int lineNumber = 4; - final int columnNumber = 8; + final var lineNumber = 4; + final var columnNumber = 8; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -391,8 +391,8 @@ public void testImportByText() { @Test public void testIdent() { - final int lineNumber = 12; - final int columnNumber = 14; + final var lineNumber = 12; + final var columnNumber = 14; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -411,9 +411,9 @@ public void testTabWidthBeforeMethodDef() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final int lineNumber = 4; - final int columnNumber = 13; - final int tabWidth = 4; + final var lineNumber = 4; + final var columnNumber = 13; + final var tabWidth = 4; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(detailAst, lineNumber, columnNumber, testFileText, tabWidth); final List actual = queryGenerator.generate(); @@ -440,9 +440,9 @@ public void testTabWidthAfterVoidLiteral() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final int lineNumber = 8; - final int columnNumber = 41; - final int tabWidth = 8; + final var lineNumber = 8; + final var columnNumber = 41; + final var tabWidth = 8; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(detailAst, lineNumber, columnNumber, testFileText, tabWidth); final List actual = queryGenerator.generate(); @@ -465,9 +465,9 @@ public void testTabWidthBeforeSlist() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final int lineNumber = 12; - final int columnNumber = 57; - final int tabWidth = 8; + final var lineNumber = 12; + final var columnNumber = 57; + final var tabWidth = 8; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(detailAst, lineNumber, columnNumber, testFileText, tabWidth); final List actual = queryGenerator.generate(); @@ -487,9 +487,9 @@ public void testTabWidthEndOfLine() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final int lineNumber = 16; - final int columnNumber = 58; - final int tabWidth = 8; + final var lineNumber = 16; + final var columnNumber = 58; + final var tabWidth = 8; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(detailAst, lineNumber, columnNumber, testFileText, tabWidth); final List actual = queryGenerator.generate(); @@ -503,8 +503,8 @@ public void testTabWidthEndOfLine() throws Exception { @Test public void testClassDefWithTokenType() { - final int lineNumber = 12; - final int columnNumber = 1; + final var lineNumber = 12; + final var columnNumber = 1; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, TokenTypes.CLASS_DEF, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -541,10 +541,10 @@ public void testEscapeCharacters() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final int tabWidth = 8; + final var tabWidth = 8; - final int lineNumberOne = 4; - final int columnNumberOne = 22; + final var lineNumberOne = 4; + final var columnNumberOne = 22; final XpathQueryGenerator queryGeneratorOne = new XpathQueryGenerator(detailAst, lineNumberOne, columnNumberOne, testFileText, tabWidth); final List actualTestOne = queryGeneratorOne.generate(); @@ -564,8 +564,8 @@ public void testEscapeCharacters() throws Exception { .that(actualTestOne) .isEqualTo(expectedTestOne); - final int lineNumberTwo = 6; - final int columnNumberTwo = 22; + final var lineNumberTwo = 6; + final var columnNumberTwo = 22; final XpathQueryGenerator queryGeneratorTwo = new XpathQueryGenerator(detailAst, lineNumberTwo, columnNumberTwo, testFileText, tabWidth); final List actualTestTwo = queryGeneratorTwo.generate(); @@ -592,10 +592,10 @@ public void testTextBlocks() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final int tabWidth = 8; + final var tabWidth = 8; - final int lineNumber = 6; - final int columnNumber = 25; + final var lineNumber = 6; + final var columnNumber = 25; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(detailAst, lineNumber, columnNumber, testFileText, tabWidth); final List actual = queryGenerator.generate(); @@ -619,10 +619,10 @@ public void testTextBlocksWithNewLine() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final int tabWidth = 8; + final var tabWidth = 8; - final int lineNumber = 6; - final int columnNumber = 25; + final var lineNumber = 6; + final var columnNumber = 25; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(detailAst, lineNumber, columnNumber, testFileText, tabWidth); final List actual = queryGenerator.generate(); @@ -646,10 +646,10 @@ public void testTextBlocksWithNewCrlf() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final int tabWidth = 8; + final var tabWidth = 8; - final int lineNumber = 6; - final int columnNumber = 25; + final var lineNumber = 6; + final var columnNumber = 25; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(detailAst, lineNumber, columnNumber, testFileText, tabWidth); final List actual = queryGenerator.generate(); @@ -674,10 +674,10 @@ public void testXpath() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final int tabWidth = 8; + final var tabWidth = 8; - final int lineNumberOne = 7; - final int columnNumberOne = 12; + final var lineNumberOne = 7; + final var columnNumberOne = 12; final XpathQueryGenerator queryGeneratorOne = new XpathQueryGenerator(detailAst, lineNumberOne, columnNumberOne, testFileText, tabWidth); final List actualTestOne = queryGeneratorOne.generate(); @@ -699,10 +699,10 @@ public void testXpath2() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final int tabWidth = 8; + final var tabWidth = 8; - final int lineNumber3 = 13; - final int columnNumber3 = 21; + final var lineNumber3 = 13; + final var columnNumber3 = 21; final XpathQueryGenerator queryGenerator3 = new XpathQueryGenerator(detailAst, lineNumber3, columnNumber3, testFileText, tabWidth); final List actualTest3 = queryGenerator3.generate(); @@ -723,10 +723,10 @@ public void testXpath3() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final int tabWidth = 8; + final var tabWidth = 8; - final int lineNumber2 = 10; - final int columnNumber2 = 17; + final var lineNumber2 = 10; + final var columnNumber2 = 17; final XpathQueryGenerator queryGenerator2 = new XpathQueryGenerator(detailAst, lineNumber2, columnNumber2, testFileText, tabWidth); final List actualTest = queryGenerator2.generate(); 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 fdf2fc68cbc2..a277df5e78a9 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 @@ -40,7 +40,7 @@ public void testCorrectOrder() { new TestNode()); try (ReverseListIterator iterator = new ReverseListIterator(nodes)) { - for (int i = nodes.size() - 1; i >= 0; i--) { + for (var i = nodes.size() - 1; i >= 0; i--) { assertWithMessage("Invalid node") .that(iterator.next()) .isEqualTo(nodes.get(i)); From 9a8449069ca7cad273d3c9841a3ff58b9829fb1a Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Fri, 26 Dec 2025 15:34:58 +0100 Subject: [PATCH 2/4] Issue #17487: Add `sanity` CI job #18157 --- config/rewrite.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/rewrite.yml b/config/rewrite.yml index 9fdaebd847f4..58250c5072db 100644 --- a/config/rewrite.yml +++ b/config/rewrite.yml @@ -9,12 +9,8 @@ recipeList: # configurationPath: "config/checkstyle-checks.xml" # propertiesPath: "config/openrewrite-recipes-checkstyle.properties" - org.openrewrite.java.RemoveUnusedImports - # - org.openrewrite.java.migrate.lang.var.UseVarForGenericsConstructors - - org.openrewrite.java.migrate.lang.var.UseVarForPrimitive # - org.openrewrite.staticanalysis.NoDoubleBraceInitialization fixme: important! # - org.openrewrite.gradle.UpdateGradleWrapper - # - org.openrewrite.java.migrate.lang.var.UseVarForGenericMethodInvocations # bug - # - org.openrewrite.java.migrate.lang.var.UseVarForObject # bug # - org.openrewrite.java.testing.junit.JupiterBestPractices # - org.openrewrite.java.testing.junit5.CleanupAssertions - org.openrewrite.java.format.NormalizeFormat From 5e57b7e45a6f1a8b16dcdc4d7b4f00492af03779 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Fri, 26 Dec 2025 15:35:30 +0100 Subject: [PATCH 3/4] Issue #17487: Add `sanity` CI job #18157 --- config/rewrite.yml | 5 +- .../base/AbstractIndentationTestSupport.java | 20 +-- .../base/AbstractItModuleTestSupport.java | 14 +- .../AbstractXpathTestSupport.java | 4 +- .../XpathRegressionAnonInnerLengthTest.java | 3 +- .../checkstyle/AstTreeStringPrinter.java | 2 +- .../AuditEventDefaultFormatter.java | 4 +- .../puppycrawl/tools/checkstyle/Checker.java | 8 +- ...SuppressionFileGeneratorAuditListener.java | 4 +- .../tools/checkstyle/ConfigurationLoader.java | 10 +- .../tools/checkstyle/DetailAstImpl.java | 10 +- .../DetailNodeTreeStringPrinter.java | 2 +- .../tools/checkstyle/JavaAstVisitor.java | 18 +- .../checkstyle/JavadocCommentsAstVisitor.java | 8 +- .../checkstyle/JavadocDetailNodeParser.java | 8 +- .../JavadocPropertiesGenerator.java | 6 +- .../com/puppycrawl/tools/checkstyle/Main.java | 16 +- .../tools/checkstyle/PropertyCacheFile.java | 4 +- .../tools/checkstyle/SarifLogger.java | 10 +- .../checkstyle/SuppressionsStringPrinter.java | 4 +- .../tools/checkstyle/TreeWalker.java | 6 +- .../tools/checkstyle/XMLLogger.java | 10 +- .../tools/checkstyle/XmlLoader.java | 2 +- .../tools/checkstyle/api/AbstractCheck.java | 4 +- .../checkstyle/api/AbstractFileSetCheck.java | 4 +- .../api/AbstractViolationReporter.java | 2 +- .../api/BeforeExecutionFileFilterSet.java | 2 +- .../tools/checkstyle/api/Comment.java | 10 +- .../tools/checkstyle/api/FileContents.java | 12 +- .../tools/checkstyle/api/FileText.java | 10 +- .../tools/checkstyle/api/FilterSet.java | 2 +- .../tools/checkstyle/api/FullIdent.java | 14 +- .../checks/ArrayTypeStyleCheck.java | 8 +- .../AvoidEscapedUnicodeCharactersCheck.java | 10 +- .../checks/DescendantTokenCheck.java | 12 +- .../checks/FinalParametersCheck.java | 2 +- .../checks/NewlineAtEndOfFileCheck.java | 4 +- .../checks/OrderedPropertiesCheck.java | 10 +- .../checks/SuppressWarningsHolder.java | 28 ++-- .../checkstyle/checks/TranslationCheck.java | 4 +- .../checks/UncommentedMainCheck.java | 4 +- .../checks/UniquePropertiesCheck.java | 6 +- .../annotation/AnnotationUseStyleCheck.java | 4 +- .../annotation/MissingDeprecatedCheck.java | 8 +- .../annotation/MissingOverrideCheck.java | 4 +- .../annotation/PackageAnnotationCheck.java | 2 +- .../checks/blocks/EmptyBlockCheck.java | 16 +- .../checks/blocks/EmptyCatchBlockCheck.java | 6 +- .../checks/blocks/NeedBracesCheck.java | 12 +- .../checks/blocks/RightCurlyCheck.java | 10 +- .../checks/coding/AbstractSuperCheck.java | 6 +- .../AvoidDoubleBraceInitializationCheck.java | 2 +- .../checks/coding/DefaultComesLastCheck.java | 2 +- .../checks/coding/EqualsAvoidNullCheck.java | 12 +- .../coding/ExplicitInitializationCheck.java | 6 +- .../checks/coding/FallThroughCheck.java | 10 +- .../coding/FinalLocalVariableCheck.java | 16 +- .../coding/IllegalInstantiationCheck.java | 4 +- .../coding/MissingNullCaseInSwitchCheck.java | 10 +- .../coding/MultipleStringLiteralsCheck.java | 6 +- .../MultipleVariableDeclarationsCheck.java | 2 +- .../checks/coding/NoFinalizerCheck.java | 2 +- .../coding/OneStatementPerLineCheck.java | 4 +- .../OverloadMethodsDeclarationOrderCheck.java | 10 +- .../coding/PackageDeclarationCheck.java | 2 +- .../coding/ParameterAssignmentCheck.java | 4 +- .../checks/coding/RequireThisCheck.java | 38 ++--- .../checks/coding/ReturnCountCheck.java | 2 +- .../TextBlockGoogleStyleFormattingCheck.java | 4 +- ...necessaryNullCheckWithInstanceOfCheck.java | 2 +- ...edLambdaParameterShouldBeUnnamedCheck.java | 2 +- .../coding/UnusedLocalVariableCheck.java | 30 ++-- ...VariableDeclarationUsageDistanceCheck.java | 24 +-- .../checks/coding/WhenShouldBeUsedCheck.java | 8 +- .../checks/design/FinalClassCheck.java | 14 +- .../checks/design/InterfaceIsTypeCheck.java | 2 +- .../checks/design/MutableExceptionCheck.java | 2 +- .../checks/design/OneTopLevelClassCheck.java | 2 +- .../SealedShouldHavePermitsListCheck.java | 4 +- .../checks/design/ThrowsCountCheck.java | 4 +- .../design/VisibilityModifierCheck.java | 10 +- .../checkstyle/checks/header/HeaderCheck.java | 2 +- .../header/MultiFileRegexpHeaderCheck.java | 6 +- .../checks/header/RegexpHeaderCheck.java | 10 +- .../imports/AvoidStaticImportCheck.java | 4 +- .../checks/imports/IllegalImportCheck.java | 4 +- .../checks/imports/ImportControlLoader.java | 14 +- .../checks/imports/ImportOrderCheck.java | 28 ++-- .../checks/imports/PkgImportControl.java | 2 +- .../checks/imports/RedundantImportCheck.java | 2 +- .../checks/imports/UnusedImportsCheck.java | 34 ++-- .../AbstractExpressionHandler.java | 26 +-- .../AnnotationArrayInitHandler.java | 12 +- .../checks/indentation/ArrayInitHandler.java | 14 +- .../indentation/BlockParentHandler.java | 4 +- .../checks/indentation/ClassDefHandler.java | 4 +- .../indentation/CommentsIndentationCheck.java | 26 +-- .../checks/indentation/HandlerFactory.java | 2 +- .../checks/indentation/ImportHandler.java | 2 +- .../checks/indentation/IndentLevel.java | 4 +- .../checks/indentation/LambdaHandler.java | 12 +- .../indentation/LineWrappingHandler.java | 22 +-- .../checks/indentation/MemberDefHandler.java | 2 +- .../checks/indentation/MethodCallHandler.java | 4 +- .../checks/indentation/MethodDefHandler.java | 2 +- .../checks/indentation/NewHandler.java | 10 +- .../checks/indentation/PackageDefHandler.java | 2 +- .../checks/indentation/SlistHandler.java | 2 +- .../checks/indentation/SwitchHandler.java | 6 +- .../checks/indentation/TryHandler.java | 4 +- .../checks/indentation/YieldHandler.java | 2 +- .../checks/javadoc/AbstractJavadocCheck.java | 4 +- .../checks/javadoc/AtclauseOrderCheck.java | 8 +- .../checkstyle/checks/javadoc/HtmlTag.java | 4 +- .../javadoc/JavadocBlockTagLocationCheck.java | 2 +- .../javadoc/JavadocContentLocationCheck.java | 10 +- .../JavadocLeadingAsteriskAlignCheck.java | 2 +- .../checks/javadoc/JavadocMethodCheck.java | 34 ++-- .../JavadocMissingLeadingAsteriskCheck.java | 2 +- ...ocMissingWhitespaceAfterAsteriskCheck.java | 6 +- .../checks/javadoc/JavadocPackageCheck.java | 2 +- .../checks/javadoc/JavadocParagraphCheck.java | 6 +- .../checks/javadoc/JavadocStyleCheck.java | 16 +- ...avadocTagContinuationIndentationCheck.java | 6 +- .../checks/javadoc/JavadocTagInfo.java | 38 ++--- .../checks/javadoc/JavadocTypeCheck.java | 10 +- .../checks/javadoc/JavadocVariableCheck.java | 2 +- .../javadoc/MissingJavadocPackageCheck.java | 4 +- .../javadoc/MissingJavadocTypeCheck.java | 2 +- ...uireEmptyLineBeforeBlockTagGroupCheck.java | 4 +- .../javadoc/SingleLineJavadocCheck.java | 2 +- .../checks/javadoc/SummaryJavadocCheck.java | 14 +- .../checkstyle/checks/javadoc/TagParser.java | 16 +- .../checks/javadoc/WriteTagCheck.java | 6 +- .../checks/javadoc/utils/BlockTagUtil.java | 10 +- .../checks/javadoc/utils/InlineTagUtil.java | 2 +- .../metrics/AbstractClassCouplingCheck.java | 8 +- .../BooleanExpressionComplexityCheck.java | 2 +- .../checks/metrics/JavaNCSSCheck.java | 22 +-- .../checks/metrics/NPathComplexityCheck.java | 26 +-- .../checks/modifier/ModifierOrderCheck.java | 8 +- .../naming/AbbreviationAsWordInNameCheck.java | 20 +-- .../AbstractAccessControlNameCheck.java | 8 +- .../checks/naming/ConstantNameCheck.java | 4 +- .../naming/LambdaParameterNameCheck.java | 2 +- .../naming/LocalFinalVariableNameCheck.java | 2 +- .../checks/naming/LocalVariableNameCheck.java | 4 +- .../checks/naming/MemberNameCheck.java | 2 +- .../checks/naming/ParameterNameCheck.java | 4 +- .../naming/StaticVariableNameCheck.java | 4 +- .../checks/regexp/DetectorOptions.java | 2 +- .../checks/regexp/MultilineDetector.java | 2 +- .../checkstyle/checks/regexp/RegexpCheck.java | 16 +- .../checks/regexp/RegexpOnFilenameCheck.java | 2 +- .../checks/regexp/SinglelineDetector.java | 10 +- .../checks/sizes/AnonInnerLengthCheck.java | 2 +- .../sizes/ExecutableStatementCountCheck.java | 2 +- .../checks/sizes/LambdaBodyLengthCheck.java | 2 +- .../checks/sizes/MethodLengthCheck.java | 8 +- .../checks/sizes/ParameterNumberCheck.java | 2 +- .../sizes/RecordComponentNumberCheck.java | 2 +- .../whitespace/AbstractParenPadCheck.java | 8 +- .../whitespace/EmptyLineSeparatorCheck.java | 40 ++--- .../whitespace/FileTabCharacterCheck.java | 6 +- .../whitespace/GenericWhitespaceCheck.java | 16 +- .../whitespace/MethodParamPadCheck.java | 2 +- .../whitespace/NoWhitespaceAfterCheck.java | 12 +- ...WhitespaceBeforeCaseDefaultColonCheck.java | 2 +- .../whitespace/NoWhitespaceBeforeCheck.java | 8 +- .../checks/whitespace/OperatorWrapCheck.java | 2 +- .../checks/whitespace/ParenPadCheck.java | 6 +- .../checks/whitespace/SeparatorWrapCheck.java | 8 +- .../whitespace/WhitespaceAfterCheck.java | 6 +- .../checkstyle/filters/CsvFilterElement.java | 10 +- .../filters/SeverityMatchFilter.java | 2 +- .../SuppressWithNearbyCommentFilter.java | 16 +- .../filters/SuppressWithNearbyTextFilter.java | 12 +- .../SuppressWithPlainTextCommentFilter.java | 8 +- .../filters/SuppressionCommentFilter.java | 12 +- .../filters/SuppressionXpathFilter.java | 2 +- .../grammar/CrAwareLexerSimulator.java | 4 +- .../tools/checkstyle/gui/BaseCellEditor.java | 4 +- .../gui/ListToTreeSelectionModelWrapper.java | 6 +- .../tools/checkstyle/gui/MainFrame.java | 4 +- .../checkstyle/gui/ParseTreeTableModel.java | 2 +- .../gui/ParseTreeTablePresentation.java | 10 +- .../tools/checkstyle/gui/TreeTable.java | 18 +- .../tools/checkstyle/meta/XmlMetaReader.java | 10 +- .../tools/checkstyle/meta/XmlMetaWriter.java | 2 +- .../checkstyle/site/AllCheckSummaries.java | 24 +-- ...assAndPropertiesSettersJavadocScraper.java | 4 +- .../tools/checkstyle/site/ExampleMacro.java | 2 +- .../site/ModuleJavadocParsingUtil.java | 8 +- .../checkstyle/site/PropertiesMacro.java | 2 +- .../tools/checkstyle/site/SiteUtil.java | 12 +- .../checkstyle/utils/AnnotationUtil.java | 2 +- .../utils/BlockCommentPosition.java | 4 +- .../checkstyle/utils/ChainedPropertyUtil.java | 4 +- .../tools/checkstyle/utils/CheckUtil.java | 24 +-- .../tools/checkstyle/utils/CodePointUtil.java | 4 +- .../tools/checkstyle/utils/CommonUtil.java | 40 ++--- .../tools/checkstyle/utils/JavadocUtil.java | 14 +- .../utils/ModuleReflectionUtil.java | 2 +- .../tools/checkstyle/utils/ParserUtil.java | 10 +- .../tools/checkstyle/utils/ScopeUtil.java | 10 +- .../tools/checkstyle/utils/TokenUtil.java | 6 +- .../tools/checkstyle/utils/XpathUtil.java | 4 +- .../checkstyle/xpath/AbstractElementNode.java | 6 +- .../checkstyle/xpath/XpathQueryGenerator.java | 4 +- .../checkstyle/AbstractGuiTestSupport.java | 2 +- .../checkstyle/AbstractModuleTestSupport.java | 6 +- .../checkstyle/AbstractXmlTestSupport.java | 4 +- .../tools/checkstyle/CheckerTest.java | 34 ++-- .../checkstyle/ConfigurationLoaderTest.java | 10 +- .../tools/checkstyle/DefaultLoggerTest.java | 4 +- .../tools/checkstyle/DetailAstImplTest.java | 24 +-- ...TrailingCommentsVerticalAlignmentTest.java | 10 +- .../tools/checkstyle/JavaAstVisitorTest.java | 4 +- .../JavadocPropertiesGeneratorTest.java | 10 +- .../puppycrawl/tools/checkstyle/MainTest.java | 8 +- .../checkstyle/PropertyCacheFileTest.java | 6 +- .../tools/checkstyle/SarifLoggerTest.java | 4 +- .../SuppressionsStringPrinterTest.java | 10 +- .../tools/checkstyle/TreeWalkerTest.java | 8 +- .../tools/checkstyle/XMLLoggerTest.java | 4 +- .../checkstyle/ant/CheckstyleAntTaskTest.java | 20 +-- .../checkstyle/api/AbstractCheckTest.java | 2 +- .../tools/checkstyle/api/LineColumnTest.java | 10 +- .../tools/checkstyle/api/ViolationTest.java | 4 +- .../checkstyle/bdd/InlineConfigParser.java | 60 +++---- ...voidEscapedUnicodeCharactersCheckTest.java | 8 +- .../checks/coding/HiddenFieldCheckTest.java | 2 +- .../coding/IllegalTokenTextCheckTest.java | 2 +- ...ableDeclarationUsageDistanceCheckTest.java | 4 +- .../checks/design/FinalClassCheckTest.java | 2 +- .../design/VisibilityModifierCheckTest.java | 2 +- .../imports/ImportControlLoaderTest.java | 2 +- .../indentation/IndentationCheckTest.java | 28 ++-- .../checks/javadoc/JavadocNodeImplTest.java | 2 +- .../checks/javadoc/WriteTagCheckTest.java | 8 +- .../BooleanExpressionComplexityCheckTest.java | 4 +- ...ClassDataAbstractionCouplingCheckTest.java | 2 +- .../CyclomaticComplexityCheckTest.java | 2 +- .../metrics/NPathComplexityCheckTest.java | 6 +- .../AbbreviationAsWordInNameCheckTest.java | 48 +++--- .../regexp/RegexpMultilineCheckTest.java | 2 +- .../ExecutableStatementCountCheckTest.java | 4 +- .../checks/sizes/MethodCountCheckTest.java | 2 +- .../checks/sizes/MethodLengthCheckTest.java | 8 +- .../sizes/OuterTypeNumberCheckTest.java | 2 +- .../sizes/RecordComponentNumberCheckTest.java | 12 +- .../SuppressWithNearbyTextFilterTest.java | 22 +-- ...uppressWithPlainTextCommentFilterTest.java | 2 +- .../filters/SuppressionCommentFilterTest.java | 12 +- .../filters/SuppressionFilterTest.java | 26 +-- .../filters/SuppressionXpathFilterTest.java | 8 +- .../filters/SuppressionsLoaderTest.java | 6 +- .../grammar/GeneratedJavaTokenTypesTest.java | 8 +- ...eneratedJavadocCommentsTokenTypesTest.java | 4 +- .../gui/CodeSelectorPresentationTest.java | 6 +- .../checkstyle/gui/MainFrameModelTest.java | 2 +- .../tools/checkstyle/gui/MainTest.java | 4 +- .../gui/ParseTreeTableModelTest.java | 44 ++--- .../gui/ParseTreeTablePresentationTest.java | 44 ++--- .../checkstyle/internal/AllChecksTest.java | 2 +- .../checkstyle/internal/AllTestsTest.java | 18 +- .../internal/CommitValidationTest.java | 4 +- .../checkstyle/internal/ImmutabilityTest.java | 4 +- .../internal/XdocsCategoryIndexTest.java | 14 +- .../XdocsExamplesAstConsistencyTest.java | 22 +-- .../internal/XdocsJavaDocsTest.java | 30 ++-- .../internal/XdocsMobileWrapperTest.java | 2 +- .../checkstyle/internal/XdocsPagesTest.java | 100 ++++++------ .../VerifyPositionAfterLastTabFileSet.java | 4 +- .../internal/utils/AuditEventUtFormatter.java | 2 +- .../checkstyle/internal/utils/CheckUtil.java | 10 +- .../checkstyle/internal/utils/TestUtil.java | 4 +- .../checkstyle/internal/utils/XdocUtil.java | 2 +- .../checkstyle/utils/AnnotationUtilTest.java | 6 +- .../utils/BlockCommentPositionTest.java | 6 +- .../tools/checkstyle/utils/CheckUtilTest.java | 4 +- .../checkstyle/utils/CommonUtilTest.java | 4 +- .../checkstyle/utils/JavadocUtilTest.java | 6 +- .../tools/checkstyle/utils/ScopeUtilTest.java | 2 +- .../tools/checkstyle/utils/TokenUtilTest.java | 32 ++-- .../checkstyle/xpath/ElementNodeTest.java | 6 +- .../checkstyle/xpath/XpathMapperTest.java | 4 +- .../xpath/XpathQueryGeneratorTest.java | 154 +++++++++--------- .../iterators/ReverseListIteratorTest.java | 2 +- 289 files changed, 1365 insertions(+), 1367 deletions(-) diff --git a/config/rewrite.yml b/config/rewrite.yml index 58250c5072db..fe8f13a616dd 100644 --- a/config/rewrite.yml +++ b/config/rewrite.yml @@ -9,10 +9,9 @@ recipeList: # configurationPath: "config/checkstyle-checks.xml" # propertiesPath: "config/openrewrite-recipes-checkstyle.properties" - org.openrewrite.java.RemoveUnusedImports - # - org.openrewrite.staticanalysis.NoDoubleBraceInitialization fixme: important! - # - org.openrewrite.gradle.UpdateGradleWrapper + - org.openrewrite.staticanalysis.NoDoubleBraceInitialization + - org.openrewrite.java.testing.junit5.CleanupAssertions # - org.openrewrite.java.testing.junit.JupiterBestPractices - # - org.openrewrite.java.testing.junit5.CleanupAssertions - org.openrewrite.java.format.NormalizeFormat - org.openrewrite.java.format.NormalizeLineBreaks - org.openrewrite.java.format.RemoveTrailingWhitespace 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 31b9fb040553..bb50eeaec4dd 100644 --- a/src/it/java/com/google/checkstyle/test/base/AbstractIndentationTestSupport.java +++ b/src/it/java/com/google/checkstyle/test/base/AbstractIndentationTestSupport.java @@ -74,13 +74,13 @@ private static Integer[] getLinesWithWarnAndCheckComments(String aFileName, throws IOException { final List result = new ArrayList<>(); try (BufferedReader br = Files.newBufferedReader(Path.of(aFileName))) { - var lineNumber = 1; + int lineNumber = 1; for (String line = br.readLine(); line != null; line = br.readLine()) { final Matcher match = LINE_WITH_COMMENT_REGEX.matcher(line); if (match.matches()) { final String comment = match.group(1); - final var indentInComment = getIndentFromComment(comment); - final var actualIndent = getLineStart(line, tabWidth); + final int indentInComment = getIndentFromComment(comment); + final int actualIndent = getLineStart(line, tabWidth); if (actualIndent != indentInComment) { throw new IllegalStateException(String.format(Locale.ROOT, @@ -149,8 +149,8 @@ private static boolean isWarnComment(String comment) { * @throws IllegalStateException if cannot determine that comment is consistent(default case). */ private static boolean isCommentConsistent(String comment) { - final var indentInComment = getIndentFromComment(comment); - final var isWarnComment = isWarnComment(comment); + final int indentInComment = getIndentFromComment(comment); + final boolean isWarnComment = isWarnComment(comment); final CommentType type = getCommentType(comment); return switch (type) { case MULTILEVEL -> @@ -178,7 +178,7 @@ private static boolean isNonStrictCommentConsistent(String comment, int indentInComment, boolean isWarnComment) { final Matcher nonStrictLevelMatch = NON_STRICT_LEVEL_COMMENT_REGEX.matcher(comment); nonStrictLevelMatch.matches(); - final var expectedMinimalIndent = Integer.parseInt(nonStrictLevelMatch.group(1)); + final int expectedMinimalIndent = Integer.parseInt(nonStrictLevelMatch.group(1)); return indentInComment >= expectedMinimalIndent && !isWarnComment || indentInComment < expectedMinimalIndent && isWarnComment; @@ -196,7 +196,7 @@ private static boolean isSingleLevelCommentConsistent(String comment, int indentInComment, boolean isWarnComment) { final Matcher singleLevelMatch = SINGLE_LEVEL_COMMENT_REGEX.matcher(comment); singleLevelMatch.matches(); - final var expectedLevel = Integer.parseInt(singleLevelMatch.group(1)); + final int expectedLevel = Integer.parseInt(singleLevelMatch.group(1)); return expectedLevel == indentInComment && !isWarnComment || expectedLevel != indentInComment && isWarnComment; @@ -216,7 +216,7 @@ private static boolean isMultiLevelCommentConsistent(String comment, multilevelMatch.matches(); final String[] levels = multilevelMatch.group(1).split(","); final String indentInCommentStr = String.valueOf(indentInComment); - final var containsActualLevel = + final boolean containsActualLevel = Arrays.asList(levels).contains(indentInCommentStr); return containsActualLevel && !isWarnComment @@ -260,8 +260,8 @@ private static CommentType getCommentType(String comment) { * @return starting position of given line. */ private static int getLineStart(String line, final int tabWidth) { - var lineStart = 0; - for (var index = 0; index < line.length(); ++index) { + int lineStart = 0; + for (int index = 0; index < line.length(); ++index) { if (!Character.isWhitespace(line.charAt(index))) { lineStart = CommonUtil.lengthExpandedTabs(line, index, tabWidth); break; diff --git a/src/it/java/org/checkstyle/base/AbstractItModuleTestSupport.java b/src/it/java/org/checkstyle/base/AbstractItModuleTestSupport.java index f887960c40e3..075650bea5f8 100644 --- a/src/it/java/org/checkstyle/base/AbstractItModuleTestSupport.java +++ b/src/it/java/org/checkstyle/base/AbstractItModuleTestSupport.java @@ -216,7 +216,7 @@ private static String getProperty(Configuration config, String name) * @return {@code true} if the ID is in the list. */ private static boolean isIn(String find, String... list) { - var found = false; + boolean found = false; for (String item : list) { if (find.equals(item)) { @@ -415,15 +415,15 @@ protected final void verify(Checker checker, Collections.addAll(theFiles, processedFiles); final List theWarnings = new ArrayList<>(); Collections.addAll(theWarnings, warnsExpected); - final var errs = checker.process(theFiles); + final int errs = checker.process(theFiles); // process each of the lines try (ByteArrayInputStream inputStream = new ByteArrayInputStream(stream.toByteArray()); LineNumberReader lnr = new LineNumberReader( new InputStreamReader(inputStream, StandardCharsets.UTF_8))) { - var previousLineNumber = 0; - for (var index = 0; index < expected.length; index++) { + int previousLineNumber = 0; + for (int index = 0; index < expected.length; index++) { final String expectedResult = messageFileName + ":" + expected[index]; final String actual = lnr.readLine(); assertWithMessage("Error message at position %s of 'expected' does " @@ -434,7 +434,7 @@ protected final void verify(Checker checker, String parseInt = removeDeviceFromPathOnWindows(actual); parseInt = parseInt.substring(parseInt.indexOf(':') + 1); parseInt = parseInt.substring(0, parseInt.indexOf(':')); - final var lineNumber = Integer.parseInt(parseInt); + final int lineNumber = Integer.parseInt(parseInt); assertWithMessage( "input file is expected to have a warning comment on line number %s", lineNumber) @@ -542,7 +542,7 @@ private static void verifyViolations(String file, List testI assertWithMessage("Violation lines for %s differ.", file) .that(actualViolationLines) .isEqualTo(expectedViolationLines); - for (var index = 0; index < actualViolations.size(); index++) { + for (int index = 0; index < actualViolations.size(); index++) { assertWithMessage("Actual and expected violations differ.") .that(actualViolations.get(index)) .matches(testInputViolations.get(index).toRegex()); @@ -615,7 +615,7 @@ private static String removeDeviceFromPathOnWindows(String path) { protected Integer[] getLinesWithWarn(String fileName) throws IOException { final List result = new ArrayList<>(); try (BufferedReader br = Files.newBufferedReader(Path.of(fileName))) { - var lineNumber = 1; + int lineNumber = 1; while (true) { final String line = br.readLine(); if (line == null) { diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/AbstractXpathTestSupport.java b/src/it/java/org/checkstyle/suppressionxpathfilter/AbstractXpathTestSupport.java index f7bd68142531..7a3b8df71598 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/AbstractXpathTestSupport.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/AbstractXpathTestSupport.java @@ -174,8 +174,8 @@ private static ViolationPosition extractLineAndColumnNumber(String... expectedVi final Matcher matcher = LINE_COLUMN_NUMBER_REGEX.matcher(expectedViolations[0]); if (matcher.find()) { - final var violationLineNumber = Integer.parseInt(matcher.group(1)); - final var violationColumnNumber = Integer.parseInt(matcher.group(2)); + final int violationLineNumber = Integer.parseInt(matcher.group(1)); + final int violationColumnNumber = Integer.parseInt(matcher.group(2)); violation = new ViolationPosition(violationLineNumber, violationColumnNumber); } return violation; diff --git a/src/it/java/org/checkstyle/suppressionxpathfilter/sizes/XpathRegressionAnonInnerLengthTest.java b/src/it/java/org/checkstyle/suppressionxpathfilter/sizes/XpathRegressionAnonInnerLengthTest.java index 9af08b61f772..7155916673d2 100644 --- a/src/it/java/org/checkstyle/suppressionxpathfilter/sizes/XpathRegressionAnonInnerLengthTest.java +++ b/src/it/java/org/checkstyle/suppressionxpathfilter/sizes/XpathRegressionAnonInnerLengthTest.java @@ -1,4 +1,3 @@ - /////////////////////////////////////////////////////////////////////////////////////////////// // checkstyle: Checks Java source code and other text files for adherence to a set of rules. // Copyright (C) 2001-2025 the original author or authors. @@ -76,7 +75,7 @@ public void testDefault() throws Exception { @Test public void testMaxLength() throws Exception { - final var maxLen = 5; + final int maxLen = 5; final File fileToProcess = new File(getPath("InputXpathAnonInnerLength.java")); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.java b/src/main/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.java index 2fd08fbc7ca7..c4399a98a4f4 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/AstTreeStringPrinter.java @@ -195,7 +195,7 @@ private static String getNodeInfo(DetailAST node) { * @return the indentation in String format. */ private static String getIndentation(DetailAST ast) { - final var isLastChild = ast.getNextSibling() == null; + final boolean isLastChild = ast.getNextSibling() == null; DetailAST node = ast; final StringBuilder indentation = new StringBuilder(1024); while (node.getParent() != null) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.java b/src/main/java/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.java index 9ae1c8ee14ba..f731e2405ded 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/AuditEventDefaultFormatter.java @@ -87,7 +87,7 @@ public String format(AuditEvent event) { */ private static StringBuilder initStringBuilderWithOptimalBuffer(AuditEvent event, String severityLevelName) { - final var bufLen = LENGTH_OF_ALL_SEPARATORS + event.getFileName().length() + final int bufLen = LENGTH_OF_ALL_SEPARATORS + event.getFileName().length() + event.getMessage().length() + severityLevelName.length() + getCheckShortName(event).length(); return new StringBuilder(bufLen); @@ -103,7 +103,7 @@ private static String getCheckShortName(AuditEvent event) { final String checkFullName = event.getSourceName(); String checkShortName = checkFullName.substring(checkFullName.lastIndexOf('.') + 1); if (checkShortName.endsWith(SUFFIX)) { - final var endIndex = checkShortName.length() - SUFFIX.length(); + final int endIndex = checkShortName.length() - SUFFIX.length(); checkShortName = checkShortName.substring(0, endIndex); } return checkShortName; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java b/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java index f4a0c838c38b..7b0a5a6232c8 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/Checker.java @@ -233,7 +233,7 @@ public int process(List files) throws CheckstyleException { // It may also log!!! fileSetChecks.forEach(FileSetCheck::destroy); - final var errorCount = counter.getCount(); + final int errorCount = counter.getCount(); fireAuditFinished(); return errorCount; } @@ -288,7 +288,7 @@ private void processFiles(List files) throws CheckstyleException { final String filePath = file.getPath(); try { fileName = file.getAbsolutePath(); - final var timestamp = file.lastModified(); + final long timestamp = file.lastModified(); if (cacheFile != null && cacheFile.isInCache(fileName, timestamp) || !acceptFileStarted(fileName)) { continue; @@ -404,7 +404,7 @@ public void fireFileStarted(String fileName) { @Override public void fireErrors(String fileName, SortedSet errors) { final String stripped = relativizePathWithCatch(fileName); - var hasNonFilteredViolations = false; + boolean hasNonFilteredViolations = false; for (final Violation element : errors) { final AuditEvent event = new AuditEvent(this, stripped, element); if (filters.accept(event)) { @@ -552,7 +552,7 @@ public final void addListener(AuditListener listener) { public final void setFileExtensions(String... extensions) { if (extensions != null) { fileExtensions = new String[extensions.length]; - for (var i = 0; i < extensions.length; i++) { + for (int i = 0; i < extensions.length; i++) { final String extension = extensions[i]; if (extension.startsWith(EXTENSION_SEPARATOR)) { fileExtensions[i] = extension; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ChecksAndFilesSuppressionFileGeneratorAuditListener.java b/src/main/java/com/puppycrawl/tools/checkstyle/ChecksAndFilesSuppressionFileGeneratorAuditListener.java index 16f5f90b2570..ea74ac140203 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/ChecksAndFilesSuppressionFileGeneratorAuditListener.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/ChecksAndFilesSuppressionFileGeneratorAuditListener.java @@ -148,7 +148,7 @@ public void addError(AuditEvent event) { * {@code false} otherwise. */ private boolean isFileAndCheckNamePresent(Path fileName, String checkName) { - var isPresent = false; + boolean isPresent = false; final Set checks = filesAndChecksCollector.get(fileName); if (checks != null) { isPresent = checks.contains(checkName); @@ -166,7 +166,7 @@ private boolean isFileAndCheckNamePresent(Path fileName, String checkName) { * {@code false} otherwise. */ private boolean isFileAndModuleIdPresent(Path fileName, String moduleIdName) { - var isPresent = false; + boolean isPresent = false; final Set moduleIds = filesAndModuleIdCollector.get(fileName); if (moduleIds != null) { isPresent = moduleIds.contains(moduleIdName); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java index 5e4bd5bab157..5a89bedc8f4b 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java @@ -295,7 +295,7 @@ public static Configuration loadConfiguration(InputSource configSource, ThreadModeSettings threadModeSettings) throws CheckstyleException { try { - final var omitIgnoreModules = ignoredModulesOptions == IgnoredModulesOptions.OMIT; + final boolean omitIgnoreModules = ignoredModulesOptions == IgnoredModulesOptions.OMIT; final ConfigurationLoader loader = new ConfigurationLoader(overridePropsResolver, omitIgnoreModules, threadModeSettings); @@ -431,9 +431,9 @@ private static void parsePropertyString(String value, Collection fragments, Collection propertyRefs) throws CheckstyleException { - var prev = 0; + int prev = 0; // search for the next instance of $ from the 'prev' position - var pos = value.indexOf(DOLLAR_SIGN, prev); + int pos = value.indexOf(DOLLAR_SIGN, prev); while (pos >= 0) { // if there was any text before this, add it as a fragment if (pos > 0) { @@ -447,7 +447,7 @@ private static void parsePropertyString(String value, } else if (value.charAt(pos + 1) == '{') { // property found, extract its name or bail on a typo - final var endName = value.indexOf('}', pos); + final int endName = value.indexOf('}', pos); if (endName == -1) { throw new CheckstyleException("Syntax error in property: " + value); @@ -568,7 +568,7 @@ public void endElement(String uri, // omit this module if these should be omitted and the module // has the severity 'ignore' - final var omitModule = omitIgnoredModules + final boolean omitModule = omitIgnoredModules && level == SeverityLevel.IGNORE; if (omitModule && !configStack.isEmpty()) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java b/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java index ea0a12488280..eb962b156791 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java @@ -194,7 +194,7 @@ public int getChildCount() { @Override public int getChildCount(int tokenType) { - var count = 0; + int count = 0; for (DetailAST ast = firstChild; ast != null; ast = ast.getNextSibling()) { if (ast.getType() == tokenType) { count++; @@ -252,7 +252,7 @@ public void setType(int type) { @Override public int getLineNo() { - var resultNo = -1; + int resultNo = -1; if (lineNo == NOT_INITIALIZED) { // an inner AST that has been initialized @@ -281,7 +281,7 @@ public void setLineNo(int lineNo) { @Override public int getColumnNo() { - var resultNo = -1; + int resultNo = -1; if (columnNo == NOT_INITIALIZED) { // an inner AST that has been initialized @@ -324,7 +324,7 @@ public DetailAST getLastChild() { * @return Column number if non-comment node exists, -1 otherwise. */ private static int findColumnNo(DetailAST ast) { - var resultNo = -1; + int resultNo = -1; DetailAST node = ast; while (node != null) { // comment node can't be start of any java statement/definition @@ -346,7 +346,7 @@ private static int findColumnNo(DetailAST ast) { * @return Line number if non-comment node exists, -1 otherwise. */ private static int findLineNo(DetailAST ast) { - var resultNo = -1; + int resultNo = -1; DetailAST node = ast; while (node != null) { // comment node can't be start of any java statement/definition diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.java b/src/main/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.java index ca037589fb58..69350e542dd0 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/DetailNodeTreeStringPrinter.java @@ -133,7 +133,7 @@ public static String printTree(DetailNode ast, String rootPrefix, String prefix) * @return the indentation in String format. */ private static String getIndentation(DetailNode node) { - final var isLastChild = node.getNextSibling() == null; + final boolean isLastChild = node.getNextSibling() == null; DetailNode currentNode = node; final StringBuilder indentation = new StringBuilder(1024); while (currentNode.getParent() != null) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java index f2f58020bd48..a8f8fc0c8a27 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavaAstVisitor.java @@ -131,7 +131,7 @@ public JavaAstVisitor(CommonTokenStream tokenStream) { public DetailAstImpl visitCompilationUnit(JavaLanguageParser.CompilationUnitContext ctx) { final DetailAstImpl compilationUnit; // 'EOF' token is always present; therefore if we only have one child, we have an empty file - final var isEmptyFile = ctx.children.size() == 1; + final boolean isEmptyFile = ctx.children.size() == 1; if (isEmptyFile) { compilationUnit = null; } @@ -173,7 +173,7 @@ public DetailAstImpl visitImportDec(JavaLanguageParser.ImportDecContext ctx) { } // Handle star imports - final var isStarImport = ctx.STAR() != null; + final boolean isStarImport = ctx.STAR() != null; if (isStarImport) { final DetailAstImpl dot = create(ctx.DOT()); dot.addChild(visit(ctx.qualifiedName())); @@ -1416,7 +1416,7 @@ public DetailAstImpl visitNewExp(JavaLanguageParser.NewExpContext ctx) { @Override public DetailAstImpl visitPrefix(JavaLanguageParser.PrefixContext ctx) { - final var tokenType = switch (ctx.prefix.getType()) { + final int tokenType = switch (ctx.prefix.getType()) { case JavaLanguageLexer.PLUS -> TokenTypes.UNARY_PLUS; case JavaLanguageLexer.MINUS -> TokenTypes.UNARY_MINUS; default -> ctx.prefix.getType(); @@ -1646,7 +1646,7 @@ public DetailAstImpl visitMethodCall(JavaLanguageParser.MethodCallContext ctx) { public DetailAstImpl visitTypeCastParameters( JavaLanguageParser.TypeCastParametersContext ctx) { final DetailAstImpl typeType = visit(ctx.typeType(0)); - for (var i = 0; i < ctx.BAND().size(); i++) { + for (int i = 0; i < ctx.BAND().size(); i++) { addLastSibling(typeType, create(TokenTypes.TYPE_EXTENSION_AND, (Token) ctx.BAND(i).getPayload())); addLastSibling(typeType, visit(ctx.typeType(i + 1))); @@ -1684,7 +1684,7 @@ public DetailAstImpl visitMultiLambdaParams(JavaLanguageParser.MultiLambdaParams final DetailAstImpl parameters = createImaginary(TokenTypes.PARAMETERS); parameters.addChild(createLambdaParameter(ctx.id(0))); - for (var i = 0; i < ctx.COMMA().size(); i++) { + for (int i = 0; i < ctx.COMMA().size(); i++) { parameters.addChild(create(ctx.COMMA(i))); parameters.addChild(createLambdaParameter(ctx.id(i + 1))); } @@ -1789,7 +1789,7 @@ public DetailAstImpl visitArrayCreatorRest(JavaLanguageParser.ArrayCreatorRestCo final JavaLanguageParser.ExpressionContext expression = ctx.expression(); final TerminalNode rbrack = ctx.RBRACK(); // child[0] is LBRACK - for (var i = 1; i < ctx.children.size(); i++) { + for (int i = 1; i < ctx.children.size(); i++) { if (ctx.children.get(i) == rbrack) { arrayDeclarator.addChild(create(rbrack)); } @@ -1866,7 +1866,7 @@ public DetailAstImpl visitTypeArgumentsTypeList( final DetailAstImpl firstTypeArgument = createImaginary(TokenTypes.TYPE_ARGUMENT); firstTypeArgument.addChild(firstIdent); - for (var i = 0; i < ctx.COMMA().size(); i++) { + for (int i = 0; i < ctx.COMMA().size(); i++) { addLastSibling(firstTypeArgument, create(ctx.COMMA(i))); final DetailAstImpl ident = visit(ctx.typeType(i + 1)); final DetailAstImpl typeArgument = createImaginary(TokenTypes.TYPE_ARGUMENT); @@ -1970,7 +1970,7 @@ public DetailAstImpl visitPattern(JavaLanguageParser.PatternContext ctx) { final JavaLanguageParser.InnerPatternContext innerPattern = ctx.innerPattern(); final ParserRuleContext primaryPattern = innerPattern.primaryPattern(); final ParserRuleContext recordPattern = innerPattern.recordPattern(); - final var isSimpleTypePattern = primaryPattern != null + final boolean isSimpleTypePattern = primaryPattern != null && primaryPattern.getChild(0) instanceof JavaLanguageParser.TypePatternContext; final DetailAstImpl pattern; @@ -2137,7 +2137,7 @@ private DetailAstImpl create(int tokenType, Token startToken) { * @return new DetailAstImpl of given type */ private DetailAstImpl create(Token token) { - final var tokenIndex = token.getTokenIndex(); + final int tokenIndex = token.getTokenIndex(); final List tokensToLeft = tokens.getHiddenTokensToLeft(tokenIndex, JavaLanguageLexer.COMMENTS); final List tokensToRight = diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocCommentsAstVisitor.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocCommentsAstVisitor.java index 3d2c0098c476..26e4ea25be8c 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocCommentsAstVisitor.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocCommentsAstVisitor.java @@ -152,7 +152,7 @@ public JavadocNodeImpl visitBlockTag(JavadocCommentsParser.BlockTagContext ctx) if (tag instanceof ParserRuleContext context) { final Token tagName = (Token) context.getChild(1).getPayload(); - final var tokenType = tagName.getType(); + final int tokenType = tagName.getType(); final JavadocNodeImpl specificTagNode = switch (tokenType) { case JavadocCommentsLexer.AUTHOR -> @@ -282,7 +282,7 @@ public JavadocNodeImpl visitInlineTag(JavadocCommentsParser.InlineTagContext ctx if (tagContent instanceof ParserRuleContext context) { final Token tagName = (Token) context.getChild(0).getPayload(); - final var tokenType = tagName.getType(); + final int tokenType = tagName.getType(); final JavadocNodeImpl specificTagNode = switch (tokenType) { case JavadocCommentsLexer.CODE -> @@ -636,10 +636,10 @@ private static boolean isTextToken(Token token) { * @param parent the parent node to which hidden tokens are added */ private void addHiddenTokensToTheLeft(Token token, JavadocNodeImpl parent) { - final var alreadyProcessed = !processedTokenIndices.add(token.getTokenIndex()); + final boolean alreadyProcessed = !processedTokenIndices.add(token.getTokenIndex()); if (!alreadyProcessed) { - final var tokenIndex = token.getTokenIndex(); + final int tokenIndex = token.getTokenIndex(); final List hiddenTokens = tokens.getHiddenTokensToLeft(tokenIndex); if (hiddenTokens != null) { accumulator.flushTo(parent); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java index 03f4b05fa37e..37de183a21fc 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocDetailNodeParser.java @@ -75,7 +75,7 @@ public class JavadocDetailNodeParser { * the error message (if parsing failed) */ public ParseStatus parseJavadocComment(DetailAST javadocCommentAst) { - final var blockCommentLineNumber = javadocCommentAst.getLineNo(); + final int blockCommentLineNumber = javadocCommentAst.getLineNo(); final String javadocComment = JavadocUtil.getJavadocCommentContent(javadocCommentAst); final ParseStatus result = new ParseStatus(); @@ -116,7 +116,7 @@ public ParseStatus parseJavadocComment(DetailAST javadocCommentAst) { try { final JavadocCommentsParser.JavadocContext javadoc = parser.javadoc(); - final var javadocColumnNumber = javadocCommentAst.getColumnNo() + final int javadocColumnNumber = javadocCommentAst.getColumnNo() + JAVADOC_START.length(); final JavadocCommentsAstVisitor visitor = new JavadocCommentsAstVisitor( @@ -189,14 +189,14 @@ public void syntaxError( Recognizer recognizer, Object offendingSymbol, int line, int charPositionInLine, String msg, RecognitionException ex) { - final var lineNumber = offset + line; + final int lineNumber = offset + line; final String target; if (recognizer instanceof JavadocCommentsLexer lexer) { target = lexer.getPreviousToken().getText(); } else { - final var ruleIndex = ex.getCtx().getRuleIndex(); + final int ruleIndex = ex.getCtx().getRuleIndex(); final String ruleName = recognizer.getRuleNames()[ruleIndex]; target = convertUpperCamelToUpperUnderscore(ruleName); } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.java index a042dca70612..84c957d127a9 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGenerator.java @@ -161,7 +161,7 @@ private static DetailAST getClassBody(DetailAST top) { * @return {@code true} if matches; {@code false} otherwise */ private static boolean isPublicStaticFinalIntField(DetailAST ast) { - var result = ast.getType() == TokenTypes.VARIABLE_DEF; + boolean result = ast.getType() == TokenTypes.VARIABLE_DEF; if (result) { final DetailAST type = ast.findFirstToken(TokenTypes.TYPE); final DetailAST arrayDeclarator = type.getFirstChild().getNextSibling(); @@ -264,7 +264,7 @@ else if (node.getType() == JavadocCommentsTokenTypes.JAVADOC_INLINE_TAG) { */ private static void formatInlineCodeTag(StringBuilder builder, DetailNode inlineTag) throws CheckstyleException { - final var tagType = inlineTag.getFirstChild().getType(); + final int tagType = inlineTag.getFirstChild().getType(); if (tagType != JavadocCommentsTokenTypes.LITERAL_INLINE_TAG && tagType != JavadocCommentsTokenTypes.CODE_INLINE_TAG) { @@ -272,7 +272,7 @@ private static void formatInlineCodeTag(StringBuilder builder, DetailNode inline + JavadocUtil.getTokenName(tagType)); } - final var wrapWithCodeTag = tagType == JavadocCommentsTokenTypes.CODE_INLINE_TAG; + final boolean wrapWithCodeTag = tagType == JavadocCommentsTokenTypes.CODE_INLINE_TAG; for (DetailNode node = inlineTag.getFirstChild().getFirstChild(); node != null; node = node.getNextSibling()) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java index 2e83d25e9162..a51225b9551c 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java @@ -116,8 +116,8 @@ public static void main(String... args) throws IOException { commandLine.setCaseInsensitiveEnumValuesAllowed(true); // provide proper exit code based on results. - var exitStatus = 0; - var errorCounter = 0; + int exitStatus = 0; + int errorCounter = 0; try { final ParseResult parseResult = commandLine.parseArgs(args); if (parseResult.isVersionHelpRequested()) { @@ -197,7 +197,7 @@ private static int execute(ParseResult parseResult, CliOptions options) // return error if something is wrong in arguments final List filesToProcess = getFilesToProcess(options); final List messages = options.validateCli(parseResult, filesToProcess); - final var hasMessages = !messages.isEmpty(); + final boolean hasMessages = !messages.isEmpty(); if (hasMessages) { messages.forEach(System.out::println); exitStatus = EXIT_WITH_INVALID_USER_INPUT_CODE; @@ -266,7 +266,7 @@ else if (node.isFile()) { * @return True if the directory/file matches one of the patterns. */ private static boolean isPathExcluded(String path, Iterable patternsToExclude) { - var result = false; + boolean result = false; for (Pattern pattern : patternsToExclude) { if (pattern.matcher(path).find()) { @@ -292,8 +292,8 @@ private static boolean isPathExcluded(String path, Iterable patternsToE */ private static int runCli(CliOptions options, List filesToProcess) throws IOException, CheckstyleException { - var result = 0; - final var hasSuppressionLineColumnNumber = options.suppressionLineColumnNumber != null; + int result = 0; + final boolean hasSuppressionLineColumnNumber = options.suppressionLineColumnNumber != null; // create config helper object if (options.printAst) { @@ -841,8 +841,8 @@ private List getExclusions() { // -@cs[CyclomaticComplexity] Breaking apart will damage encapsulation private List validateCli(ParseResult parseResult, List filesToProcess) { final List result = new ArrayList<>(); - final var hasConfigurationFile = configurationFile != null; - final var hasSuppressionLineColumnNumber = suppressionLineColumnNumber != null; + final boolean hasConfigurationFile = configurationFile != null; + final boolean hasSuppressionLineColumnNumber = suppressionLineColumnNumber != null; if (filesToProcess.isEmpty()) { result.add("Files to process must be specified, found 0."); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java b/src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java index ec9a3cb01254..779889e92c10 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/PropertyCacheFile.java @@ -313,7 +313,7 @@ private static byte[] toByteArray(InputStream stream) throws IOException { final ByteArrayOutputStream content = new ByteArrayOutputStream(); while (true) { - final var size = stream.read(BUFFER); + final int size = stream.read(BUFFER); if (size == -1) { break; } @@ -341,7 +341,7 @@ private boolean areExternalResourcesChanged(Set resources) { * @return true if resource is changed. */ private boolean isResourceChanged(ExternalResource resource) { - var changed = false; + boolean changed = false; if (isResourceLocationInCache(resource.location)) { final String contentHashSum = resource.contentHashSum; final String cachedHashSum = details.getProperty(resource.location); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/SarifLogger.java b/src/main/java/com/puppycrawl/tools/checkstyle/SarifLogger.java index 7b8e9078982e..a2197c00da5c 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/SarifLogger.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/SarifLogger.java @@ -300,7 +300,7 @@ private static Map getMessages(ModuleDetails moduleDetails) { final String fullQualifiedName = moduleDetails.getFullQualifiedName(); final Map result = new LinkedHashMap<>(); try { - final var lastDot = fullQualifiedName.lastIndexOf('.'); + final int lastDot = fullQualifiedName.lastIndexOf('.'); final String packageName = fullQualifiedName.substring(0, lastDot); final String bundleName = packageName + ".messages"; final Class moduleClass = Class.forName(fullQualifiedName); @@ -466,10 +466,10 @@ private static String renderSeverityLevel(SeverityLevel severityLevel) { * @return the escaped value if necessary. */ public static String escape(String value) { - final var length = value.length(); + final int length = value.length(); final StringBuilder sb = new StringBuilder(length); - for (var i = 0; i < length; i++) { - final var chr = value.charAt(i); + for (int i = 0; i < length; i++) { + final char chr = value.charAt(i); final String replacement = switch (chr) { case '"' -> "\\\""; case '\\' -> TWO_BACKSLASHES; @@ -519,7 +519,7 @@ public static String readResource(String name) throws IOException { throw new IOException("Cannot find the resource " + name); } final byte[] buffer = new byte[BUFFER_SIZE]; - var length = 0; + int length = 0; while (length != -1) { result.write(buffer, 0, length); length = inputStream.read(buffer); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.java b/src/main/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.java index dac0b1b4d030..158d386c3fcf 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinter.java @@ -75,8 +75,8 @@ public static String printSuppressions(File file, String suppressionLineColumnNu final FileText fileText = new FileText(file, System.getProperty("file.encoding")); final DetailAST detailAST = JavaParser.parseFileText(fileText, JavaParser.Options.WITH_COMMENTS); - final var lineNumber = Integer.parseInt(matcher.group(1)); - final var columnNumber = Integer.parseInt(matcher.group(2)); + final int lineNumber = Integer.parseInt(matcher.group(1)); + final int columnNumber = Integer.parseInt(matcher.group(2)); return generate(fileText, detailAST, lineNumber, columnNumber, tabWidth); } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java index 6ad1be6f32ef..f8e8df0ac5a5 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java @@ -187,7 +187,7 @@ protected void processFiltered(File file, FileText fileText) throws CheckstyleEx final FileContents contents = getFileContents(); DetailAST rootAST = null; // whether skip the procedure after parsing Java files. - var skip = false; + boolean skip = false; try { rootAST = JavaParser.parse(contents); } @@ -267,7 +267,7 @@ private void registerCheck(AbstractCheck check) throws CheckstyleException { final int[] acceptableTokens = check.getAcceptableTokens(); Arrays.sort(acceptableTokens); for (String token : checkTokens) { - final var tokenId = TokenUtil.getTokenId(token); + final int tokenId = TokenUtil.getTokenId(token); if (Arrays.binarySearch(acceptableTokens, tokenId) >= 0) { registerCheck(tokenId, check); } @@ -420,7 +420,7 @@ private void notifyLeave(DetailAST ast, AstState astState) { */ private Collection getListOfChecks(DetailAST ast, AstState astState) { final Collection visitors; - final var tokenId = ast.getType(); + final int tokenId = ast.getType(); if (astState == AstState.WITH_COMMENTS) { visitors = tokenToCommentChecks.get(tokenId); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java b/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java index aeaf419f20ac..6e6d54e28e96 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/XMLLogger.java @@ -264,8 +264,8 @@ private void writeException(Throwable throwable) { */ public static String encode(String value) { final StringBuilder sb = new StringBuilder(256); - for (var i = 0; i < value.length(); i++) { - final var chr = value.charAt(i); + for (int i = 0; i < value.length(); i++) { + final char chr = value.charAt(i); switch (chr) { case '<': sb.append("<"); @@ -311,14 +311,14 @@ public static String encode(String value) { * @return whether the given argument a character or entity reference */ public static boolean isReference(String ent) { - var reference = false; + boolean reference = false; if (ent.charAt(0) == '&' && ent.endsWith(";")) { if (ent.charAt(1) == '#') { // prefix is "&#" - var prefixLength = 2; + int prefixLength = 2; - var radix = BASE_10; + int radix = BASE_10; if (ent.charAt(2) == 'x') { prefixLength++; radix = BASE_16; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java index cee11c912878..efb2baf17f3a 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/XmlLoader.java @@ -161,7 +161,7 @@ private LoadExternalDtdFeatureProvider() { public static void setFeaturesBySystemProperty(SAXParserFactory factory) throws SAXException, ParserConfigurationException { - final var enableExternalDtdLoad = Boolean.parseBoolean( + final boolean enableExternalDtdLoad = Boolean.parseBoolean( System.getProperty(ENABLE_EXTERNAL_DTD_LOAD, "false")); factory.setFeature(LOAD_EXTERNAL_DTD, enableExternalDtdLoad); 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 1db4d9b2b016..b3cf56dfc48a 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractCheck.java @@ -242,7 +242,7 @@ public final void log(int line, String key, Object... args) { @Override public final void log(int lineNo, int colNo, String key, Object... args) { - final var col = 1 + CommonUtil.lengthExpandedTabs( + final int col = 1 + CommonUtil.lengthExpandedTabs( getLines()[lineNo - 1], colNo, tabWidth); context.get().violations.add( new Violation( @@ -272,7 +272,7 @@ public final void log(DetailAST ast, String key, Object... args) { // from 1, that is why result of the method CommonUtil.lengthExpandedTabs // is increased by one. - final var col = 1 + CommonUtil.lengthExpandedTabs( + final int col = 1 + CommonUtil.lengthExpandedTabs( getLines()[ast.getLineNo() - 1], ast.getColumnNo(), tabWidth); context.get().violations.add( new Violation( 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 02dcb3126a61..9ccc5b9142db 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java @@ -175,7 +175,7 @@ public void setFileExtensions(String... extensions) { } fileExtensions = new String[extensions.length]; - for (var i = 0; i < extensions.length; i++) { + for (int i = 0; i < extensions.length; i++) { final String extension = extensions[i]; if (extension.startsWith(EXTENSION_SEPARATOR)) { fileExtensions[i] = extension; @@ -230,7 +230,7 @@ public final void log(int line, String key, Object... args) { public final void log(int lineNo, int colNo, String key, Object... args) { final FileContext fileContext = context.get(); - final var col = 1 + CommonUtil.lengthExpandedTabs( + final int col = 1 + CommonUtil.lengthExpandedTabs( fileContext.fileContents.getLine(lineNo - 1), colNo, tabWidth); fileContext.violations.add( new Violation(lineNo, 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 758dac78106e..25e702a4431a 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractViolationReporter.java @@ -137,7 +137,7 @@ protected String getMessageBundle() { */ private static String getMessageBundle(final String className) { final String messageBundle; - final var endIndex = className.lastIndexOf('.'); + final int endIndex = className.lastIndexOf('.'); final String messages = "messages"; if (endIndex == -1) { messageBundle = messages; 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 a82adb84c31c..8ab5ed9bad5c 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSet.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/BeforeExecutionFileFilterSet.java @@ -68,7 +68,7 @@ public String toString() { @Override public boolean accept(String uri) { - var result = true; + boolean result = true; for (BeforeExecutionFileFilter filter : beforeExecutionFileFilters) { if (!filter.accept(uri)) { result = false; 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 74872004758a..9fb906721d67 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/Comment.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/Comment.java @@ -89,11 +89,11 @@ public boolean intersects(int startLine, int startCol, int endLine, int endCol) { // compute a single number for start and end // to simplify conditional logic - final var multiplier = Integer.MAX_VALUE; - final var thisStart = startLineNo * multiplier + startColNo; - final var thisEnd = endLineNo * multiplier + endColNo; - final var inStart = startLine * multiplier + startCol; - final var inEnd = endLine * multiplier + endCol; + final long multiplier = Integer.MAX_VALUE; + final long thisStart = startLineNo * multiplier + startColNo; + final long thisEnd = endLineNo * multiplier + endColNo; + final long inStart = startLine * multiplier + startCol; + final long inEnd = endLine * multiplier + endCol; return thisEnd >= inStart && inEnd >= thisStart; } 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 2a60c7662e2b..053127f1cac5 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java @@ -183,7 +183,7 @@ private String[] extractBlockComment(int startLineNo, int startColNo, else { returnValue = new String[endLineNo - startLineNo + 1]; returnValue[0] = line(startLineNo - 1).substring(startColNo); - for (var i = startLineNo; i < endLineNo; i++) { + for (int i = startLineNo; i < endLineNo; i++) { returnValue[i - startLineNo + 1] = line(i); } returnValue[returnValue.length - 1] = line(endLineNo - 1).substring(0, @@ -214,7 +214,7 @@ private String line(int lineNo) { **/ public TextBlock getJavadocBefore(int lineNoBefore) { // Lines start at 1 to the callers perspective, so need to take off 2 - var lineNo = lineNoBefore - 2; + int lineNo = lineNoBefore - 2; // skip blank lines and comments while (lineNo > 0 && (lineIsBlank(lineNo) || lineIsComment(lineNo) @@ -251,9 +251,9 @@ private boolean lineInsideBlockComment(int lineNo) { * @return {@code true} line is in block comment, {@code false} otherwise */ private boolean isLineBlockComment(int lineNo, TextBlock comment) { - final var lineInSideBlockComment = lineNo >= comment.getStartLineNo() + final boolean lineInSideBlockComment = lineNo >= comment.getStartLineNo() && lineNo <= comment.getEndLineNo(); - var lineHasOnlyBlockComment = true; + boolean lineHasOnlyBlockComment = true; final String startLine = line(comment.getStartLineNo() - 1).trim(); if (!startLine.startsWith("/*")) { lineHasOnlyBlockComment = false; @@ -332,9 +332,9 @@ private boolean hasIntersectionWithBlockComment(int startLineNo, int startColNo, */ private boolean hasIntersectionWithSingleLineComment(int startLineNo, int startColNo, int endLineNo, int endColNo) { - var hasIntersection = false; + boolean hasIntersection = false; // Check CPP comments (line searching is possible) - for (var lineNumber = startLineNo; lineNumber <= endLineNo; + for (int lineNumber = startLineNo; lineNumber <= endLineNo; lineNumber++) { final TextBlock comment = cppComments.get(lineNumber); if (comment != null && comment.intersects(startLineNo, startColNo, 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 539ccb757d09..87bcebe969cd 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FileText.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FileText.java @@ -201,7 +201,7 @@ private static String readFile(final File inputFile, final CharsetDecoder decode try (Reader reader = new InputStreamReader(stream, decoder)) { final char[] chars = new char[READ_BUFFER_SIZE]; while (true) { - final var len = reader.read(chars); + final int len = reader.read(chars); if (len == -1) { break; } @@ -269,14 +269,14 @@ public String[] toLinesArray() { */ public LineColumn lineColumn(int pos) { final int[] lineBreakPositions = findLineBreaks(); - var lineNo = Arrays.binarySearch(lineBreakPositions, pos); + int lineNo = Arrays.binarySearch(lineBreakPositions, pos); if (lineNo < 0) { // we have: lineNo = -(insertion point) - 1 // we want: lineNo = (insertion point) - 1 lineNo = -lineNo - 2; } - final var startOfLine = lineBreakPositions[lineNo]; - final var columnNo = pos - startOfLine; + final int startOfLine = lineBreakPositions[lineNo]; + final int columnNo = pos - startOfLine; // now we have lineNo and columnNo, both starting at zero. return new LineColumn(lineNo + 1, columnNo); } @@ -290,7 +290,7 @@ private int[] findLineBreaks() { if (lineBreaks == null) { final int[] lineBreakPositions = new int[size() + 1]; lineBreakPositions[0] = 0; - var lineNo = 1; + int lineNo = 1; final Matcher matcher = LINE_TERMINATOR.matcher(fullText); while (matcher.find()) { lineBreakPositions[lineNo] = matcher.end(); 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 9c8f795a876d..eeea4a82c87e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FilterSet.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FilterSet.java @@ -68,7 +68,7 @@ public String toString() { @Override public boolean accept(AuditEvent event) { - var result = true; + boolean result = true; for (Filter filter : filters) { if (!filter.accept(event)) { result = false; 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 8cc15768b0dd..e89811ec2fed 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FullIdent.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FullIdent.java @@ -80,20 +80,20 @@ public static FullIdent createFullIdent(DetailAST ast) { private static void extractFullIdent(FullIdent full, DetailAST ast) { final Deque identStack = new ArrayDeque<>(); pushToIdentStack(identStack, ast); - var bracketsExist = false; - var dotCounter = 0; + boolean bracketsExist = false; + int dotCounter = 0; while (!identStack.isEmpty()) { final DetailAST currentAst = identStack.pop(); final DetailAST nextSibling = currentAst.getNextSibling(); // Here we want type declaration, but not initialization - final var isArrayTypeDeclarationStart = nextSibling != null + final boolean isArrayTypeDeclarationStart = nextSibling != null && (nextSibling.getType() == TokenTypes.ARRAY_DECLARATOR || nextSibling.getType() == TokenTypes.ANNOTATIONS) && isArrayTypeDeclaration(nextSibling); - final var typeOfAst = currentAst.getType(); + final int typeOfAst = currentAst.getType(); bracketsExist = bracketsExist || isArrayTypeDeclarationStart; final DetailAST firstChild = currentAst.getFirstChild(); @@ -124,7 +124,7 @@ else if (typeOfAst == TokenTypes.DOT) { */ private static int appendToFull(FullIdent full, DetailAST ast, int dotCounter, boolean bracketsExist, boolean isArrayTypeDeclarationStart) { - var result = dotCounter; + int result = dotCounter; if (isArrayTypeDeclarationStart) { full.append(ast); appendBrackets(full, ast); @@ -180,9 +180,9 @@ private static boolean isArrayTypeDeclaration(DetailAST arrayDeclarator) { * @param ast the type ast we are building a {@code FullIdent} for */ private static void appendBrackets(FullIdent full, DetailAST ast) { - final var bracketCount = + final int bracketCount = ast.getParent().getChildCount(TokenTypes.ARRAY_DECLARATOR); - for (var i = 0; i < bracketCount; i++) { + for (int i = 0; i < bracketCount; i++) { full.append("[]"); } } 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 6c8a928e602d..e0e6dcd952fc 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.java @@ -76,13 +76,13 @@ public void visitToken(DetailAST ast) { final DetailAST identAst = typeAST.getNextSibling(); // If identAst is null, we have a 'LITERAL_NEW' expression, i.e. 'new int[2][2]' if (identAst != null) { - final var isMethod = typeAST.getParent().getType() == TokenTypes.METHOD_DEF; - final var isJavaStyle = identAst.getLineNo() > ast.getLineNo() + final boolean isMethod = typeAST.getParent().getType() == TokenTypes.METHOD_DEF; + final boolean isJavaStyle = identAst.getLineNo() > ast.getLineNo() || identAst.getColumnNo() - ast.getColumnNo() > -1; // force all methods to be Java style (see note in top Javadoc) - final var isMethodViolation = isMethod && !isJavaStyle; - final var isVariableViolation = !isMethod + final boolean isMethodViolation = isMethod && !isJavaStyle; + final boolean isVariableViolation = !isMethod && isJavaStyle != javaStyle; if (isMethodViolation || isVariableViolation) { 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 9718aa9b9e17..e733bbbb6fc6 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.java @@ -293,9 +293,9 @@ private static boolean hasUnicodeChar(String literal) { * @return true, if String literal contains Unicode control chars. */ private static boolean isOnlyUnicodeValidChars(String literal, Pattern pattern) { - final var unicodeMatchesCounter = + final int unicodeMatchesCounter = countMatches(UNICODE_REGEXP, literal); - final var unicodeValidMatchesCounter = + final int unicodeValidMatchesCounter = countMatches(pattern, literal); return unicodeMatchesCounter - unicodeValidMatchesCounter == 0; } @@ -307,14 +307,14 @@ private static boolean isOnlyUnicodeValidChars(String literal, Pattern pattern) * @return true if trail comment is present after ast token. */ private boolean hasTrailComment(DetailAST ast) { - var lineNo = ast.getLineNo(); + int lineNo = ast.getLineNo(); // Since the trailing comment in the case of text blocks must follow the """ delimiter, // we need to look for it after TEXT_BLOCK_LITERAL_END. if (ast.getType() == TokenTypes.TEXT_BLOCK_CONTENT) { lineNo = ast.getNextSibling().getLineNo(); } - var result = false; + boolean result = false; if (singlelineComments.containsKey(lineNo)) { result = true; } @@ -350,7 +350,7 @@ private static boolean isTrailingBlockComment(TextBlock comment, int... codePoin * @return count of regexp matches. */ private static int countMatches(Pattern pattern, String target) { - var matcherCounter = 0; + int matcherCounter = 0; final Matcher matcher = pattern.matcher(target); while (matcher.find()) { matcherCounter++; 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 7bbd635171f2..cd79c9daef3e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/DescendantTokenCheck.java @@ -138,7 +138,7 @@ private void logAsSeparated(DetailAST ast) { final String name = TokenUtil.getTokenName(ast.getType()); for (int element : limitedTokens) { - final var tokenCount = counts[element - 1]; + final int tokenCount = counts[element - 1]; if (tokenCount < minimumNumber) { final String descendantName = TokenUtil.getTokenName(element); @@ -177,7 +177,7 @@ private void logAsTotal(DetailAST ast) { // name of this token final String name = TokenUtil.getTokenName(ast.getType()); - var total = 0; + int total = 0; for (int element : limitedTokens) { total += counts[element - 1]; } @@ -211,13 +211,13 @@ private void countTokens(DetailAST ast, int depth) { if (depth <= maximumDepth) { // update count if (depth >= minimumDepth) { - final var type = ast.getType(); + final int type = ast.getType(); if (type <= counts.length) { counts[type - 1]++; } } DetailAST child = ast.getFirstChild(); - final var nextDepth = depth + 1; + final int nextDepth = depth + 1; while (child != null) { countTokens(child, nextDepth); child = child.getNextSibling(); @@ -234,8 +234,8 @@ private void countTokens(DetailAST ast, int depth) { public void setLimitedTokens(String... limitedTokensParam) { limitedTokens = new int[limitedTokensParam.length]; - var maxToken = 0; - for (var i = 0; i < limitedTokensParam.length; i++) { + int maxToken = 0; + for (int i = 0; i < limitedTokensParam.length; i++) { limitedTokens[i] = TokenUtil.getTokenId(limitedTokensParam[i]); if (limitedTokens[i] >= maxToken + 1) { maxToken = limitedTokens[i]; 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 2572d651fe38..c284d90f5c56 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java @@ -216,7 +216,7 @@ private void checkParam(final DetailAST param) { * @return true if param has to be skipped. */ private boolean isIgnoredPrimitiveParam(DetailAST paramDef) { - var result = false; + boolean result = false; if (ignorePrimitiveTypes) { final DetailAST type = paramDef.findFirstToken(TokenTypes.TYPE); final DetailAST parameterType = type.getFirstChild(); 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 50265068f7b4..521c64efb675 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheck.java @@ -170,7 +170,7 @@ else if (!endsWithNewline(randomAccessFile, lineSeparator)) { private static boolean endsWithNewline(RandomAccessFile file, LineSeparatorOption separator) throws IOException { final boolean result; - final var len = separator.length(); + final int len = separator.length(); if (file.length() == 0) { result = true; } @@ -180,7 +180,7 @@ else if (file.length() < len) { else { file.seek(file.length() - len); final byte[] lastBytes = new byte[len]; - final var readBytes = file.read(lastBytes); + final int readBytes = file.read(lastBytes); if (readBytes != len) { throw new IOException("Unable to read " + len + " bytes, got " + readBytes); 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 343a3143f810..3d17f17c4896 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/OrderedPropertiesCheck.java @@ -113,7 +113,7 @@ protected void processFiltered(File file, FileText fileText) { } String previousProp = ""; - var startLineNo = 0; + int startLineNo = 0; final Iterator propertyIterator = properties.keys().asIterator(); @@ -123,7 +123,7 @@ protected void processFiltered(File file, FileText fileText) { if (String.CASE_INSENSITIVE_ORDER.compare(previousProp, propKey) > 0) { - final var lineNo = getLineNumber(startLineNo, fileText, previousProp, propKey); + final int lineNo = getLineNumber(startLineNo, fileText, previousProp, propKey); log(lineNo + 1, MSG_KEY, propKey, previousProp); // start searching at position of the last reported validation startLineNo = lineNo; @@ -147,7 +147,7 @@ protected void processFiltered(File file, FileText fileText) { */ private static int getLineNumber(int startLineNo, FileText fileText, String previousProp, String propKey) { - final var indexOfPreviousProp = getIndex(startLineNo, fileText, previousProp); + final int indexOfPreviousProp = getIndex(startLineNo, fileText, previousProp); return getIndex(indexOfPreviousProp, fileText, propKey); } @@ -161,9 +161,9 @@ private static int getLineNumber(int startLineNo, FileText fileText, */ private static int getIndex(int startLineNo, FileText fileText, String keyName) { final Pattern keyPattern = getKeyPattern(keyName); - var indexNumber = 0; + int indexNumber = 0; final Matcher matcher = keyPattern.matcher(""); - for (var index = startLineNo; index < fileText.size(); index++) { + for (int index = startLineNo; index < fileText.size(); index++) { final String line = fileText.get(index); matcher.reset(line); if (matcher.matches()) { 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 502cd2bbf99c..85991ab27a9e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/SuppressWarningsHolder.java @@ -102,12 +102,12 @@ public class SuppressWarningsHolder * @return the default alias for the given check */ public static String getDefaultAlias(String sourceName) { - var endIndex = sourceName.length(); + int endIndex = sourceName.length(); final String sourceNameLower = sourceName.toLowerCase(Locale.ENGLISH); if (sourceNameLower.endsWith(CHECK_SUFFIX)) { endIndex -= CHECK_SUFFIX.length(); } - final var startIndex = sourceNameLower.lastIndexOf('.') + 1; + final int startIndex = sourceNameLower.lastIndexOf('.') + 1; return sourceNameLower.substring(startIndex, endIndex); } @@ -126,7 +126,7 @@ private static String getSimpleNameAlias(String sourceName) { // check alias for the CheckNameCheck String checkAlias = CHECK_ALIAS_MAP.get(checkName); if (checkAlias == null && checkName.endsWith(checkNameSuffix)) { - final var checkStartIndex = checkName.length() - checkNameSuffix.length(); + final int checkStartIndex = checkName.length() - checkNameSuffix.length(); final String checkNameWithoutSuffix = checkName.substring(0, checkStartIndex); // check alias for the CheckName checkAlias = CHECK_ALIAS_MAP.get(checkNameWithoutSuffix); @@ -177,7 +177,7 @@ private static void registerAlias(String sourceName, String checkAlias) { */ public void setAliasList(String... aliasList) { for (String sourceAlias : aliasList) { - final var index = sourceAlias.indexOf('='); + final int index = sourceAlias.indexOf('='); if (index > 0) { registerAlias(sourceAlias.substring(0, index), sourceAlias .substring(index + 1)); @@ -201,14 +201,14 @@ public static boolean isSuppressed(AuditEvent event) { final List entries = ENTRIES.get(); final String sourceName = event.getSourceName(); final String checkAlias = getAlias(sourceName); - final var line = event.getLine(); - final var column = event.getColumn(); - var suppressed = false; + final int line = event.getLine(); + final int column = event.getColumn(); + boolean suppressed = false; for (Entry entry : entries) { - final var afterStart = isSuppressedAfterEventStart(line, column, entry); - final var beforeEnd = isSuppressedBeforeEventEnd(line, column, entry); + final boolean afterStart = isSuppressedAfterEventStart(line, column, entry); + final boolean beforeEnd = isSuppressedBeforeEventEnd(line, column, entry); final String checkName = entry.checkName(); - final var nameMatches = + final boolean nameMatches = ALL_WARNING_MATCHING_ID.equals(checkName) || checkName.equalsIgnoreCase(checkAlias) || getDefaultAlias(checkName).equalsIgnoreCase(checkAlias) @@ -299,8 +299,8 @@ public void visitToken(DetailAST ast) { */ private static void addSuppressions(List values, DetailAST targetAST) { // get text range of target - final var firstLine = targetAST.getLineNo(); - final var firstColumn = targetAST.getColumnNo(); + final int firstLine = targetAST.getLineNo(); + final int firstColumn = targetAST.getColumnNo(); final DetailAST nextAST = targetAST.getNextSibling(); final int lastLine; final int lastColumn; @@ -350,7 +350,7 @@ private static List getAllAnnotationValues(DetailAST ast) { final DetailAST lparenAST = ast.findFirstToken(TokenTypes.LPAREN); if (lparenAST != null) { final DetailAST nextAST = lparenAST.getNextSibling(); - final var nextType = nextAST.getType(); + final int nextType = nextAST.getType(); switch (nextType) { case TokenTypes.EXPR: case TokenTypes.ANNOTATION_ARRAY_INIT: @@ -404,7 +404,7 @@ private static Optional getAnnotationTarget(DetailAST ast) { */ private static DetailAST getNthChild(DetailAST ast, int index) { DetailAST child = ast.getFirstChild(); - for (var i = 0; i < index && child != null; ++i) { + for (int i = 0; i < index && child != null; ++i) { child = child.getNextSibling(); } return child; 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 4a460580c527..a7a5525ea5df 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java @@ -230,7 +230,7 @@ private void validateUserSpecifiedLanguageCodes(Set languageCodes) { * @return true if user specified language code is correct. */ private static boolean isValidLanguageCode(final String userSpecifiedLanguageCode) { - var valid = false; + boolean valid = false; final Locale[] locales = Locale.getAvailableLocales(); for (Locale locale : locales) { if (userSpecifiedLanguageCode.equals(locale.toString())) { @@ -614,7 +614,7 @@ public void addFile(File file) { * @return true if a resource bundle contains a file which name matches file name regexp. */ public boolean containsFile(String fileNameRegexp) { - var containsFile = false; + boolean containsFile = false; for (File currentFile : files) { if (Pattern.matches(fileNameRegexp, currentFile.getName())) { containsFile = true; 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 a270de64b63e..ef0b0594dd3e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java @@ -224,12 +224,12 @@ private static boolean checkType(DetailAST method) { * @return true if check passed, false otherwise */ private static boolean checkParams(DetailAST method) { - var checkPassed = false; + boolean checkPassed = false; final DetailAST params = method.findFirstToken(TokenTypes.PARAMETERS); if (params.getChildCount() == 1) { final DetailAST parameterType = params.getFirstChild().findFirstToken(TokenTypes.TYPE); - final var isArrayDeclaration = + final boolean isArrayDeclaration = parameterType.findFirstToken(TokenTypes.ARRAY_DECLARATOR) != null; final Optional varargs = Optional.ofNullable( params.getFirstChild().findFirstToken(TokenTypes.ELLIPSIS)); 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 f991d216f43b..59b515fe524c 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheck.java @@ -98,7 +98,7 @@ protected void processFiltered(File file, FileText fileText) { for (Entry duplication : properties .getDuplicatedKeys().entrySet()) { final String keyName = duplication.getKey(); - final var lineNumber = getLineNumber(fileText, keyName); + final int lineNumber = getLineNumber(fileText, keyName); // Number of occurrences is number of duplications + 1 log(lineNumber, MSG_KEY, keyName, duplication.getValue() + 1); } @@ -117,9 +117,9 @@ protected void processFiltered(File file, FileText fileText) { */ private static int getLineNumber(FileText fileText, String keyName) { final Pattern keyPattern = getKeyPattern(keyName); - var lineNumber = 1; + int lineNumber = 1; final Matcher matcher = keyPattern.matcher(""); - for (var index = 0; index < fileText.size(); index++) { + for (int index = 0; index < fileText.size(); index++) { final String line = fileText.get(index); matcher.reset(line); if (matcher.matches()) { 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 7f6007d14907..01e977b44be2 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 @@ -366,7 +366,7 @@ private void checkStyleType(final DetailAST annotation) { * @param annotation the annotation token */ private void checkExpandedStyle(final DetailAST annotation) { - final var valuePairCount = + final int valuePairCount = annotation.getChildCount(TokenTypes.ANNOTATION_MEMBER_VALUE_PAIR); if (valuePairCount == 0 && hasArguments(annotation)) { @@ -391,7 +391,7 @@ private static boolean hasArguments(DetailAST annotation) { * @param annotation the annotation token */ private void checkCompactStyle(final DetailAST annotation) { - final var valuePairCount = + final int valuePairCount = annotation.getChildCount( TokenTypes.ANNOTATION_MEMBER_VALUE_PAIR); 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 e35fbaa5967b..a8819667a69a 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 @@ -134,11 +134,11 @@ public void setViolateExecutionOnNonTightHtml(boolean shouldReportViolation) { public void visitJavadocToken(DetailNode ast) { final DetailAST parentAst = getParent(getBlockCommentAst()); - final var containsAnnotation = + final boolean containsAnnotation = AnnotationUtil.containsAnnotation(parentAst, DEPRECATED) || AnnotationUtil.containsAnnotation(parentAst, FQ_DEPRECATED); - final var containsJavadocTag = containsDeprecatedTag(ast); + final boolean containsJavadocTag = containsDeprecatedTag(ast); if (containsAnnotation ^ containsJavadocTag) { log(parentAst.getLineNo(), MSG_KEY_ANNOTATION_MISSING_DEPRECATED); @@ -152,7 +152,7 @@ public void visitJavadocToken(DetailNode ast) { * @return true if contains the tag */ private boolean containsDeprecatedTag(DetailNode javadoc) { - var found = false; + boolean found = false; DetailNode node = javadoc.getFirstChild(); while (node != null) { if (node.getType() == JavadocCommentsTokenTypes.JAVADOC_BLOCK_TAG @@ -183,7 +183,7 @@ private static DetailAST getParent(DetailAST commentBlock) { } while (true) { - final var type = result.getType(); + final int type = result.getType(); if (TYPES_HASH_SET.get(type)) { result = result.getParent(); } 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 3d5825c98b5c..837f85bfc704 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 @@ -127,13 +127,13 @@ public int[] getRequiredTokens() { @Override public void visitToken(final DetailAST ast) { - final var containsTag = containsInheritDocTag(ast); + final boolean containsTag = containsInheritDocTag(ast); if (containsTag && !JavadocTagInfo.INHERIT_DOC.isValidOn(ast)) { log(ast, MSG_KEY_TAG_NOT_VALID_ON, JavadocTagInfo.INHERIT_DOC.getText()); } else { - var check = true; + boolean check = true; if (javaFiveCompatibility) { final DetailAST defOrNew = ast.getParent().getParent(); 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 38f0ccef07bd..e797916c4108 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 @@ -77,7 +77,7 @@ public int[] getAcceptableTokens() { @Override public void visitToken(final DetailAST ast) { - final var containsAnnotation = + final boolean containsAnnotation = AnnotationUtil.containsAnnotation(ast); if (containsAnnotation && !CheckUtil.isPackageInfo(getFilePath())) { 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 8aede6e33470..34efca5eb854 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 @@ -163,11 +163,11 @@ private boolean hasText(final DetailAST slistAST) { else { rcurlyAST = rightCurly; } - final var slistLineNo = slistAST.getLineNo(); - final var slistColNo = slistAST.getColumnNo(); - final var rcurlyLineNo = rcurlyAST.getLineNo(); - final var rcurlyColNo = rcurlyAST.getColumnNo(); - var returnValue = false; + final int slistLineNo = slistAST.getLineNo(); + final int slistColNo = slistAST.getColumnNo(); + final int rcurlyLineNo = rcurlyAST.getLineNo(); + final int rcurlyColNo = rcurlyAST.getColumnNo(); + boolean returnValue = false; if (slistLineNo == rcurlyLineNo) { // Handle braces on the same line final int[] txt = Arrays.copyOfRange(getLineCodePoints(slistLineNo - 1), @@ -201,8 +201,8 @@ private boolean hasText(final DetailAST slistAST) { * @return true if lines contain only whitespaces */ private boolean checkIsAllLinesAreWhitespace(int lineFrom, int lineTo) { - var result = true; - for (var i = lineFrom; i < lineTo - 1; i++) { + boolean result = true; + for (int i = lineFrom; i < lineTo - 1; i++) { if (!CodePointUtil.isBlank(getLineCodePoints(i))) { result = false; break; @@ -219,7 +219,7 @@ private boolean checkIsAllLinesAreWhitespace(int lineFrom, int lineTo) { */ private static Optional getLeftCurly(DetailAST ast) { final DetailAST parent = ast.getParent(); - final var parentType = parent.getType(); + final int parentType = parent.getType(); final Optional leftCurly; if (parentType == TokenTypes.SWITCH_RULE) { 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 53f6280738ec..f039382546af 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 @@ -173,9 +173,9 @@ else if (firstElementInBlock.getType() == TokenTypes.BLOCK_COMMENT_BEGIN) { */ private boolean isVerifiable(DetailAST emptyCatchAst, String commentContent) { final String variableName = getExceptionVariableName(emptyCatchAst); - final var isMatchingVariableName = exceptionVariableName + final boolean isMatchingVariableName = exceptionVariableName .matcher(variableName).find(); - final var isMatchingCommentContent = !commentContent.isEmpty() + final boolean isMatchingCommentContent = !commentContent.isEmpty() && commentFormat.matcher(commentContent).find(); return !isMatchingVariableName && !isMatchingCommentContent; } @@ -187,7 +187,7 @@ private boolean isVerifiable(DetailAST emptyCatchAst, String commentContent) { * @return true if catch block is empty. */ private static boolean isEmptyCatchBlock(DetailAST catchAst) { - var result = true; + boolean result = true; final DetailAST slistToken = catchAst.findFirstToken(TokenTypes.SLIST); DetailAST catchBlockStmt = slistToken.getFirstChild(); while (catchBlockStmt.getType() != TokenTypes.RCURLY) { 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 5c246afa744b..1e2e404ad38c 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 @@ -110,7 +110,7 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { - final var hasNoSlist = ast.findFirstToken(TokenTypes.SLIST) == null; + final boolean hasNoSlist = ast.findFirstToken(TokenTypes.SLIST) == null; if (hasNoSlist && !isSkipStatement(ast) && isBracesNeeded(ast)) { log(ast, MSG_KEY_NEED_BRACES, ast.getText()); } @@ -161,7 +161,7 @@ private boolean isEmptyLoopBodyAllowed(DetailAST ast) { */ private static boolean hasUnbracedStatements(DetailAST ast) { final DetailAST nextSibling = ast.getNextSibling(); - var result = false; + boolean result = false; if (isInSwitchRule(ast)) { final DetailAST parent = ast.getParent(); @@ -231,7 +231,7 @@ private static boolean isSingleLineStatement(DetailAST statement) { * @return true if current while statement is single-line statement. */ private static boolean isSingleLineWhile(DetailAST literalWhile) { - var result = false; + boolean result = false; if (literalWhile.getParent().getType() == TokenTypes.SLIST) { final DetailAST block = literalWhile.getLastChild().getPreviousSibling(); result = TokenUtil.areOnSameLine(literalWhile, block); @@ -252,7 +252,7 @@ private static boolean isSingleLineWhile(DetailAST literalWhile) { * @return true if current do-while statement is single-line statement. */ private static boolean isSingleLineDoWhile(DetailAST literalDo) { - var result = false; + boolean result = false; if (literalDo.getParent().getType() == TokenTypes.SLIST) { final DetailAST block = literalDo.getFirstChild(); result = TokenUtil.areOnSameLine(block, literalDo); @@ -273,7 +273,7 @@ private static boolean isSingleLineDoWhile(DetailAST literalDo) { * @return true if current for statement is single-line statement. */ private static boolean isSingleLineFor(DetailAST literalFor) { - var result = false; + boolean result = false; if (literalFor.getLastChild().getType() == TokenTypes.EMPTY_STAT) { result = true; } @@ -296,7 +296,7 @@ else if (literalFor.getParent().getType() == TokenTypes.SLIST) { * @return true if current if statement is single-line statement. */ private static boolean isSingleLineIf(DetailAST literalIf) { - var result = false; + boolean result = false; if (literalIf.getParent().getType() == TokenTypes.SLIST) { final DetailAST literalIfLastChild = literalIf.getLastChild(); final DetailAST block; 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 069ce5dec798..829632571382 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 @@ -264,7 +264,7 @@ private static boolean isAloneOnLine(Details details, String targetSrcLine) { * @return if the double brace initialization rcurly should be skipped over by the check */ private static boolean skipDoubleBraceInstInit(Details details) { - var skipDoubleBraceInstInit = false; + boolean skipDoubleBraceInstInit = false; final DetailAST tokenAfterNextToken = Details.getNextToken(details.nextToken()); if (tokenAfterNextToken != null) { final DetailAST rcurly = details.rcurly(); @@ -398,7 +398,7 @@ private static Details getDetailsForSwitch(DetailAST switchNode) { */ private static Details getDetailsForCase(DetailAST caseNode) { final DetailAST caseParent = caseNode.getParent(); - final var parentType = caseParent.getType(); + final int parentType = caseParent.getType(); final Optional lcurly; final DetailAST statementList; @@ -430,7 +430,7 @@ private static Details getDetailsForCase(DetailAST caseNode) { */ private static boolean isSwitchExpression(DetailAST switchNode) { DetailAST currentNode = switchNode; - var ans = false; + boolean ans = false; while (currentNode != null) { if (currentNode.getType() == TokenTypes.EXPR) { @@ -450,7 +450,7 @@ private static boolean isSwitchExpression(DetailAST switchNode) { private static Details getDetailsForTryCatch(DetailAST ast) { final DetailAST lcurly; DetailAST nextToken; - final var tokenType = ast.getType(); + final int tokenType = ast.getType(); if (tokenType == TokenTypes.LITERAL_TRY) { if (ast.getFirstChild().getType() == TokenTypes.RESOURCE_SPECIFICATION) { lcurly = ast.getFirstChild().getNextSibling(); @@ -516,7 +516,7 @@ private static Details getDetailsForIf(DetailAST ast) { private static Details getDetailsForOthers(DetailAST ast) { DetailAST rcurly = null; final DetailAST lcurly; - final var tokenType = ast.getType(); + final int tokenType = ast.getType(); if (isTokenWithNoChildSlist(tokenType)) { final DetailAST child = ast.getLastChild(); lcurly = child; 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 bb7e9b1cb35f..77840bfdae13 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 @@ -96,7 +96,7 @@ else if (isSuperCall(ast)) { * @return true if ast is a call to the super method for this check. */ private boolean isSuperCall(DetailAST literalSuperAst) { - var superCall = false; + boolean superCall = false; if (!isSameNameMethod(literalSuperAst)) { final DetailAST parent = literalSuperAst.getParent(); @@ -115,7 +115,7 @@ private boolean isSuperCall(DetailAST literalSuperAst) { * @return true if super call in overriding method. */ private boolean isSuperCallInOverridingMethod(DetailAST ast) { - var inOverridingMethod = false; + boolean inOverridingMethod = false; DetailAST dotAst = ast; while (dotAst.getType() != TokenTypes.CTOR_DEF @@ -178,7 +178,7 @@ public void leaveToken(DetailAST ast) { * @return true if the method of ast is a method for this check. */ private boolean isOverridingMethod(DetailAST ast) { - var overridingMethod = false; + boolean overridingMethod = false; if (ast.getType() == TokenTypes.METHOD_DEF && !ScopeUtil.isInInterfaceOrAnnotationBlock(ast)) { 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 9647366630e5..981d147fb731 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 @@ -108,7 +108,7 @@ && hasOnlyInitialization(ast)) { * false otherwise */ private static boolean hasOnlyInitialization(DetailAST objBlock) { - final var hasInitBlock = objBlock.findFirstToken(TokenTypes.INSTANCE_INIT) != null; + final boolean hasInitBlock = objBlock.findFirstToken(TokenTypes.INSTANCE_INIT) != null; return hasInitBlock && TokenUtil.findFirstTokenByPredicate(objBlock, HAS_MEMBERS).isEmpty(); } 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 970ef5907f93..ac5a91348a7f 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 @@ -88,7 +88,7 @@ public void visitToken(DetailAST ast) { final DetailAST defaultGroupAST = ast.getParent(); // Switch rules are not subject to fall through. - final var isSwitchRule = defaultGroupAST.getType() == TokenTypes.SWITCH_RULE; + final boolean isSwitchRule = defaultGroupAST.getType() == TokenTypes.SWITCH_RULE; if (skipIfLastAndSharedWithCase && !isSwitchRule) { if (isNextSiblingOf(ast, TokenTypes.LITERAL_CASE)) { 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 e03ee93d0b76..90d62f4bfe6a 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 @@ -144,7 +144,7 @@ public void visitToken(final DetailAST ast) { case TokenTypes.LITERAL_NEW -> processLiteralNew(ast); case TokenTypes.OBJBLOCK -> { - final var parentType = ast.getParent().getType(); + final int parentType = ast.getParent().getType(); if (!astTypeIsClassOrEnumOrRecordDef(parentType)) { processFrame(ast); } @@ -162,7 +162,7 @@ public void leaveToken(DetailAST ast) { case TokenTypes.LITERAL_NEW -> leaveLiteralNew(ast); case TokenTypes.OBJBLOCK -> { - final var parentType = ast.getParent().getType(); + final int parentType = ast.getParent().getType(); if (!astTypeIsClassOrEnumOrRecordDef(parentType)) { currentFrame = currentFrame.getParent(); } @@ -218,7 +218,7 @@ private void leaveSlist(DetailAST ast) { */ private void processFrame(DetailAST ast) { final FieldFrame frame = new FieldFrame(currentFrame); - final var astType = ast.getType(); + final int astType = ast.getType(); if (astTypeIsClassOrEnumOrRecordDef(astType)) { frame.setClassOrEnumOrRecordDef(true); frame.setFrameName(ast.findFirstToken(TokenTypes.IDENT).getText()); @@ -329,7 +329,7 @@ private static boolean containsAllSafeTokens(final DetailAST expr) { DetailAST arg = expr.getFirstChild(); arg = skipVariableAssign(arg); - var argIsNotNull = false; + boolean argIsNotNull = false; if (arg.getType() == TokenTypes.PLUS) { DetailAST child = arg.getFirstChild(); while (child != null @@ -396,7 +396,7 @@ private boolean isCalledOnStringFieldOrVariable(DetailAST objCalledOn) { * @return true if the field or the variable is of String type. */ private boolean isStringFieldOrVariable(DetailAST objCalledOn) { - var result = false; + boolean result = false; final String name = objCalledOn.getText(); FieldFrame frame = currentFrame; while (frame != null) { @@ -433,7 +433,7 @@ private boolean isStringFieldOrVariableFromThisInstance(DetailAST objCalledOn) { */ private boolean isStringFieldOrVariableFromClass(DetailAST objCalledOn, final String className) { - var result = false; + boolean result = false; final String name = objCalledOn.getText(); FieldFrame frame = currentFrame; while (frame != null) { 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 c6efbd8cac0c..04c069269f23 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 @@ -113,7 +113,7 @@ private void validateNonObjects(DetailAST ast) { final DetailAST exprStart = assign.getFirstChild().getFirstChild(); final DetailAST type = ast.findFirstToken(TokenTypes.TYPE); - final var primitiveType = type.getFirstChild().getType(); + final int primitiveType = type.getFirstChild().getType(); if (primitiveType == TokenTypes.LITERAL_BOOLEAN && exprStart.getType() == TokenTypes.LITERAL_FALSE) { log(ident, MSG_KEY, ident.getText(), "false"); @@ -145,7 +145,7 @@ private static boolean isZeroChar(DetailAST exprStart) { * @return true is that is a case that need to be skipped. */ private static boolean isSkipCase(DetailAST ast) { - var skipCase = true; + boolean skipCase = true; // do not check local variables and // fields declared in interface/annotations @@ -184,7 +184,7 @@ private static boolean isNumericType(int type) { * @return true if given node contains numeric constant for zero. */ private static boolean isZero(DetailAST expr) { - final var type = expr.getType(); + final int type = expr.getType(); return switch (type) { case TokenTypes.NUM_FLOAT, TokenTypes.NUM_DOUBLE, TokenTypes.NUM_INT, TokenTypes.NUM_LONG -> { 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 f8bb3311d256..8b9836663b5e 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 @@ -126,7 +126,7 @@ public void setCheckLastCaseGroup(boolean value) { @Override public void visitToken(DetailAST ast) { final DetailAST nextGroup = ast.getNextSibling(); - final var isLastGroup = nextGroup.getType() != TokenTypes.CASE_GROUP; + final boolean isLastGroup = nextGroup.getType() != TokenTypes.CASE_GROUP; if (!isLastGroup || checkLastCaseGroup) { final DetailAST slist = ast.findFirstToken(TokenTypes.SLIST); @@ -299,7 +299,7 @@ private boolean checkLoop(final DetailAST ast, Set labels) { private boolean checkTry(final DetailAST ast, boolean useBreak, boolean useContinue, Set labels) { final DetailAST finalStmt = ast.getLastChild(); - var isTerminated = finalStmt.getType() == TokenTypes.LITERAL_FINALLY + boolean isTerminated = finalStmt.getType() == TokenTypes.LITERAL_FINALLY && isTerminated(finalStmt.findFirstToken(TokenTypes.SLIST), useBreak, useContinue, labels); @@ -338,7 +338,7 @@ && isTerminated(finalStmt.findFirstToken(TokenTypes.SLIST), private boolean checkSwitch(DetailAST literalSwitchAst, boolean useContinue, Set labels) { DetailAST caseGroup = literalSwitchAst.findFirstToken(TokenTypes.CASE_GROUP); - var isTerminated = caseGroup != null; + boolean isTerminated = caseGroup != null; while (isTerminated && caseGroup.getType() != TokenTypes.RCURLY) { final DetailAST caseBody = caseGroup.findFirstToken(TokenTypes.SLIST); @@ -410,9 +410,9 @@ private boolean hasFallThroughComment(DetailAST currentCase) { */ private boolean hasReliefComment(DetailAST ast) { final DetailAST nonCommentAst = getNextNonCommentAst(ast); - var result = false; + boolean result = false; if (nonCommentAst != null) { - final var prevLineNumber = nonCommentAst.getPreviousSibling().getLineNo(); + final int prevLineNumber = nonCommentAst.getPreviousSibling().getLineNo(); result = Stream.iterate(nonCommentAst.getPreviousSibling(), Objects::nonNull, DetailAST::getPreviousSibling) 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 ee7294049f5e..7b28a4c2b8b1 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 @@ -221,7 +221,7 @@ && shouldCheckUnnamedVariable(ast)) { } case TokenTypes.IDENT -> { - final var parentType = ast.getParent().getType(); + final int parentType = ast.getParent().getType(); if (isAssignOperator(parentType) && isFirstChild(ast)) { final Optional candidate = getFinalCandidate(ast); if (candidate.isPresent()) { @@ -263,7 +263,7 @@ && shouldUpdateUninitializedVariables(parentAst)) { } case TokenTypes.SLIST -> { - var containsBreak = false; + boolean containsBreak = false; if (parentAst.getType() != TokenTypes.CASE_GROUP || findLastCaseGroupWhichContainsSlist(parentAst.getParent()) == parentAst) { @@ -334,10 +334,10 @@ private static void determineAssignmentConditions(DetailAST ident, * @return true if the scope of a node is restricted to specific code block types. */ private static boolean isInSpecificCodeBlocks(DetailAST node, int... blockTypes) { - var returnValue = false; + boolean returnValue = false; for (int blockType : blockTypes) { for (DetailAST token = node; token != null; token = token.getParent()) { - final var type = token.getType(); + final int type = token.getType(); if (type == blockType) { returnValue = true; break; @@ -378,7 +378,7 @@ private void storePrevScopeUninitializedVariableData() { * Update current scope data uninitialized variable according to the whole scope data. */ private void updateAllUninitializedVariables() { - final var hasSomeScopes = !currentScopeAssignedVariables.isEmpty(); + final boolean hasSomeScopes = !currentScopeAssignedVariables.isEmpty(); if (hasSomeScopes) { scopeStack.forEach(scopeData -> { updateUninitializedVariables(scopeData.prevScopeUninitializedVariables); @@ -395,7 +395,7 @@ private void updateUninitializedVariables(Deque scopeUninitializedVar final Iterator iterator = currentScopeAssignedVariables.peek().iterator(); while (iterator.hasNext()) { final DetailAST assignedVariable = iterator.next(); - var shouldRemove = false; + boolean shouldRemove = false; for (DetailAST variable : scopeUninitializedVariableData) { for (ScopeData scopeData : scopeStack) { final FinalVariableCandidate candidate = @@ -438,7 +438,7 @@ private static boolean shouldUpdateUninitializedVariables(DetailAST ast) { * following, else false */ private static boolean isCaseTokenWithAnotherCaseFollowing(DetailAST ast) { - var result = false; + boolean result = false; if (ast.getType() == TokenTypes.CASE_GROUP) { result = findLastCaseGroupWhichContainsSlist(ast.getParent()) != ast; } @@ -580,7 +580,7 @@ private static boolean isMultipleTypeCatch(DetailAST parameterDefAst) { * @return true, if the variable should be removed. */ private static boolean shouldRemoveFinalVariableCandidate(ScopeData scopeData, DetailAST ast) { - var shouldRemove = true; + boolean shouldRemove = true; for (DetailAST variable : scopeData.uninitializedVariables) { if (variable.getText().equals(ast.getText())) { // if the variable is declared outside the loop and initialized inside 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 b874c26ac05a..8d794f0f8341 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 @@ -297,7 +297,7 @@ private boolean isSamePackage(String className, int pkgNameLen, String illegal) * @return true if type is standard */ private boolean isStandardClass(String className, String illegal) { - var isStandardClass = false; + boolean isStandardClass = false; // class from java.lang if (illegal.length() - JAVA_LANG.length() == className.length() && illegal.endsWith(className) @@ -308,7 +308,7 @@ private boolean isStandardClass(String className, String illegal) { // the expression "new Boolean()" refers to that class, // not to java.lang.Boolean - final var isSameFile = classNames.contains(className); + final boolean isSameFile = classNames.contains(className); if (!isSameFile) { isStandardClass = true; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingNullCaseInSwitchCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingNullCaseInSwitchCheck.java index eec7875954fa..7996ff81f84b 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingNullCaseInSwitchCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingNullCaseInSwitchCheck.java @@ -94,12 +94,12 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { final List caseLabels = getAllCaseLabels(ast); - final var hasNullCaseLabel = caseLabels.stream() + final boolean hasNullCaseLabel = caseLabels.stream() .anyMatch(MissingNullCaseInSwitchCheck::hasLiteralNull); if (!hasNullCaseLabel) { - final var hasPatternCaseLabel = caseLabels.stream() + final boolean hasPatternCaseLabel = caseLabels.stream() .anyMatch(MissingNullCaseInSwitchCheck::hasPatternCaseLabel); - final var hasStringCaseLabel = caseLabels.stream() + final boolean hasStringCaseLabel = caseLabels.stream() .anyMatch(MissingNullCaseInSwitchCheck::hasStringCaseLabel); if (hasPatternCaseLabel || hasStringCaseLabel) { log(ast, MSG_KEY); @@ -159,8 +159,8 @@ private static boolean hasPatternCaseLabel(DetailAST caseAST) { */ private static boolean hasStringCaseLabel(DetailAST caseAST) { DetailAST curNode = caseAST; - var hasStringCaseLabel = false; - var exitCaseLabelExpression = false; + boolean hasStringCaseLabel = false; + boolean exitCaseLabelExpression = false; while (!exitCaseLabelExpression) { DetailAST toVisit = curNode.getFirstChild(); if (curNode.getType() == TokenTypes.STRING_LITERAL) { 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 c9c69b18e2fe..997fd1bc5809 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 @@ -136,7 +136,7 @@ public final void setIgnoreStringsRegexp(Pattern ignoreStringsRegexp) { public final void setIgnoreOccurrenceContext(String... strRep) { ignoreOccurrenceContext.clear(); for (final String s : strRep) { - final var type = TokenUtil.getTokenId(s); + final int type = TokenUtil.getTokenId(s); ignoreOccurrenceContext.set(type); } } @@ -188,9 +188,9 @@ public void visitToken(DetailAST ast) { * token type in {@link #ignoreOccurrenceContext}. */ private boolean isInIgnoreOccurrenceContext(DetailAST ast) { - var isInIgnoreOccurrenceContext = false; + boolean isInIgnoreOccurrenceContext = false; for (DetailAST token = ast; token != null; token = token.getParent()) { - final var type = token.getType(); + final int type = token.getType(); if (ignoreOccurrenceContext.get(type)) { isInIgnoreOccurrenceContext = true; break; 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 aaa75cdba895..1ed2cdd10128 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 @@ -76,7 +76,7 @@ public void visitToken(DetailAST ast) { DetailAST nextNode = ast.getNextSibling(); if (nextNode != null) { - final var isCommaSeparated = nextNode.getType() == TokenTypes.COMMA; + final boolean isCommaSeparated = nextNode.getType() == TokenTypes.COMMA; if (isCommaSeparated || nextNode.getType() == TokenTypes.SEMI) { 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 f7b7ea0fc38f..2e9651bef2b1 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 @@ -75,7 +75,7 @@ public void visitToken(DetailAST ast) { if ("finalize".equals(name)) { final DetailAST params = ast.findFirstToken(TokenTypes.PARAMETERS); - final var hasEmptyParamList = + final boolean hasEmptyParamList = params.findFirstToken(TokenTypes.PARAMETER_DEF) == null; if (hasEmptyParamList) { 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 26dac54d5c8f..35b042783224 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 @@ -180,7 +180,7 @@ public void leaveToken(DetailAST ast) { private void checkIfSemicolonIsInDifferentLineThanPrevious(DetailAST ast) { DetailAST currentStatement = ast; final DetailAST previousSibling = ast.getPreviousSibling(); - final var isUnnecessarySemicolon = previousSibling == null + final boolean isUnnecessarySemicolon = previousSibling == null || previousSibling.getType() == TokenTypes.RESOURCES || ast.getParent().getType() == TokenTypes.COMPILATION_UNIT; if (!isUnnecessarySemicolon) { @@ -205,7 +205,7 @@ else if (!inForHeader && isOnTheSameLine(currentStatement, lastStatementEnd, * @param currentStatement current statement */ private void checkLambda(DetailAST ast, DetailAST currentStatement) { - var countOfSemiInCurrentLambda = countOfSemiInLambda.pop(); + int countOfSemiInCurrentLambda = countOfSemiInLambda.pop(); countOfSemiInCurrentLambda++; countOfSemiInLambda.push(countOfSemiInCurrentLambda); if (!inForHeader && countOfSemiInCurrentLambda > 1 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 a808543b9739..a1cc1d4fc4ee 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 @@ -65,7 +65,7 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { - final var parentType = ast.getParent().getType(); + final int parentType = ast.getParent().getType(); final int[] tokenTypes = { TokenTypes.CLASS_DEF, @@ -88,11 +88,11 @@ public void visitToken(DetailAST ast) { * is a class, interface or enum object block. */ private void checkOverloadMethodsGrouping(DetailAST objectBlock) { - final var allowedDistance = 1; + final int allowedDistance = 1; DetailAST currentToken = objectBlock.getFirstChild(); final Map methodIndexMap = new HashMap<>(); final Map methodLineNumberMap = new HashMap<>(); - var currentIndex = 0; + int currentIndex = 0; while (currentToken != null) { if (currentToken.getType() == TokenTypes.METHOD_DEF) { currentIndex++; @@ -100,11 +100,11 @@ private void checkOverloadMethodsGrouping(DetailAST objectBlock) { currentToken.findFirstToken(TokenTypes.IDENT).getText(); final Integer previousIndex = methodIndexMap.get(methodName); final DetailAST previousSibling = currentToken.getPreviousSibling(); - final var isMethod = previousSibling.getType() == TokenTypes.METHOD_DEF; + final boolean isMethod = previousSibling.getType() == TokenTypes.METHOD_DEF; if (previousIndex != null && (!isMethod || currentIndex - previousIndex > allowedDistance)) { - final var previousLineWithOverloadMethod = + final int previousLineWithOverloadMethod = methodLineNumberMap.get(methodName); log(currentToken, MSG_KEY, previousLineWithOverloadMethod); 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 e7494ddcd550..79124654dd18 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 @@ -129,7 +129,7 @@ public void visitToken(DetailAST ast) { */ private String getDirectoryName() { final String fileName = getFilePath(); - final var lastSeparatorPos = fileName.lastIndexOf(File.separatorChar); + final int lastSeparatorPos = fileName.lastIndexOf(File.separatorChar); return fileName.substring(0, lastSeparatorPos); } 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 0fc12a7b8764..2af045f6046f 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 @@ -106,7 +106,7 @@ public void beginTree(DetailAST rootAST) { @Override public void visitToken(DetailAST ast) { - final var type = ast.getType(); + final int type = ast.getType(); if (TokenUtil.isOfType(type, TokenTypes.CTOR_DEF, TokenTypes.METHOD_DEF)) { visitMethodDef(ast); } @@ -122,7 +122,7 @@ else if (type == TokenTypes.LAMBDA) { @Override public void leaveToken(DetailAST ast) { - final var type = ast.getType(); + final int type = ast.getType(); if (TokenUtil.isOfType(type, TokenTypes.CTOR_DEF, TokenTypes.METHOD_DEF) || type == TokenTypes.LAMBDA && ast.getParent().getType() != TokenTypes.SWITCH_RULE) { 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 eaa8844f4ea3..26d0bad879ff 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 @@ -262,7 +262,7 @@ public void leaveToken(DetailAST ast) { * @param ast IDENT to check. */ private void processIdent(DetailAST ast) { - var parentType = ast.getParent().getType(); + int parentType = ast.getParent().getType(); if (parentType == TokenTypes.EXPR && ast.getParent().getParent().getParent().getType() == TokenTypes.ANNOTATION_FIELD_DEF) { @@ -284,7 +284,7 @@ private void processIdent(DetailAST ast) { default -> { if (checkFields) { final AbstractFrame frame = getFieldWithoutThis(ast, parentType); - final var canUseThis = !isInCompactConstructor(ast); + final boolean canUseThis = !isInCompactConstructor(ast); if (frame != null && canUseThis) { logViolation(MSG_VARIABLE, ast, frame); } @@ -319,8 +319,8 @@ else if (!(frame instanceof AnonymousClassFrame)) { * 'this' and null otherwise. */ private AbstractFrame getFieldWithoutThis(DetailAST ast, int parentType) { - final var importOrPackage = ScopeUtil.getSurroundingScope(ast) == null; - final var typeName = parentType == TokenTypes.TYPE + final boolean importOrPackage = ScopeUtil.getSurroundingScope(ast) == null; + final boolean typeName = parentType == TokenTypes.TYPE || parentType == TokenTypes.LITERAL_NEW; AbstractFrame frame = null; @@ -344,7 +344,7 @@ private AbstractFrame getFieldWithoutThis(DetailAST ast, int parentType) { * @return true if ast is in a COMPACT_CTOR_DEF, false otherwise */ private static boolean isInCompactConstructor(DetailAST ast) { - var isInCompactCtor = false; + boolean isInCompactCtor = false; DetailAST parent = ast; while (parent != null) { if (parent.getType() == TokenTypes.COMPACT_CTOR_DEF) { @@ -604,7 +604,7 @@ private static boolean isUserDefinedArrangementOfThis(AbstractFrame currentFrame final DetailAST blockStartToken = definitionToken.findFirstToken(TokenTypes.SLIST); final DetailAST blockEndToken = getBlockEndToken(blockFrameNameIdent, blockStartToken); - var userDefinedArrangementOfThis = false; + boolean userDefinedArrangementOfThis = false; final Set variableUsagesInsideBlock = getAllTokensWhichAreEqualToCurrent(definitionToken, ident, @@ -675,7 +675,7 @@ private static boolean isReturnedVariable(AbstractFrame currentFrame, DetailAST * @return {@code true} if the {@code ast} was found. */ private static boolean isAstInside(DetailAST tree, DetailAST ast) { - var result = false; + boolean result = false; if (isAstSimilar(tree, ast)) { result = true; @@ -697,7 +697,7 @@ private static boolean isAstInside(DetailAST tree, DetailAST ast) { * @return true if field can be referenced from a static context. */ private static boolean canBeReferencedFromStaticContext(DetailAST ident) { - var staticContext = false; + boolean staticContext = false; final DetailAST codeBlockDefinition = getCodeBlockDefinitionToken(ident); if (codeBlockDefinition != null) { @@ -735,10 +735,10 @@ private static DetailAST getCodeBlockDefinitionToken(DetailAST ident) { */ private boolean canAssignValueToClassField(DetailAST ast) { final AbstractFrame fieldUsageFrame = findFrame(ast, false); - final var fieldUsageInConstructor = isInsideConstructorFrame(fieldUsageFrame); + final boolean fieldUsageInConstructor = isInsideConstructorFrame(fieldUsageFrame); final AbstractFrame declarationFrame = findFrame(ast, true); - final var finalField = ((ClassFrame) declarationFrame).hasFinalField(ast); + final boolean finalField = ((ClassFrame) declarationFrame).hasFinalField(ast); return fieldUsageInConstructor || !finalField; } @@ -764,7 +764,7 @@ private static boolean isInsideConstructorFrame(AbstractFrame frame) { * @return true if an overlapping by method or constructor argument takes place. */ private boolean isOverlappingByArgument(DetailAST ast) { - var overlapping = false; + boolean overlapping = false; final DetailAST parent = ast.getParent(); final DetailAST sibling = ast.getNextSibling(); if (sibling != null && isAssignToken(parent.getType())) { @@ -787,7 +787,7 @@ private boolean isOverlappingByArgument(DetailAST ast) { * @return true if an overlapping by local variable takes place. */ private boolean isOverlappingByLocalVariable(DetailAST ast) { - var overlapping = false; + boolean overlapping = false; final DetailAST parent = ast.getParent(); if (isAssignToken(parent.getType())) { final ClassFrame classFrame = (ClassFrame) findFrame(ast, true); @@ -1179,7 +1179,7 @@ && containsFieldOrVariable(identToFind)) { * IDENT ast and it is declared in a proper position. */ protected boolean containsFieldOrVariableDef(Set set, DetailAST ident) { - var result = false; + boolean result = false; for (DetailAST ast: set) { if (isProperDefinition(ident, ast)) { result = true; @@ -1356,7 +1356,7 @@ public boolean hasStaticMethod(final DetailAST ident) { * @return true if given instance member has final modifier. */ public boolean hasFinalField(final DetailAST instanceMember) { - var result = false; + boolean result = false; for (DetailAST member : instanceMembers) { final DetailAST parent = member.getParent(); if (parent.getType() == TokenTypes.RECORD_COMPONENT_DEF) { @@ -1364,7 +1364,7 @@ public boolean hasFinalField(final DetailAST instanceMember) { } else { final DetailAST mods = parent.findFirstToken(TokenTypes.MODIFIERS); - final var finalMod = mods.findFirstToken(TokenTypes.FINAL) != null; + final boolean finalMod = mods.findFirstToken(TokenTypes.FINAL) != null; if (finalMod && isAstSimilar(member, instanceMember)) { result = true; } @@ -1420,7 +1420,7 @@ private boolean containsMethod(DetailAST methodToFind) { * same name and number of parameters. */ private static boolean containsMethodDef(Set set, DetailAST ident) { - var result = false; + boolean result = false; for (DetailAST ast: set) { if (isSimilarSignature(ident, ast)) { result = true; @@ -1439,12 +1439,12 @@ private static boolean containsMethodDef(Set set, DetailAST ident) { * as the method call. */ private static boolean isSimilarSignature(DetailAST ident, DetailAST ast) { - var result = false; + boolean result = false; final DetailAST elistToken = ident.getParent().findFirstToken(TokenTypes.ELIST); if (elistToken != null && ident.getText().equals(ast.getText())) { - final var paramsNumber = + final int paramsNumber = ast.getParent().findFirstToken(TokenTypes.PARAMETERS).getChildCount(); - final var argsNumber = elistToken.getChildCount(); + final int argsNumber = elistToken.getChildCount(); result = paramsNumber == argsNumber; } return result; 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 cca2c9f9ace2..59fdc6844af9 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 @@ -180,7 +180,7 @@ public void leaveToken(DetailAST ast) { private void visitMethodDef(DetailAST ast) { contextStack.push(context); final DetailAST methodNameAST = ast.findFirstToken(TokenTypes.IDENT); - final var check = !format.matcher(methodNameAST.getText()).find(); + final boolean check = !format.matcher(methodNameAST.getText()).find(); context = new Context(check); } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/TextBlockGoogleStyleFormattingCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/TextBlockGoogleStyleFormattingCheck.java index 5fc1274a8093..90a4fa74e4f9 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/TextBlockGoogleStyleFormattingCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/TextBlockGoogleStyleFormattingCheck.java @@ -127,7 +127,7 @@ private static DetailAST getClosingQuotes(DetailAST ast) { */ private static boolean openingQuotesAreAloneOnTheLine(DetailAST openingQuotes) { DetailAST parent = openingQuotes; - var quotesAreNotPreceded = true; + boolean quotesAreNotPreceded = true; while (quotesAreNotPreceded || parent.getType() == TokenTypes.ELIST || parent.getType() == TokenTypes.EXPR) { @@ -179,7 +179,7 @@ private static boolean quotesArePrecededWithComma(DetailAST openingQuotes) { private static boolean closingQuotesAreAloneOnTheLine(DetailAST closingQuotes) { final DetailAST content = closingQuotes.getPreviousSibling(); final String text = content.getText(); - var index = text.length() - 1; + int index = text.length() - 1; while (text.charAt(index) == ' ') { index--; } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryNullCheckWithInstanceOfCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryNullCheckWithInstanceOfCheck.java index 837e6ec88696..77cc99fe2e81 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryNullCheckWithInstanceOfCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryNullCheckWithInstanceOfCheck.java @@ -125,7 +125,7 @@ else if (nullCheckNode == null && currentChild.getType() == TokenTypes.LAND) { */ private static boolean containsVariableDereference(DetailAST node, String variableName) { - var found = false; + boolean found = false; if (node.getType() == TokenTypes.DOT || node.getType() == TokenTypes.METHOD_CALL || node.getType() == TokenTypes.LAND) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLambdaParameterShouldBeUnnamedCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLambdaParameterShouldBeUnnamedCheck.java index 78fc908eed77..be7b6da27a54 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLambdaParameterShouldBeUnnamedCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnusedLambdaParameterShouldBeUnnamedCheck.java @@ -165,7 +165,7 @@ public void leaveToken(DetailAST ast) { */ private static boolean isLambdaParameterIdentifierCandidate(DetailAST identifierAst) { // we should ignore the ident if it is in the lambda parameters declaration - final var isLambdaParameterDeclaration = + final boolean isLambdaParameterDeclaration = identifierAst.getParent().getType() == TokenTypes.LAMBDA || identifierAst.getParent().getType() == TokenTypes.PARAMETER_DEF; 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 38e15c294f73..aafbb22d2406 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 @@ -247,7 +247,7 @@ public void beginTree(DetailAST root) { @Override public void visitToken(DetailAST ast) { - final var type = ast.getType(); + final int type = ast.getType(); if (type == TokenTypes.DOT) { visitDotToken(ast, variables); } @@ -316,11 +316,11 @@ private void visitVariableDefToken(DetailAST varDefAst) { */ private static void visitIdentToken(DetailAST identAst, Deque variablesStack) { final DetailAST parent = identAst.getParent(); - final var isMethodReferenceMethodName = parent.getType() == TokenTypes.METHOD_REF + final boolean isMethodReferenceMethodName = parent.getType() == TokenTypes.METHOD_REF && parent.getFirstChild() != identAst; - final var isConstructorReference = parent.getType() == TokenTypes.METHOD_REF + final boolean isConstructorReference = parent.getType() == TokenTypes.METHOD_REF && parent.getLastChild().getType() == TokenTypes.LITERAL_NEW; - final var isNestedClassInitialization = + final boolean isNestedClassInitialization = TokenUtil.isOfType(identAst.getNextSibling(), TokenTypes.LITERAL_NEW) && parent.getType() == TokenTypes.DOT; @@ -374,7 +374,7 @@ private boolean skipUnnamedVariables(DetailAST varDefAst) { * @return true if variableDefAst is an instance variable in local anonymous inner class */ private static boolean isInsideLocalAnonInnerClass(DetailAST literalNewAst) { - var result = false; + boolean result = false; final DetailAST lastChild = literalNewAst.getLastChild(); if (lastChild != null && lastChild.getType() == TokenTypes.OBJBLOCK) { DetailAST currentAst = literalNewAst; @@ -469,7 +469,7 @@ private static DetailAST getBlockContainingLocalAnonInnerClass(DetailAST literal private static void addLocalVariables(DetailAST varDefAst, Deque variablesStack) { final DetailAST parentAst = varDefAst.getParent(); final DetailAST grandParent = parentAst.getParent(); - final var isInstanceVarInInnerClass = + final boolean isInstanceVarInInnerClass = grandParent.getType() == TokenTypes.LITERAL_NEW || grandParent.getType() == TokenTypes.CLASS_DEF; if (isInstanceVarInInnerClass @@ -624,11 +624,11 @@ private static TypeDeclDesc getClosestMatchingTypeDeclaration(String outerTypeDe private static int calculateTypeDeclarationDistance(String outerTypeName, TypeDeclDesc firstType, TypeDeclDesc secondType) { - final var firstMatchCount = + final int firstMatchCount = countMatchingQualifierChars(outerTypeName, firstType.getQualifiedName()); - final var secondMatchCount = + final int secondMatchCount = countMatchingQualifierChars(outerTypeName, secondType.getQualifiedName()); - final var matchDistance = Integer.compare(secondMatchCount, firstMatchCount); + final int matchDistance = Integer.compare(secondMatchCount, firstMatchCount); final int distance; if (matchDistance == 0) { @@ -660,15 +660,15 @@ private static int calculateTypeDeclarationDistance(String outerTypeName, */ private static int countMatchingQualifierChars(String pattern, String candidate) { - final var typeDeclarationToBeMatchedLength = candidate.length(); - final var minLength = Math + final int typeDeclarationToBeMatchedLength = candidate.length(); + final int minLength = Math .min(typeDeclarationToBeMatchedLength, pattern.length()); - final var shouldCountBeUpdatedAtLastCharacter = + final boolean shouldCountBeUpdatedAtLastCharacter = typeDeclarationToBeMatchedLength > minLength && candidate.charAt(minLength) == PACKAGE_SEPARATOR.charAt(0); - var result = 0; - for (var idx = 0; + int result = 0; + for (int idx = 0; idx < minLength && pattern.charAt(idx) == candidate.charAt(idx); idx++) { @@ -726,7 +726,7 @@ private void iterateOverBlockContainingLocalAnonInnerClass( * @param variablesStack stack of all the relevant variables in the scope */ private void customVisitToken(DetailAST ast, Deque variablesStack) { - final var type = ast.getType(); + final int type = ast.getType(); if (type == TokenTypes.DOT) { visitDotToken(ast, variablesStack); } 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 0e4ef537a446..bbb678fdc0d9 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 @@ -147,7 +147,7 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { - final var parentType = ast.getParent().getType(); + final int parentType = ast.getParent().getType(); final DetailAST modifiers = ast.getFirstChild(); if (parentType != TokenTypes.OBJBLOCK @@ -164,7 +164,7 @@ public void visitToken(DetailAST ast) { entry = calculateDistanceInSingleScope(semicolonAst, variable); } final DetailAST variableUsageAst = entry.getKey(); - final var dist = entry.getValue(); + final int dist = entry.getValue(); if (dist > allowedDistance && !isInitializationSequence(variableUsageAst, variable.getText())) { if (ignoreFinal) { @@ -188,7 +188,7 @@ public void visitToken(DetailAST ast) { private static String getInstanceName(DetailAST methodCallAst) { final String methodCallName = FullIdent.createFullIdentBelow(methodCallAst).getText(); - final var lastDotIndex = methodCallName.lastIndexOf('.'); + final int lastDotIndex = methodCallName.lastIndexOf('.'); String instanceName = ""; if (lastDotIndex != -1) { instanceName = methodCallName.substring(0, lastDotIndex); @@ -209,8 +209,8 @@ private static String getInstanceName(DetailAST methodCallAst) { */ private static boolean isInitializationSequence( DetailAST variableUsageAst, String variableName) { - var result = true; - var isUsedVariableDeclarationFound = false; + boolean result = true; + boolean isUsedVariableDeclarationFound = false; DetailAST currentSiblingAst = variableUsageAst; String initInstanceName = ""; @@ -260,8 +260,8 @@ else if (currentSiblingAst.getType() == TokenTypes.VARIABLE_DEF) { */ private static Entry calculateDistanceInSingleScope( DetailAST semicolonAst, DetailAST variableIdentAst) { - var dist = 0; - var firstUsageFound = false; + int dist = 0; + boolean firstUsageFound = false; DetailAST currentAst = semicolonAst; DetailAST variableUsageAst = null; @@ -319,7 +319,7 @@ private static int getDistToVariableUsageInChildNode(DetailAST childNode, */ private static Entry calculateDistanceBetweenScopes( DetailAST ast, DetailAST variable) { - var dist = 0; + int dist = 0; DetailAST currentScopeAst = ast; DetailAST variableUsageAst = null; while (currentScopeAst != null) { @@ -378,7 +378,7 @@ else if (variableUsageExpressions.isEmpty()) { private static Entry, Integer> searchVariableUsageExpressions(final DetailAST variableAst, final DetailAST statementAst) { final List variableUsageExpressions = new ArrayList<>(); - var distance = 0; + int distance = 0; DetailAST currentStatementAst = statementAst; while (currentStatementAst != null) { if (currentStatementAst.getFirstChild() != null) { @@ -426,7 +426,7 @@ private static DetailAST getFirstNodeInsideForWhileDoWhileBlocks( currentNode = block.findFirstToken(TokenTypes.RPAREN).getNextSibling(); } - final var currentNodeType = currentNode.getType(); + final int currentNodeType = currentNode.getType(); if (currentNodeType != TokenTypes.EXPR) { firstNodeInsideBlock = currentNode; @@ -621,7 +621,7 @@ private static DetailAST getFirstNodeInsideTryCatchFinallyBlocks( */ private static boolean isVariableInOperatorExpr( DetailAST operator, DetailAST variable) { - var isVarInOperatorDeclaration = false; + boolean isVarInOperatorDeclaration = false; DetailAST ast = operator.findFirstToken(TokenTypes.LPAREN); @@ -647,7 +647,7 @@ private static boolean isVariableInOperatorExpr( * @return true if Ast element was found in Ast node, otherwise - false. */ private static boolean isChild(DetailAST parent, DetailAST ast) { - var isChild = false; + boolean isChild = false; DetailAST curNode = parent.getFirstChild(); while (curNode != null) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/WhenShouldBeUsedCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/WhenShouldBeUsedCheck.java index 1052c40ef804..f06a220d2e7d 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/WhenShouldBeUsedCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/WhenShouldBeUsedCheck.java @@ -81,18 +81,18 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { - final var hasPatternLabel = hasPatternLabel(ast); + final boolean hasPatternLabel = hasPatternLabel(ast); final DetailAST statementList = getStatementList(ast); // until https://github.com/checkstyle/checkstyle/issues/15270 - final var isInSwitchRule = ast.getParent().getType() == TokenTypes.SWITCH_RULE; + final boolean isInSwitchRule = ast.getParent().getType() == TokenTypes.SWITCH_RULE; if (hasPatternLabel && statementList != null && isInSwitchRule) { final List blockStatements = getBlockStatements(statementList); - final var hasAcceptableStatementsOnly = blockStatements.stream() + final boolean hasAcceptableStatementsOnly = blockStatements.stream() .allMatch(WhenShouldBeUsedCheck::isAcceptableStatement); - final var hasSingleIfWithNoElse = blockStatements.stream() + final boolean hasSingleIfWithNoElse = blockStatements.stream() .filter(WhenShouldBeUsedCheck::isSingleIfWithNoElse) .count() == 1; 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 90824d85e980..0e4cbfc30900 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 @@ -215,7 +215,7 @@ public void leaveToken(DetailAST ast) { private static boolean shouldBeDeclaredAsFinal(ClassDesc classDesc) { final boolean shouldBeFinal; - final var skipClass = classDesc.isDeclaredAsFinal() + final boolean skipClass = classDesc.isDeclaredAsFinal() || classDesc.isDeclaredAsAbstract() || classDesc.isSuperClassOfAnonymousInnerClass() || classDesc.isWithNestedSubclass(); @@ -376,16 +376,16 @@ private static String getSuperClassName(DetailAST classAst) { */ private static int getAnonSuperTypeMatchingCount(String patternTypeDeclaration, String typeDeclarationToBeMatched) { - final var typeDeclarationToBeMatchedLength = typeDeclarationToBeMatched.length(); - final var minLength = Math + final int typeDeclarationToBeMatchedLength = typeDeclarationToBeMatched.length(); + final int minLength = Math .min(typeDeclarationToBeMatchedLength, patternTypeDeclaration.length()); - final var packageSeparator = PACKAGE_SEPARATOR.charAt(0); - final var shouldCountBeUpdatedAtLastCharacter = + final char packageSeparator = PACKAGE_SEPARATOR.charAt(0); + final boolean shouldCountBeUpdatedAtLastCharacter = typeDeclarationToBeMatchedLength > minLength && typeDeclarationToBeMatched.charAt(minLength) == packageSeparator; - var result = 0; - for (var idx = 0; + int result = 0; + for (int idx = 0; idx < minLength && patternTypeDeclaration.charAt(idx) == typeDeclarationToBeMatched.charAt(idx); idx++) { 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 478d134f099e..ad66c138f10e 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 @@ -81,7 +81,7 @@ public void visitToken(DetailAST ast) { objBlock.findFirstToken(TokenTypes.METHOD_DEF); final DetailAST variableDef = objBlock.findFirstToken(TokenTypes.VARIABLE_DEF); - final var methodRequired = + final boolean methodRequired = !allowMarkerInterfaces || variableDef != null; if (methodDef == null && methodRequired) { 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 da09331b05a3..109a7fd5fead 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 @@ -173,7 +173,7 @@ private boolean isNamedAsException(DetailAST ast) { * @return true if extended class name conforms to specified format */ private boolean isExtendedClassNamedAsException(DetailAST ast) { - var result = false; + boolean result = false; final DetailAST extendsClause = ast.findFirstToken(TokenTypes.EXTENDS_CLAUSE); if (extendsClause != null) { DetailAST currentNode = extendsClause; 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 fb3b4125c1b9..790185518520 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 @@ -67,7 +67,7 @@ public int[] getRequiredTokens() { public void visitToken(DetailAST compilationUnit) { DetailAST currentNode = compilationUnit.getFirstChild(); - var publicTypeFound = false; + boolean publicTypeFound = false; DetailAST firstType = null; while (currentNode != null) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/SealedShouldHavePermitsListCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/SealedShouldHavePermitsListCheck.java index b0189a78e81d..27593f102673 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/SealedShouldHavePermitsListCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/SealedShouldHavePermitsListCheck.java @@ -77,8 +77,8 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { final DetailAST modifiers = ast.findFirstToken(TokenTypes.MODIFIERS); - final var isSealed = modifiers.findFirstToken(TokenTypes.LITERAL_SEALED) != null; - final var hasPermitsList = ast.findFirstToken(TokenTypes.PERMITS_CLAUSE) != null; + final boolean isSealed = modifiers.findFirstToken(TokenTypes.LITERAL_SEALED) != null; + final boolean hasPermitsList = ast.findFirstToken(TokenTypes.PERMITS_CLAUSE) != null; if (isSealed && !hasPermitsList) { log(ast, MSG_KEY); 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 38be62640c92..66c9e47cfe2d 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 @@ -137,7 +137,7 @@ private void visitLiteralThrows(DetailAST ast) { if ((!ignorePrivateMethods || !isInPrivateMethod(ast)) && !isOverriding(ast)) { // Account for all the commas! - final var count = (ast.getChildCount() + 1) / 2; + final int count = (ast.getChildCount() + 1) / 2; if (count > max) { log(ast, MSG_KEY, count, max); } @@ -152,7 +152,7 @@ private void visitLiteralThrows(DetailAST ast) { */ private static boolean isOverriding(DetailAST ast) { final DetailAST modifiers = ast.getParent().findFirstToken(TokenTypes.MODIFIERS); - var isOverriding = false; + boolean isOverriding = false; DetailAST child = modifiers.getFirstChild(); while (child != null) { if (child.getType() == TokenTypes.ANNOTATION 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 5721268af14f..90e116fc0776 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 @@ -345,7 +345,7 @@ private static boolean isAnonymousClassVariable(DetailAST variableDef) { * @param variableDef variable to check. */ private void visitVariableDef(DetailAST variableDef) { - final var inInterfaceOrAnnotationBlock = + final boolean inInterfaceOrAnnotationBlock = ScopeUtil.isInInterfaceOrAnnotationBlock(variableDef); if (!inInterfaceOrAnnotationBlock && !hasIgnoreAnnotation(variableDef)) { @@ -407,7 +407,7 @@ private void visitImport(DetailAST importAst) { * @return true if it is star import */ private static boolean isStarImport(DetailAST importAst) { - var result = false; + boolean result = false; DetailAST toVisit = importAst; while (toVisit != null) { toVisit = getNextSubTreeNode(toVisit, importAst); @@ -427,7 +427,7 @@ private static boolean isStarImport(DetailAST importAst) { * @return true if variable has proper access modifier. */ private boolean hasProperAccessModifier(DetailAST variableDef, String variableName) { - var result = true; + boolean result = true; final String variableScope = getVisibilityScope(variableDef); @@ -539,10 +539,10 @@ private static String getVisibilityScope(DetailAST variableDef) { * @return true if field is immutable. */ private boolean isImmutableField(DetailAST variableDef) { - var result = false; + boolean result = false; if (isFinalField(variableDef)) { final DetailAST type = variableDef.findFirstToken(TokenTypes.TYPE); - final var isCanonicalName = isCanonicalName(type); + final boolean isCanonicalName = isCanonicalName(type); final String typeName = getCanonicalName(type); if (immutableClassShortNames.contains(typeName) || isCanonicalName && immutableClassCanonicalNames.contains(typeName)) { 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 90ede93c822a..5016b4d0cbc3 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 @@ -100,7 +100,7 @@ protected void processFiltered(File file, FileText fileText) { log(1, MSG_MISSING); } else { - for (var i = 0; i < getHeaderLines().size(); i++) { + for (int i = 0; i < getHeaderLines().size(); i++) { if (!isMatch(i, fileText.get(i))) { log(i + 1, MSG_MISMATCH, getHeaderLines().get(i)); break; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/MultiFileRegexpHeaderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/MultiFileRegexpHeaderCheck.java index b8be92966c78..3d16cda5e4ef 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/MultiFileRegexpHeaderCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/MultiFileRegexpHeaderCheck.java @@ -166,11 +166,11 @@ protected void processFiltered(File file, FileText fileText) { * @return a MatchResult containing the result of the analysis */ private static MatchResult matchHeader(FileText fileText, HeaderFileMetadata headerFile) { - final var fileSize = fileText.size(); + final int fileSize = fileText.size(); final List headerPatterns = headerFile.headerPatterns(); - final var headerPatternSize = headerPatterns.size(); + final int headerPatternSize = headerPatterns.size(); - var mismatchLine = MISMATCH_CODE; + int mismatchLine = MISMATCH_CODE; int index; for (index = 0; index < headerPatternSize && index < fileSize; index++) { if (!headerPatterns.get(index).matcher(fileText.get(index)).find()) { 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 ab4e786687a2..f5bcc2f8c91a 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 @@ -79,18 +79,18 @@ public void setMultiLines(int... list) { @Override protected void processFiltered(File file, FileText fileText) { - final var headerSize = getHeaderLines().size(); - final var fileSize = fileText.size(); + final int headerSize = getHeaderLines().size(); + final int fileSize = fileText.size(); if (headerSize - multiLines.cardinality() > fileSize) { log(1, MSG_HEADER_MISSING); } else { - var headerLineNo = 0; + int headerLineNo = 0; int index; for (index = 0; headerLineNo < headerSize && index < fileSize; index++) { final String line = fileText.get(index); - var isMatch = isMatch(line, headerLineNo); + boolean isMatch = isMatch(line, headerLineNo); while (!isMatch && isMultiLine(headerLineNo)) { headerLineNo++; isMatch = headerLineNo == headerSize @@ -134,7 +134,7 @@ private String getHeaderLine(int headerLineNo) { * @param headerSize whole header size */ private void logFirstSinglelineLine(int startHeaderLine, int headerSize) { - for (var lineNum = startHeaderLine; lineNum < headerSize; lineNum++) { + for (int lineNum = startHeaderLine; lineNum < headerSize; lineNum++) { if (!isMultiLine(lineNum)) { log(1, MSG_HEADER_MISSING); break; 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 19cf14b22ce1..6fce547b1a09 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 @@ -119,7 +119,7 @@ public void visitToken(final DetailAST ast) { * @return true if except false if not */ private boolean isExempt(String classOrStaticMember) { - var exempt = false; + boolean exempt = false; for (String exclude : excludes) { if (classOrStaticMember.equals(exclude) @@ -140,7 +140,7 @@ private boolean isExempt(String classOrStaticMember) { * @return true if member in exclusion list */ private static boolean isStarImportOfPackage(String classOrStaticMember, String exclude) { - var result = false; + boolean result = false; if (exclude.endsWith(".*")) { // this section allows explicit imports // to be exempt when configured using 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 2bae9fda6c24..ed722175037e 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 @@ -206,7 +206,7 @@ public void visitToken(DetailAST ast) { * for illegal packages, illegal class names or illegal modules */ private boolean isIllegalImportByRegularExpressions(String importText) { - var result = false; + boolean result = false; for (Pattern pattern : illegalPkgsRegexps) { if (pattern.matcher(importText).matches()) { result = true; @@ -236,7 +236,7 @@ private boolean isIllegalImportByRegularExpressions(String importText) { * or module name */ private boolean isIllegalImportLiteral(String importText) { - var result = false; + boolean result = false; for (String element : illegalPkgs) { if (importText.startsWith(element + ".")) { result = true; 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 2a5da5439edc..31d65cd7099c 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 @@ -165,13 +165,13 @@ public void startElement(String namespaceUri, if ("import-control".equals(qName)) { final String pkg = safeGet(attributes, PKG_ATTRIBUTE_NAME); final MismatchStrategy strategyOnMismatch = getStrategyForImportControl(attributes); - final var regex = containsRegexAttribute(attributes); + final boolean regex = containsRegexAttribute(attributes); stack.push(new PkgImportControl(pkg, regex, strategyOnMismatch)); } else if (SUBPACKAGE_ELEMENT_NAME.equals(qName)) { final String name = safeGet(attributes, NAME_ATTRIBUTE_NAME); final MismatchStrategy strategyOnMismatch = getStrategyForSubpackage(attributes); - final var regex = containsRegexAttribute(attributes); + final boolean regex = containsRegexAttribute(attributes); final PkgImportControl parentImportControl = (PkgImportControl) stack.peek(); final AbstractImportControl importControl = new PkgImportControl(parentImportControl, name, regex, strategyOnMismatch); @@ -180,7 +180,7 @@ else if (SUBPACKAGE_ELEMENT_NAME.equals(qName)) { } else if (FILE_ELEMENT_NAME.equals(qName)) { final String name = safeGet(attributes, NAME_ATTRIBUTE_NAME); - final var regex = containsRegexAttribute(attributes); + final boolean regex = containsRegexAttribute(attributes); final PkgImportControl parentImportControl = (PkgImportControl) stack.peek(); final AbstractImportControl importControl = new FileImportControl(parentImportControl, name, regex); @@ -207,10 +207,10 @@ private static AbstractImportRule createImportRule(String qName, Attributes attr // Need to handle either "pkg" or "class" attribute. // May have "exact-match" for "pkg" // May have "local-only" - final var isAllow = ALLOW_ELEMENT_NAME.equals(qName); - final var isLocalOnly = attributes.getValue("local-only") != null; + final boolean isAllow = ALLOW_ELEMENT_NAME.equals(qName); + final boolean isLocalOnly = attributes.getValue("local-only") != null; final String pkg = attributes.getValue(PKG_ATTRIBUTE_NAME); - final var regex = containsRegexAttribute(attributes); + final boolean regex = containsRegexAttribute(attributes); final AbstractImportRule rule; if (pkg == null) { // handle class names which can be normal class names or regular @@ -219,7 +219,7 @@ private static AbstractImportRule createImportRule(String qName, Attributes attr rule = new ClassImportRule(isAllow, isLocalOnly, clazz, regex); } else { - final var exactMatch = + final boolean exactMatch = attributes.getValue("exact-match") != null; rule = new PkgImportRule(isAllow, isLocalOnly, pkg, exactMatch, regex); } 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 1f7cbae03cdc..1edecacf0b15 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 @@ -359,11 +359,11 @@ public void visitToken(DetailAST ast) { // using set of IF instead of SWITCH to analyze Enum options to satisfy coverage. // https://github.com/checkstyle/checkstyle/issues/1387 if (option == ImportOrderOption.TOP || option == ImportOrderOption.ABOVE) { - final var isStaticAndNotLastImport = isStatic && !lastImportStatic; + final boolean isStaticAndNotLastImport = isStatic && !lastImportStatic; doVisitToken(ident, isStatic, isStaticAndNotLastImport, ast); } else if (option == ImportOrderOption.BOTTOM || option == ImportOrderOption.UNDER) { - final var isLastImportAndNonStatic = lastImportStatic && !isStatic; + final boolean isLastImportAndNonStatic = lastImportStatic && !isStatic; doVisitToken(ident, isStatic, isLastImportAndNonStatic, ast); } else if (option == ImportOrderOption.INFLOW) { @@ -391,7 +391,7 @@ else if (option == ImportOrderOption.INFLOW) { */ private void doVisitToken(FullIdent ident, boolean isStatic, boolean previous, DetailAST ast) { final String name = ident.getText(); - final var groupIdx = getGroupNumber(isStatic && staticImportsApart, name); + final int groupIdx = getGroupNumber(isStatic && staticImportsApart, name); if (groupIdx > lastGroup) { if (!beforeFirstImport @@ -421,7 +421,7 @@ else if (groupIdx == lastGroup) { * @return true if imports groups should be separated. */ private boolean needSeparator(boolean isStatic) { - final var typeImportSeparator = !isStatic && separated; + final boolean typeImportSeparator = !isStatic && separated; final boolean staticImportSeparator; if (staticImportsApart) { staticImportSeparator = isStatic && separatedStaticGroups; @@ -429,7 +429,7 @@ private boolean needSeparator(boolean isStatic) { else { staticImportSeparator = separated; } - final var separatorBetween = isStatic != lastImportStatic + final boolean separatorBetween = isStatic != lastImportStatic && (separated || separatedStaticGroups); return typeImportSeparator || staticImportSeparator || separatorBetween; @@ -444,7 +444,7 @@ private boolean needSeparator(boolean isStatic) { * @return true if imports group are separated internally. */ private boolean isSeparatorInGroup(int groupIdx, boolean isStatic, int line) { - final var inSameGroup = groupIdx == lastGroup; + final boolean inSameGroup = groupIdx == lastGroup; return (inSameGroup || !needSeparator(isStatic)) && isSeparatorBeforeImport(line); } @@ -476,7 +476,7 @@ private void doVisitTokenInSameGroup(boolean isStatic, } } else { - final var shouldFireError = + final boolean shouldFireError = // previous non-static but current is static (above) // or // previous static but current is non-static (under) @@ -585,7 +585,7 @@ private static int compareContainerOrder(String importName1, String importName2, * @return import container name. */ private static String getImportContainer(String qualifiedImportName) { - final var lastDotIndex = qualifiedImportName.lastIndexOf('.'); + final int lastDotIndex = qualifiedImportName.lastIndexOf('.'); return qualifiedImportName.substring(0, lastDotIndex); } @@ -605,7 +605,7 @@ private int getGroupNumber(boolean isStatic, String name) { patterns = groupsReg; } - var number = getGroupNumber(patterns, name); + int number = getGroupNumber(patterns, name); if (isStatic && option == ImportOrderOption.BOTTOM) { number += groups.length + 1; @@ -624,13 +624,13 @@ else if (!isStatic && option == ImportOrderOption.TOP) { * @return group number for given import name. */ private static int getGroupNumber(Pattern[] patterns, String name) { - var bestIndex = patterns.length; - var bestEnd = -1; - var bestPos = Integer.MAX_VALUE; + int bestIndex = patterns.length; + int bestEnd = -1; + int bestPos = Integer.MAX_VALUE; // find out what group this belongs in // loop over patterns and get index - for (var i = 0; i < patterns.length; i++) { + for (int i = 0; i < patterns.length; i++) { final Matcher matcher = patterns[i].matcher(name); if (matcher.find()) { if (matcher.start() < bestPos) { @@ -683,7 +683,7 @@ private static int compare(String string1, String string2, */ private static Pattern[] compilePatterns(String... packageGroups) { final Pattern[] patterns = new Pattern[packageGroups.length]; - for (var i = 0; i < packageGroups.length; i++) { + for (int i = 0; i < packageGroups.length; i++) { String pkg = packageGroups[i]; final Pattern grp; 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 76e04e7bb64b..c05ebbbcc5cb 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 @@ -242,7 +242,7 @@ private boolean matchesAtFront(String pkg) { * @return if it matches. */ private boolean matchesAtFrontNoRegex(String pkg) { - final var length = fullPackageName.length(); + final int length = fullPackageName.length(); return pkg.startsWith(fullPackageName) && (pkg.length() == length || pkg.charAt(length) == '.'); } 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 7ef8bdc92b99..49f8a8f71595 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 @@ -152,7 +152,7 @@ private static boolean isFromPackage(String importName, String pkg) { // imports from unnamed package are not allowed: // https://docs.oracle.com/javase/specs/jls/se7/html/jls-7.html#jls-7.5 // So '.' must be present in member name and we are not checking for it - final var index = importName.lastIndexOf('.'); + final int index = importName.lastIndexOf('.'); final String front = importName.substring(0, index); return pkg.equals(front); } 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 0565230fb1b3..832f575a4410 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 @@ -255,9 +255,9 @@ private boolean isUnusedImport(String imprt) { */ private void processIdent(DetailAST ast) { final DetailAST parent = ast.getParent(); - final var parentType = parent.getType(); + final int parentType = parent.getType(); - final var isClassOrMethod = parentType == TokenTypes.DOT + final boolean isClassOrMethod = parentType == TokenTypes.DOT || parentType == TokenTypes.METHOD_DEF || parentType == TokenTypes.METHOD_REF; if (TokenUtil.isTypeDeclaration(parentType)) { @@ -276,12 +276,12 @@ else if (!isClassOrMethod || isQualifiedIdentifier(ast)) { */ private static boolean isQualifiedIdentifier(DetailAST ast) { final DetailAST parent = ast.getParent(); - final var parentType = parent.getType(); + final int parentType = parent.getType(); - final var isQualifiedIdent = parentType == TokenTypes.DOT + final boolean isQualifiedIdent = parentType == TokenTypes.DOT && !TokenUtil.isOfType(ast.getPreviousSibling(), TokenTypes.DOT) && ast.getNextSibling() != null; - final var isQualifiedIdentFromMethodRef = parentType == TokenTypes.METHOD_REF + final boolean isQualifiedIdentFromMethodRef = parentType == TokenTypes.METHOD_REF && ast.getNextSibling() != null; return isQualifiedIdent || isQualifiedIdentFromMethodRef; } @@ -321,7 +321,7 @@ private void processStaticImport(DetailAST ast) { @SuppressWarnings("deprecation") private void collectReferencesFromJavadoc(DetailAST ast) { final FileContents contents = getFileContents(); - final var lineNo = ast.getLineNo(); + final int lineNo = ast.getLineNo(); final TextBlock textBlock = contents.getJavadocBefore(lineNo); if (textBlock != null) { currentFrame.addReferencedTypes(collectReferencesFromJavadoc(textBlock)); @@ -416,7 +416,7 @@ private static Set matchPattern(String identifier, Pattern pattern) { */ private static String topLevelType(String type) { final String topLevelType; - final var dotIndex = type.indexOf('.'); + final int dotIndex = type.indexOf('.'); if (dotIndex == -1) { topLevelType = type; } @@ -438,8 +438,8 @@ private static String topLevelType(String type) { */ private static boolean isMatchingTagType(JavadocTag tag, JavadocUtil.JavadocTagType javadocTagType) { - final var isInlineTag = tag.isInlineTag(); - final var isBlockTagType = javadocTagType == JavadocUtil.JavadocTagType.BLOCK; + final boolean isInlineTag = tag.isInlineTag(); + final boolean isBlockTagType = javadocTagType == JavadocUtil.JavadocTagType.BLOCK; return isBlockTagType != isInlineTag; } @@ -453,7 +453,7 @@ private static boolean isMatchingTagType(JavadocTag tag, */ public static Optional bestTryToMatchReference(JavadocTag tag) { final String content = tag.getFirstArg(); - final var referenceIndex = extractReferencePart(content); + final int referenceIndex = extractReferencePart(content); Optional validTag = Optional.empty(); if (referenceIndex != -1) { @@ -466,9 +466,9 @@ public static Optional bestTryToMatchReference(JavadocTag tag) { } final Matcher matcher = REFERENCE.matcher(referenceString); if (matcher.matches()) { - final var methodIndex = 3; + final int methodIndex = 3; final String methodPart = matcher.group(methodIndex); - final var isValid = methodPart == null + final boolean isValid = methodPart == null || METHOD.matcher(methodPart).matches(); if (isValid) { validTag = Optional.of(tag); @@ -486,10 +486,10 @@ public static Optional bestTryToMatchReference(JavadocTag tag) { * or the index of the first space outside parentheses. */ private static @IndexOrLow("#1")int extractReferencePart(String input) { - var parenthesesCount = 0; - var firstSpaceOutsideParens = -1; - for (var index = 0; index < input.length(); index++) { - final var currentCharacter = input.charAt(index); + int parenthesesCount = 0; + int firstSpaceOutsideParens = -1; + for (int index = 0; index < input.length(); index++) { + final char currentCharacter = input.charAt(index); if (currentCharacter == '(') { parenthesesCount++; @@ -503,7 +503,7 @@ else if (currentCharacter == ' ' && parenthesesCount == 0) { } } - var methodIndex = -1; + int methodIndex = -1; if (parenthesesCount == 0) { if (firstSpaceOutsideParens == -1) { methodIndex = 0; 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 d1978f801cee..ab8f90b7b7da 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 @@ -234,7 +234,7 @@ protected final int getLineStart(int lineNo) { * @return the start of the specified line */ private int getLineStart(String line) { - var index = 0; + int index = 0; while (Character.isWhitespace(line.charAt(index))) { index++; } @@ -250,7 +250,7 @@ private int getLineStart(String line) { * false otherwise */ protected boolean shouldIncreaseIndent() { - var result = true; + boolean result = true; if (TokenUtil.isOfType(mainAst, TokenTypes.LITERAL_CATCH)) { final DetailAST parameterAst = mainAst.findFirstToken(TokenTypes.PARAMETER_DEF); result = !AnnotationUtil.containsAnnotation(parameterAst); @@ -275,9 +275,9 @@ private void checkLinesIndent(DetailAstSet astSet, if (!astSet.isEmpty()) { // check first line final DetailAST startLineAst = astSet.firstLine(); - var startCol = expandedTabsColumnNo(startLineAst); + int startCol = expandedTabsColumnNo(startLineAst); - final var realStartCol = + final int realStartCol = getLineStart(indentCheck.getLine(startLineAst.getLineNo() - 1)); if (firstLineMatches && !allowNesting) { @@ -312,7 +312,7 @@ private void checkRemainingLines(boolean firstLineMatches, // doesn't start the line) then don't indent more, the first // indentation is absorbed by the nesting final DetailAST startLineAst = astSet.firstLine(); - final var endLine = astSet.lastLine(); + final int endLine = astSet.lastLine(); IndentLevel level = indentLevel; if (shouldIncreaseIndent() @@ -323,7 +323,7 @@ private void checkRemainingLines(boolean firstLineMatches, } // check following lines - for (var index = startLineAst.getLineNo() + 1; index <= endLine; index++) { + for (int index = startLineAst.getLineNo() + 1; index <= endLine; index++) { final Integer col = astSet.getStartColumn(index); // startCol could be null if this line didn't have an // expression that was required to be checked (it could be @@ -345,8 +345,8 @@ private void checkRemainingLines(boolean firstLineMatches, private void checkLineIndent(DetailAST ast, IndentLevel indentLevel, boolean mustMatch) { final String line = indentCheck.getLine(ast.getLineNo() - 1); - final var start = getLineStart(line); - final var columnNumber = expandedTabsColumnNo(ast); + final int start = getLineStart(line); + final int columnNumber = expandedTabsColumnNo(ast); // if must match is set, it is a violation if the line start is not // at the correct indention level; otherwise, it is an only a // violation if this statement starts the line and it is less than @@ -426,7 +426,7 @@ protected final void checkExpressionSubtree( boolean allowNesting ) { final DetailAstSet subtreeAst = new DetailAstSet(indentCheck); - final var firstLine = getFirstLine(tree); + final int firstLine = getFirstLine(tree); if (firstLineMatches && !allowNesting) { final DetailAST firstAst = getFirstAstNode(tree); subtreeAst.addAst(firstAst); @@ -499,10 +499,10 @@ protected final int expandedTabsColumnNo(DetailAST ast) { protected final void findSubtreeAst(DetailAstSet astSet, DetailAST tree, boolean allowNesting) { if (!indentCheck.getHandlerFactory().isHandledType(tree.getType())) { - final var lineNum = tree.getLineNo(); + final int lineNum = tree.getLineNo(); final Integer colNum = astSet.getStartColumn(lineNum); - final var thisLineColumn = expandedTabsColumnNo(tree); + final int thisLineColumn = expandedTabsColumnNo(tree); if (colNum == null || thisLineColumn < colNum) { astSet.addAst(tree); } @@ -589,9 +589,9 @@ protected final void checkRightParen(DetailAST lparen, DetailAST rparen) { if (rparen != null) { // the rcurly can either be at the correct indentation, // or not first on the line - final var rparenLevel = expandedTabsColumnNo(rparen); + final int rparenLevel = expandedTabsColumnNo(rparen); // or has + 1 indentation - final var lparenLevel = expandedTabsColumnNo(lparen); + final int lparenLevel = expandedTabsColumnNo(lparen); if (rparenLevel != lparenLevel + 1 && !getIndent().isAcceptable(rparenLevel) 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 e576acef380e..7ed19d3a5561 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 @@ -64,7 +64,7 @@ protected DetailAST getLeftCurly() { @Override protected IndentLevel curlyIndent() { - var offset = 0; + int offset = 0; final DetailAST lcurly = getLeftCurly(); if (isOnStartOfLine(lcurly)) { @@ -97,9 +97,9 @@ protected IndentLevel getChildrenExpectedIndent() { new IndentLevel(getIndent(), getArrayInitIndentation(), getLineWrappingIndentation()); final DetailAST leftCurly = getLeftCurly(); - final var firstLine = getFirstLine(getListChild()); - final var lcurlyPos = expandedTabsColumnNo(leftCurly); - final var firstChildPos = + final int firstLine = getFirstLine(getListChild()); + final int lcurlyPos = expandedTabsColumnNo(leftCurly); + final int firstChildPos = getNextFirstNonBlankOnLineAfter(firstLine, lcurlyPos); // the code is written with old style where curlies are given their own line, @@ -130,9 +130,9 @@ protected IndentLevel getChildrenExpectedIndent() { * such char doesn't exist. */ private int getNextFirstNonBlankOnLineAfter(int lineNo, int columnNo) { - var realColumnNo = columnNo + 1; + int realColumnNo = columnNo + 1; final String line = getIndentCheck().getLines()[lineNo - 1]; - final var lineLength = line.length(); + final int lineLength = line.length(); while (realColumnNo < lineLength && Character.isWhitespace(line.charAt(realColumnNo))) { realColumnNo++; 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 e6effc71146b..3d47458381dc 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 @@ -49,7 +49,7 @@ public ArrayInitHandler(IndentationCheck indentCheck, @Override protected IndentLevel getIndentImpl() { final DetailAST parentAST = getMainAst().getParent(); - final var type = parentAST.getType(); + final int type = parentAST.getType(); final IndentLevel indentLevel; if (type == TokenTypes.LITERAL_NEW || type == TokenTypes.ASSIGN) { // note: assumes new or assignment is line to align with @@ -74,7 +74,7 @@ protected DetailAST getLeftCurly() { @Override protected IndentLevel curlyIndent() { - var offset = 0; + int offset = 0; final DetailAST lcurly = getLeftCurly(); @@ -109,9 +109,9 @@ protected IndentLevel getChildrenExpectedIndent() { new IndentLevel(getIndent(), getIndentCheck().getArrayInitIndent(), getIndentCheck().getLineWrappingIndentation()); - final var firstLine = getFirstLine(getListChild()); - final var lcurlyPos = expandedTabsColumnNo(getLeftCurly()); - final var firstChildPos = + final int firstLine = getFirstLine(getListChild()); + final int lcurlyPos = expandedTabsColumnNo(getLeftCurly()); + final int firstChildPos = getNextFirstNonBlankOnLineAfter(firstLine, lcurlyPos); if (firstChildPos != NOT_EXIST) { @@ -134,9 +134,9 @@ protected IndentLevel getChildrenExpectedIndent() { * such char doesn't exist. */ private int getNextFirstNonBlankOnLineAfter(int lineNo, int columnNo) { - var realColumnNo = columnNo + 1; + int realColumnNo = columnNo + 1; final String line = getIndentCheck().getLines()[lineNo - 1]; - final var lineLength = line.length(); + final int lineLength = line.length(); while (realColumnNo < lineLength && Character.isWhitespace(line.charAt(realColumnNo))) { realColumnNo++; 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 5bc719d34ad9..a6292c1922c4 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 @@ -141,7 +141,7 @@ private void checkLeftCurly() { // the lcurly can either be at the correct indentation, or nested // with a previous expression final DetailAST lcurly = getLeftCurly(); - final var lcurlyPos = expandedTabsColumnNo(lcurly); + final int lcurlyPos = expandedTabsColumnNo(lcurly); if (!curlyIndent().isAcceptable(lcurlyPos) && isOnStartOfLine(lcurly)) { logError(lcurly, "lcurly", lcurlyPos, curlyIndent()); @@ -187,7 +187,7 @@ protected boolean canChildrenBeNested() { */ private void checkRightCurly() { final DetailAST rcurly = getRightCurly(); - final var rcurlyPos = expandedTabsColumnNo(rcurly); + final int rcurlyPos = expandedTabsColumnNo(rcurly); if (!curlyIndent().isAcceptable(rcurlyPos) && isOnStartOfLine(rcurly)) { 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 a9759713c2dd..44685ffe98e3 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 @@ -74,7 +74,7 @@ public void checkIndentation() { else { if (getMainAst().getType() != TokenTypes.ANNOTATION_DEF) { final DetailAST ident = getMainAst().findFirstToken(TokenTypes.IDENT); - final var lineStart = getLineStart(ident); + final int lineStart = getLineStart(ident); if (!getIndent().isAcceptable(lineStart)) { logError(ident, "ident", lineStart); } @@ -112,7 +112,7 @@ protected int[] getCheckedChildren() { * @return handler name for this class. */ private static String getHandlerName(DetailAST ast) { - final var tokenType = ast.getType(); + final int tokenType = ast.getType(); return switch (tokenType) { case TokenTypes.CLASS_DEF -> "class def"; 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 97f542eead92..8be2e801e780 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 @@ -190,7 +190,7 @@ private boolean isDistributedExpression(DetailAST comment) { while (previousSibling != null && isComment(previousSibling)) { previousSibling = previousSibling.getPreviousSibling(); } - var isDistributed = false; + boolean isDistributed = false; if (previousSibling != null) { if (previousSibling.getType() == TokenTypes.SEMI && isOnPreviousLineIgnoringComments(comment, previousSibling)) { @@ -243,7 +243,7 @@ private static boolean isDefinition(DetailAST previousSibling) { * @return true if the previous statement of a comment is a distributed return statement. */ private static boolean isDistributedReturnStatement(DetailAST commentPreviousSibling) { - var isDistributed = false; + boolean isDistributed = false; if (commentPreviousSibling != null && commentPreviousSibling.getType() == TokenTypes.LITERAL_RETURN) { final DetailAST firstChild = commentPreviousSibling.getFirstChild(); @@ -262,7 +262,7 @@ private static boolean isDistributedReturnStatement(DetailAST commentPreviousSib * @return true if the previous statement of a comment is a distributed throw statement. */ private static boolean isDistributedThrowStatement(DetailAST commentPreviousSibling) { - var isDistributed = false; + boolean isDistributed = false; if (commentPreviousSibling != null && commentPreviousSibling.getType() == TokenTypes.LITERAL_THROW) { final DetailAST firstChild = commentPreviousSibling.getFirstChild(); @@ -495,7 +495,7 @@ else if (isCommentForMultiblock(nextStmt)) { } } else if (!areSameLevelIndented(comment, prevStmt, prevStmt)) { - final var prevStmtLineNo = prevStmt.getLineNo(); + final int prevStmtLineNo = prevStmt.getLineNo(); log(comment, getMessageKey(comment), prevStmtLineNo, comment.getColumnNo(), getLineStart(prevStmtLineNo)); } @@ -511,7 +511,7 @@ else if (!areSameLevelIndented(comment, prevStmt, prevStmt)) { */ private static boolean isCommentForMultiblock(DetailAST endBlockStmt) { final DetailAST nextBlock = endBlockStmt.getParent().getNextSibling(); - final var endBlockLineNo = endBlockStmt.getLineNo(); + final int endBlockLineNo = endBlockStmt.getLineNo(); final DetailAST catchAst = endBlockStmt.getParent().getParent(); final DetailAST finallyAst = catchAst.getNextSibling(); return nextBlock != null && nextBlock.getLineNo() == endBlockLineNo @@ -590,7 +590,7 @@ private DetailAST getOneLinePreviousStatement(DetailAST comment) { * @return true if the ast is a comment. */ private static boolean isComment(DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); return astType == TokenTypes.SINGLE_LINE_COMMENT || astType == TokenTypes.BLOCK_COMMENT_BEGIN || astType == TokenTypes.COMMENT_CONTENT @@ -707,7 +707,7 @@ private static DetailAST findStartTokenOfMethodCallChain(DetailAST root) { private boolean isOnPreviousLineIgnoringComments(DetailAST currentStatement, DetailAST checkedStatement) { DetailAST nextToken = getNextToken(checkedStatement); - var distanceAim = 1; + int distanceAim = 1; if (nextToken != null && isComment(nextToken)) { distanceAim += countEmptyLines(checkedStatement, currentStatement); } @@ -752,10 +752,10 @@ private DetailAST getNextToken(DetailAST checkedStatement) { * @return the number of empty lines between statements. */ private int countEmptyLines(DetailAST startStatement, DetailAST endStatement) { - var emptyLinesNumber = 0; + int emptyLinesNumber = 0; final String[] lines = getLines(); - final var endLineNo = endStatement.getLineNo(); - for (var lineNo = startStatement.getLineNo(); lineNo < endLineNo; lineNo++) { + final int endLineNo = endStatement.getLineNo(); + for (int lineNo = startStatement.getLineNo(); lineNo < endLineNo; lineNo++) { if (CommonUtil.isBlank(lines[lineNo])) { emptyLinesNumber++; } @@ -908,7 +908,7 @@ private boolean areSameLevelIndented(DetailAST comment, DetailAST prevStmt, */ private int getLineStart(int lineNo) { final char[] line = getLines()[lineNo - 1].toCharArray(); - var lineStart = 0; + int lineStart = 0; while (Character.isWhitespace(line[lineStart])) { lineStart++; } @@ -946,7 +946,7 @@ private boolean isTrailingComment(DetailAST comment) { */ private boolean isTrailingSingleLineComment(DetailAST singleLineComment) { final String targetSourceLine = getLine(singleLineComment.getLineNo() - 1); - final var commentColumnNo = singleLineComment.getColumnNo(); + final int commentColumnNo = singleLineComment.getColumnNo(); return !CommonUtil.hasWhitespaceBefore(commentColumnNo, targetSourceLine); } @@ -965,7 +965,7 @@ private boolean isTrailingSingleLineComment(DetailAST singleLineComment) { */ private boolean isTrailingBlockComment(DetailAST blockComment) { final String commentLine = getLine(blockComment.getLineNo() - 1); - final var commentColumnNo = blockComment.getColumnNo(); + final int commentColumnNo = blockComment.getColumnNo(); final DetailAST nextSibling = blockComment.getNextSibling(); return !CommonUtil.hasWhitespaceBefore(commentColumnNo, commentLine) || nextSibling != null && TokenUtil.areOnSameLine(nextSibling, blockComment); 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 ba0dd7cad07b..664e6965fb9f 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 @@ -129,7 +129,7 @@ public boolean isHandledType(int type) { public int[] getHandledTypes() { final Set typeSet = typeHandlers.keySet(); final int[] types = new int[typeSet.size()]; - var index = 0; + int index = 0; for (final Integer val : typeSet) { types[index] = val; index++; 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 84dd8444b78e..51de946044dc 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 @@ -43,7 +43,7 @@ public ImportHandler(IndentationCheck indentCheck, @Override public void checkIndentation() { - final var columnNo = expandedTabsColumnNo(getMainAst()); + final int columnNo = expandedTabsColumnNo(getMainAst()); if (!getIndent().isAcceptable(columnNo) && isOnStartOfLine(getMainAst())) { logError(getMainAst(), "", columnNo); 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 7ab65fd42e56..736859fde070 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 @@ -48,7 +48,7 @@ public IndentLevel(int indent) { */ public IndentLevel(IndentLevel base, int... offsets) { final BitSet src = base.levels; - for (var i = src.nextSetBit(0); i >= 0; i = src.nextSetBit(i + 1)) { + for (int i = src.nextSetBit(0); i >= 0; i = src.nextSetBit(i + 1)) { for (int offset : offsets) { levels.set(i + offset); } @@ -150,7 +150,7 @@ public String toString() { } else { final StringBuilder sb = new StringBuilder(50); - for (var i = levels.nextSetBit(0); i >= 0; + for (int i = levels.nextSetBit(0); i >= 0; i = levels.nextSetBit(i + 1)) { if (!sb.isEmpty()) { sb.append(", "); 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 fe815b5d6831..647ab291860e 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 @@ -116,11 +116,11 @@ public void checkIndentation() { // If the "->" has no children, it is a switch // rule lambda (i.e. 'case ONE -> 1;') - final var isSwitchRuleLambda = firstChild == null; + final boolean isSwitchRuleLambda = firstChild == null; if (!isSwitchRuleLambda && getLineStart(firstChild) == expandedTabsColumnNo(firstChild)) { - final var firstChildColumnNo = expandedTabsColumnNo(firstChild); + final int firstChildColumnNo = expandedTabsColumnNo(firstChild); final IndentLevel level = getIndent(); if (isNonAcceptableIndent(firstChildColumnNo, level)) { @@ -130,8 +130,8 @@ && getLineStart(firstChild) == expandedTabsColumnNo(firstChild)) { } // If the "->" is the first element on the line, assume line wrapping. - final var mainAstColumnNo = expandedTabsColumnNo(mainAst); - final var isLineWrappedLambda = mainAstColumnNo == getLineStart(mainAst); + final int mainAstColumnNo = expandedTabsColumnNo(mainAst); + final boolean isLineWrappedLambda = mainAstColumnNo == getLineStart(mainAst); if (isLineWrappedLambda) { checkLineWrappedLambda(isSwitchRuleLambda, mainAstColumnNo); } @@ -178,7 +178,7 @@ private void checkLineWrappedLambda(final boolean isSwitchRuleLambda, // on the previous line and use that to determine the correct // indentation for the line wrapped "->" final DetailAST previousSibling = mainAst.getPreviousSibling(); - final var previousLineStart = getLineStart(previousSibling); + final int previousLineStart = getLineStart(previousSibling); level = new IndentLevel(new IndentLevel(previousLineStart), getIndentCheck().getLineWrappingIndentation()); @@ -219,7 +219,7 @@ private void checkSingleStatementSwitchRuleIndentation(boolean isLambdaFirstInLi // The first line should not match if the switch rule statement starts on the same line // as "->" but continues onto the next lines as part of a single logical expression. final DetailAST nextSibling = mainAst.getNextSibling(); - final var firstLineMatches = getFirstLine(nextSibling) != mainAst.getLineNo(); + final boolean firstLineMatches = getFirstLine(nextSibling) != mainAst.getLineNo(); checkExpressionSubtree(nextSibling, level, firstLineMatches, false); } 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 39ad8c4b2f5a..2017753d92f8 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 @@ -161,10 +161,10 @@ public void checkIndentation(DetailAST firstNode, DetailAST lastNode, int indent else { firstNodeIndent = startIndent; } - final var currentIndent = firstNodeIndent + indentLevel; + final int currentIndent = firstNodeIndent + indentLevel; for (DetailAST node : firstNodesOnLines.values()) { - final var currentType = node.getType(); + final int currentType = node.getType(); if (checkForNullParameterChild(node) || checkForMethodLparenNewLine(node) || !shouldProcessTextBlockLiteral(node)) { continue; @@ -221,7 +221,7 @@ public static boolean checkForNullParameterChild(DetailAST node) { * @return true if method lparen starts from a new line. */ public static boolean checkForMethodLparenNewLine(DetailAST node) { - final var parentType = node.getParent().getType(); + final int parentType = node.getParent().getType(); return parentType == TokenTypes.METHOD_DEF && node.getType() == TokenTypes.LPAREN; } @@ -315,20 +315,20 @@ private static DetailAST getNextCurNode(DetailAST curNode) { */ private void checkAnnotationIndentation(DetailAST atNode, NavigableMap firstNodesOnLines, int indentLevel) { - final var firstNodeIndent = getLineStart(atNode); - final var currentIndent = firstNodeIndent + indentLevel; + final int firstNodeIndent = getLineStart(atNode); + final int currentIndent = firstNodeIndent + indentLevel; final Collection values = firstNodesOnLines.values(); final DetailAST lastAnnotationNode = atNode.getParent().getLastChild(); - final var lastAnnotationLine = lastAnnotationNode.getLineNo(); + final int lastAnnotationLine = lastAnnotationNode.getLineNo(); final Iterator itr = values.iterator(); while (firstNodesOnLines.size() > 1) { final DetailAST node = itr.next(); final DetailAST parentNode = node.getParent(); - final var isArrayInitPresentInAncestors = + final boolean isArrayInitPresentInAncestors = isParentContainsTokenType(node, TokenTypes.ANNOTATION_ARRAY_INIT); - final var isCurrentNodeCloseAnnotationAloneInLine = + final boolean isCurrentNodeCloseAnnotationAloneInLine = node.getLineNo() == lastAnnotationLine && isEndOfScope(lastAnnotationNode, node); if (!isArrayInitPresentInAncestors @@ -357,7 +357,7 @@ else if (!isArrayInitPresentInAncestors) { */ private static boolean isEndOfScope(final DetailAST lastAnnotationNode, final DetailAST node) { DetailAST checkNode = node; - var endOfScope = true; + boolean endOfScope = true; while (endOfScope && !checkNode.equals(lastAnnotationNode)) { switch (checkNode.getType()) { case TokenTypes.RCURLY, TokenTypes.RBRACK -> { @@ -381,7 +381,7 @@ private static boolean isEndOfScope(final DetailAST lastAnnotationNode, final De * @return true if there is a parent of given type */ private static boolean isParentContainsTokenType(final DetailAST node, int type) { - var returnValue = false; + boolean returnValue = false; for (DetailAST ast = node.getParent(); ast != null; ast = ast.getParent()) { if (ast.getType() == type) { returnValue = true; @@ -426,7 +426,7 @@ private int getLineStart(DetailAST ast) { * @return the start of the specified line */ private int getLineStart(String line) { - var index = 0; + int index = 0; while (Character.isWhitespace(line.charAt(index))) { index++; } 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 b258618e7fba..2be5871fe077 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 @@ -97,7 +97,7 @@ protected void checkModifiers() { private void checkType() { final DetailAST type = getMainAst().findFirstToken(TokenTypes.TYPE); final DetailAST ident = AbstractExpressionHandler.getFirstToken(type); - final var columnNo = expandedTabsColumnNo(ident); + final int columnNo = expandedTabsColumnNo(ident); if (isOnStartOfLine(ident) && !getIndent().isAcceptable(columnNo)) { logError(ident, "type", columnNo); } 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 fc8643e3405a..36f7e0b49f6b 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 @@ -74,8 +74,8 @@ else if (getMainAst().getFirstChild().getType() == TokenTypes.LITERAL_NEW) { // of the line final DetailAstSet astSet = new DetailAstSet(indentCheck); findSubtreeAst(astSet, getMainAst().getFirstChild(), true); - final var firstCol = expandedTabsColumnNo(astSet.firstLine()); - final var lineStart = getLineStart(getFirstAst(getMainAst())); + final int firstCol = expandedTabsColumnNo(astSet.firstLine()); + final int lineStart = getLineStart(getFirstAst(getMainAst())); if (lineStart == firstCol) { indentLevel = super.getIndentImpl(); } 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 0558ebb9775c..ceb54d383b99 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 @@ -80,7 +80,7 @@ private void checkThrows() { */ private static int getMethodDefLineStart(DetailAST mainAst) { // get first type position - var lineStart = mainAst.findFirstToken(TokenTypes.IDENT).getLineNo(); + int lineStart = mainAst.findFirstToken(TokenTypes.IDENT).getLineNo(); // check if there is a type before the indent final DetailAST typeNode = mainAst.findFirstToken(TokenTypes.TYPE); 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 13fa9c381485..ab976e581966 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 @@ -50,10 +50,10 @@ public NewHandler(IndentationCheck indentCheck, public void checkIndentation() { // if new is on the line start and it is not the part of assignment. if (isOnStartOfLine(mainAst)) { - final var columnNo = expandedTabsColumnNo(mainAst); + final int columnNo = expandedTabsColumnNo(mainAst); final IndentLevel level = getIndentImpl(); - final var forceStrictCondition = getIndentCheck().isForceStrictCondition(); + final boolean forceStrictCondition = getIndentCheck().isForceStrictCondition(); if (forceStrictCondition && !level.isAcceptable(columnNo) || !forceStrictCondition && level.isGreaterThan(columnNo)) { logError(mainAst, "", columnNo, level); @@ -84,9 +84,9 @@ public void checkIndentation() { * @return true if nested new is present. */ public boolean checkNestedNew(DetailAST expression) { - var result = false; + boolean result = false; if (expression != null && expression.getFirstChild() != null) { - final var isNestedNewPresent = expression.getFirstChild() + final boolean isNestedNewPresent = expression.getFirstChild() .findFirstToken(TokenTypes.LITERAL_NEW) != null; if (!isNestedNewPresent) { result = true; @@ -115,7 +115,7 @@ protected IndentLevel getIndentImpl() { if (getLineStart(mainAst) == mainAst.getColumnNo()) { result = super.getIndentImpl(); - final var isLineWrappedNew = TokenUtil.isOfType(mainAst.getParent().getParent(), + final boolean isLineWrappedNew = TokenUtil.isOfType(mainAst.getParent().getParent(), TokenTypes.ASSIGN, TokenTypes.LITERAL_RETURN); if (isLineWrappedNew || doesChainedMethodNeedsLineWrapping()) { 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 c9c4baf9dcab..e409d6496eb3 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 @@ -43,7 +43,7 @@ public PackageDefHandler(IndentationCheck indentCheck, @Override public void checkIndentation() { - final var columnNo = expandedTabsColumnNo(getMainAst()); + final int columnNo = expandedTabsColumnNo(getMainAst()); if (!getIndent().isAcceptable(columnNo) && isOnStartOfLine(getMainAst())) { logError(getMainAst(), "", columnNo); 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 ceff6b57ddca..f7e1edcf2abf 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 @@ -114,7 +114,7 @@ protected DetailAST getTopLevelAst() { * @return true if it does, false otherwise */ private boolean hasBlockParent() { - final var parentType = getMainAst().getParent().getType(); + final int parentType = getMainAst().getParent().getType(); return PARENT_TOKEN_TYPES.get(parentType); } 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 4ad293f14904..4a7e41ac4601 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 @@ -117,14 +117,14 @@ private boolean shouldIndentDueToWrapping(DetailAST directParent, DetailAST gran // The enclosing handler node that already determines base indentation // (e.g., method declaration containing our current node) final DetailAST enclosingHandlerNode = getParent().getMainAst(); - final var isDirectParentTheHandler = directParent.equals(enclosingHandlerNode); + final boolean isDirectParentTheHandler = directParent.equals(enclosingHandlerNode); - final var shouldIndentForDirectParent = !isDirectParentTheHandler + final boolean shouldIndentForDirectParent = !isDirectParentTheHandler && isWrappingTrigger(directParent); // Check if grandparent requires extra indentation (when // neither it nor direct parent is the handler) - final var shouldIndentForGrandParent = !isDirectParentTheHandler + final boolean shouldIndentForGrandParent = !isDirectParentTheHandler && !grandParent.equals(enclosingHandlerNode) && isWrappingTrigger(grandParent); 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 e4ca910e4c9c..9dc3f3a6bf68 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 @@ -131,7 +131,7 @@ private void checkChildIndentation(DetailAST ast, String subType, IndentLevel ex */ private void checkTryResources(final DetailAST resourcesSpecAst) { final DetailAST resourcesAst = resourcesSpecAst.findFirstToken(TokenTypes.RESOURCES); - final var indentation = getIndent().getFirstIndentLevel() + final int indentation = getIndent().getFirstIndentLevel() + getIndentCheck().getLineWrappingIndentation(); final IndentLevel expectedResourceIndent = new IndentLevel(indentation); @@ -173,7 +173,7 @@ private void checkTryResources(final DetailAST resourcesSpecAst) { * @return if the expression provided is try block's resource specification. */ private static boolean isTryBlocksResourceSpecification(AbstractExpressionHandler expression) { - var isResourceSpecificationExpression = false; + boolean isResourceSpecificationExpression = false; DetailAST ast = expression.getMainAst(); 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 850ade81aa7e..151f047e03fb 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 @@ -55,7 +55,7 @@ public void checkIndentation() { */ private void checkYield() { final DetailAST yieldKey = getMainAst(); - final var columnNo = expandedTabsColumnNo(yieldKey); + final int columnNo = expandedTabsColumnNo(yieldKey); if (isOnStartOfLine(yieldKey) && !getIndent().isAcceptable(columnNo)) { logError(yieldKey, "", columnNo); } 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 a72ff413094a..2c424cf2d214 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 @@ -307,7 +307,7 @@ public final void visitToken(DetailAST blockCommentNode) { // store as field, to share with child Checks context.get().blockCommentAst = blockCommentNode; - final var treeCacheKey = blockCommentNode.getLineNo(); + final int treeCacheKey = blockCommentNode.getLineNo(); final ParseStatus result = TREE_CACHE.get() .computeIfAbsent(treeCacheKey, lineNumber -> { @@ -364,7 +364,7 @@ private void processTree(DetailNode root) { private void walk(DetailNode root) { DetailNode curNode = root; while (curNode != null) { - var waitsForProcessing = shouldBeProcessed(curNode); + boolean waitsForProcessing = shouldBeProcessed(curNode); if (waitsForProcessing) { visitJavadocToken(curNode); 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 7e7e7b28184f..e4d4d4919ca4 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 @@ -127,7 +127,7 @@ public int[] getRequiredJavadocTokens() { @Override public void visitJavadocToken(DetailNode ast) { - final var parentType = getParentType(getBlockCommentAst()); + final int parentType = getParentType(getBlockCommentAst()); if (target.get(parentType)) { checkOrderInTagSection(ast); @@ -140,13 +140,13 @@ public void visitJavadocToken(DetailNode ast) { * @param javadoc Javadoc root node. */ private void checkOrderInTagSection(DetailNode javadoc) { - var maxIndexOfPreviousTag = 0; + int maxIndexOfPreviousTag = 0; DetailNode node = javadoc.getFirstChild(); while (node != null) { if (node.getType() == JavadocCommentsTokenTypes.JAVADOC_BLOCK_TAG) { final String tagText = JavadocUtil.getTagName(node); - final var indexOfCurrentTag = tagOrder.indexOf("@" + tagText); + final int indexOfCurrentTag = tagOrder.indexOf("@" + tagText); if (indexOfCurrentTag != -1) { if (indexOfCurrentTag < maxIndexOfPreviousTag) { @@ -169,7 +169,7 @@ private void checkOrderInTagSection(DetailNode javadoc) { */ private static int getParentType(DetailAST commentBlock) { final DetailAST parentNode = commentBlock.getParent(); - var result = parentNode.getType(); + int result = parentNode.getType(); if (result == TokenTypes.TYPE || result == TokenTypes.MODIFIERS) { result = parentNode.getParent().getType(); } 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 824057c2655f..ac312ffafd04 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 @@ -138,8 +138,8 @@ public String toString() { * @return text of the tag */ public String getText() { - final var startOfText = position; - final var endOfText = Math.min(startOfText + MAX_TEXT_LEN, text.length()); + final int startOfText = position; + final int endOfText = Math.min(startOfText + MAX_TEXT_LEN, text.length()); return text.substring(startOfText, endOfText); } 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 25e326ea5652..08611396be39 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 @@ -167,7 +167,7 @@ public void visitJavadocToken(DetailNode ast) { * @return {@code true} if node is {@code @code}, {@code @literal} or HTML comment. */ private static boolean isCommentOrInlineTag(DetailNode node) { - var isInsideInlineTagOrHtmlComment = false; + boolean isInsideInlineTagOrHtmlComment = false; DetailNode current = node; while (current != null) { 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 0e901329b35a..292255b6feae 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 @@ -150,7 +150,7 @@ public void setLocation(String value) { public void visitToken(DetailAST ast) { if (isMultilineComment(ast) && JavadocUtil.isJavadocComment(ast)) { final String commentContent = JavadocUtil.getJavadocCommentContent(ast); - final var indexOfFirstNonBlankLine = findIndexOfFirstNonBlankLine(commentContent); + final int indexOfFirstNonBlankLine = findIndexOfFirstNonBlankLine(commentContent); if (indexOfFirstNonBlankLine >= 0) { if (location == JavadocContentLocationOption.FIRST_LINE && indexOfFirstNonBlankLine != 0) { @@ -184,10 +184,10 @@ private static boolean isMultilineComment(DetailAST node) { * @return the index of the first non-blank line or {@code -1} if all lines are blank */ private static int findIndexOfFirstNonBlankLine(String commentContent) { - var lineNo = 0; - var noContent = true; - for (var i = 0; i < commentContent.length(); ++i) { - final var character = commentContent.charAt(i); + int lineNo = 0; + boolean noContent = true; + for (int i = 0; i < commentContent.length(); ++i) { + final char character = commentContent.charAt(i); if (character == '\n') { ++lineNo; } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocLeadingAsteriskAlignCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocLeadingAsteriskAlignCheck.java index fe3f2518348b..485f6ae75311 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocLeadingAsteriskAlignCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocLeadingAsteriskAlignCheck.java @@ -98,7 +98,7 @@ public void beginJavadocTree(DetailNode rootAst) { @Override public void visitJavadocToken(DetailNode ast) { // this method checks the alignment of leading asterisks. - final var isJavadocStartingLine = ast.getLineNumber() == javadocStartLineNumber; + final boolean isJavadocStartingLine = ast.getLineNumber() == javadocStartLineNumber; if (!isJavadocStartingLine) { final Optional leadingAsteriskColumnNumber = 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 4693b6e0efb7..f2bd9c035c68 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 @@ -363,11 +363,11 @@ private void checkComment(DetailAST ast, TextBlock comment) { else { final Iterator it = tags.iterator(); // Check for inheritDoc - var hasInheritDocTag = false; + boolean hasInheritDocTag = false; while (!hasInheritDocTag && it.hasNext()) { hasInheritDocTag = it.next().isInheritDocTag(); } - final var reportExpectedTags = !hasInheritDocTag + final boolean reportExpectedTags = !hasInheritDocTag && !AnnotationUtil.containsAnnotation(ast, allowedAnnotations); // COMPACT_CTOR_DEF has no parameters @@ -432,7 +432,7 @@ private static DetailAST getRecordDef(DetailAST ast) { * @return true if the construct has a short circuit tag. */ private boolean hasShortCircuitTag(final DetailAST ast, final List tags) { - var result = true; + boolean result = true; // Check if it contains {@inheritDoc} tag if (tags.size() == 1 && tags.get(0).isInheritDocTag()) { @@ -461,10 +461,10 @@ private List getMethodTags(TextBlock comment) { } final String[] lines = comment.getText(); final List tags = new ArrayList<>(); - var currentLine = comment.getStartLineNo() - 1; - final var startColumnNumber = comment.getStartColNo(); + int currentLine = comment.getStartLineNo() - 1; + final int startColumnNumber = comment.getStartColNo(); - for (var i = 0; i < lines.length; i++) { + for (int i = 0; i < lines.length; i++) { currentLine++; final Matcher javadocArgMatcher = MATCH_JAVADOC_ARG.matcher(lines[i]); @@ -478,19 +478,19 @@ private List getMethodTags(TextBlock comment) { MATCH_JAVADOC_NOARG_MULTILINE_START.matcher(lines[i]); if (javadocArgMatcher.find()) { - final var col = calculateTagColumn(javadocArgMatcher, i, startColumnNumber); + final int col = calculateTagColumn(javadocArgMatcher, i, startColumnNumber); tags.add(new JavadocTag(currentLine, col, javadocArgMatcher.group(1), javadocArgMatcher.group(2))); } else if (javadocArgMissingDescriptionMatcher.find()) { - final var col = calculateTagColumn(javadocArgMissingDescriptionMatcher, i, + final int col = calculateTagColumn(javadocArgMissingDescriptionMatcher, i, startColumnNumber); tags.add(new JavadocTag(currentLine, col, javadocArgMissingDescriptionMatcher.group(1), javadocArgMissingDescriptionMatcher.group(2))); } else if (javadocNoargMatcher.find()) { - final var col = calculateTagColumn(javadocNoargMatcher, i, startColumnNumber); + final int col = calculateTagColumn(javadocNoargMatcher, i, startColumnNumber); tags.add(new JavadocTag(currentLine, col, javadocNoargMatcher.group(1))); } else if (noargCurlyMatcher.find()) { @@ -513,7 +513,7 @@ else if (noargMultilineStart.find()) { */ private static int calculateTagColumn(MatchResult javadocTagMatchResult, int lineNumber, int startColumnNumber) { - var col = javadocTagMatchResult.start(1) - 1; + int col = javadocTagMatchResult.start(1) - 1; if (lineNumber == 0) { col += startColumnNumber; } @@ -531,7 +531,7 @@ private static int calculateTagColumn(MatchResult javadocTagMatchResult, */ private static List getMultilineNoArgTags(final Matcher noargMultilineStart, final String[] lines, final int lineIndex, final int tagLine) { - var remIndex = lineIndex; + int remIndex = lineIndex; Matcher multilineCont; do { @@ -544,7 +544,7 @@ private static List getMultilineNoArgTags(final Matcher noargMultili if (!NEXT_TAG.equals(lFin) && !END_JAVADOC.equals(lFin)) { final String param1 = noargMultilineStart.group(1); - final var col = noargMultilineStart.start(1) - 1; + final int col = noargMultilineStart.start(1) - 1; tags.add(new JavadocTag(tagLine, col, param1)); } @@ -753,7 +753,7 @@ private void checkRecordParamTags(final List tags, tagIt.remove(); final String arg1 = tag.getFirstArg(); - final var found = removeMatchingParam(params, arg1); + final boolean found = removeMatchingParam(params, arg1); if (!found) { log(tag.getLineNo(), tag.getColumnNo(), MSG_UNUSED_TAG, @@ -795,7 +795,7 @@ private void checkParamTags(final List tags, tagIt.remove(); final String arg1 = tag.getFirstArg(); - var found = removeMatchingParam(params, arg1); + boolean found = removeMatchingParam(params, arg1); if (arg1.endsWith(ELEMENT_END)) { found = searchMatchingTypeParameter(typeParams, @@ -839,7 +839,7 @@ private static boolean searchMatchingTypeParameter(Iterable typeParam String requiredTypeName) { // Loop looking for matching type param final Iterator typeParamsIt = typeParams.iterator(); - var found = false; + boolean found = false; while (typeParamsIt.hasNext()) { final DetailAST typeParam = typeParamsIt.next(); if (typeParam.findFirstToken(TokenTypes.IDENT).getText() @@ -860,7 +860,7 @@ private static boolean searchMatchingTypeParameter(Iterable typeParam * @return true if parameter found and removed */ private static boolean removeMatchingParam(Iterable params, String paramName) { - var found = false; + boolean found = false; final Iterator paramIt = params.iterator(); while (paramIt.hasNext()) { final DetailAST param = paramIt.next(); @@ -885,7 +885,7 @@ private static boolean removeMatchingParam(Iterable params, String pa private void checkReturnTag(List tags, int lineNo, boolean reportExpectedTags) { // Loop over tags finding return tags. After the first one, report a violation - var found = false; + boolean found = false; final ListIterator it = tags.listIterator(); while (it.hasNext()) { final JavadocTag javadocTag = it.next(); 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 00fafffe45ce..3025434d9de9 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 @@ -83,7 +83,7 @@ public void visitJavadocToken(DetailNode detailNode) { * @return {@code true} if the node is inside an HTML comment */ private static boolean isInsideHtmlComment(DetailNode detailNode) { - final var parentType = detailNode.getParent().getType(); + final int parentType = detailNode.getParent().getType(); return parentType == JavadocCommentsTokenTypes.HTML_COMMENT_CONTENT || parentType == JavadocCommentsTokenTypes.HTML_COMMENT; 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 b10e4f6a4777..fcb55c3564af 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 @@ -60,7 +60,7 @@ public void visitJavadocToken(DetailNode detailNode) { if (nextNode != null) { final String text = nextNode.getText(); - final var lastAsteriskPosition = getLastLeadingAsteriskPosition(text); + final int lastAsteriskPosition = getLastLeadingAsteriskPosition(text); if (!isLast(lastAsteriskPosition, text) && !Character.isWhitespace(text.charAt(lastAsteriskPosition + 1))) { @@ -125,9 +125,9 @@ private static boolean isLast(int position, String text) { * */ private static int getLastLeadingAsteriskPosition(String text) { - var index = -1; + int index = -1; - for (var i = 0; i < text.length(); i++) { + for (int i = 0; i < text.length(); i++) { if (text.charAt(i) != '*') { break; } 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 ba594ad2f6ed..8d77d83ff9af 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 @@ -97,7 +97,7 @@ protected void processFiltered(File file, FileText fileText) throws CheckstyleEx throw new CheckstyleException( "Exception while getting canonical path to file " + file.getPath(), exc); } - final var isDirChecked = !directoriesChecked.add(dir); + final boolean isDirChecked = !directoriesChecked.add(dir); if (!isDirChecked) { // Check for the preferred file. final Path packageInfo = Path.of(dir.getPath(), "package-info.java"); 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 5edcc935075b..024fe9ba9846 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 @@ -196,7 +196,7 @@ else if (newLine == null || tag.getLineNumber() - newLine.getLineNumber() != 1) * @return true, if the paragraph tag is nested. */ private static boolean isNestedParagraph(DetailNode tag) { - var nested = false; + boolean nested = false; DetailNode parent = tag.getParent(); while (parent != null) { @@ -307,7 +307,7 @@ private static DetailNode getNearestNode(DetailNode node) { * @return true, if line is empty line. */ private static boolean isEmptyLine(DetailNode newLine) { - var result = false; + boolean result = false; DetailNode previousSibling = newLine.getPreviousSibling(); if (previousSibling != null && (previousSibling.getParent().getType() == JavadocCommentsTokenTypes.JAVADOC_CONTENT @@ -346,7 +346,7 @@ private static boolean insideNonTightHtml(DetailNode previousSibling) { * @return true, if line with paragraph tag is first line in javadoc. */ private static boolean isFirstParagraph(DetailNode paragraphTag) { - var result = true; + boolean result = true; DetailNode previousNode = paragraphTag.getPreviousSibling(); while (previousNode != null) { if (previousNode.getType() == JavadocCommentsTokenTypes.TEXT 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 3654ef85d1ca..f56d11af71c3 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 @@ -215,7 +215,7 @@ public void visitToken(DetailAST ast) { * @return whether we should check a given node. */ private boolean shouldCheck(final DetailAST ast) { - var check = false; + boolean check = false; if (ast.getType() == TokenTypes.PACKAGE_DEF) { check = CheckUtil.isPackageInfo(getFilePath()); @@ -269,7 +269,7 @@ private void checkComment(final DetailAST ast, final TextBlock comment) { */ private void checkFirstSentenceEnding(final DetailAST ast, TextBlock comment) { final String commentText = getCommentText(comment.getText()); - final var hasInLineReturnTag = Arrays.stream(SENTENCE_SEPARATOR.split(commentText)) + final boolean hasInLineReturnTag = Arrays.stream(SENTENCE_SEPARATOR.split(commentText)) .findFirst() .map(INLINE_RETURN_TAG_PATTERN::matcher) .filter(Matcher::find) @@ -306,7 +306,7 @@ private void checkJavadocIsNotEmpty(TextBlock comment) { private static String getCommentText(String... comments) { final StringBuilder builder = new StringBuilder(1024); for (final String line : comments) { - final var textStart = findTextStart(line); + final int textStart = findTextStart(line); if (textStart != -1) { if (line.charAt(textStart) == '@') { @@ -332,8 +332,8 @@ private static String getCommentText(String... comments) { * or -1 if not found. */ private static int findTextStart(String line) { - var textStart = -1; - var index = 0; + int textStart = -1; + int index = 0; while (index < line.length()) { if (!Character.isWhitespace(line.charAt(index))) { if (line.regionMatches(index, "/**", 0, "/**".length()) @@ -356,7 +356,7 @@ else if (line.charAt(index) != '*') { * @param builder the StringBuilder to trim. */ private static void trimTail(StringBuilder builder) { - var index = builder.length() - 1; + int index = builder.length() - 1; while (true) { if (Character.isWhitespace(builder.charAt(index))) { builder.deleteCharAt(index); @@ -392,7 +392,7 @@ else if (index > 0 && builder.charAt(index) == '/' */ // -@cs[ReturnCount] Too complex to break apart. private void checkHtmlTags(final DetailAST ast, final TextBlock comment) { - final var lineNo = comment.getStartLineNo(); + final int lineNo = comment.getStartLineNo(); final Deque htmlStack = new ArrayDeque<>(); final String[] text = comment.getText(); @@ -522,7 +522,7 @@ private static boolean isAllowedTag(HtmlTag tag) { * for the token. */ private static boolean isExtraHtml(String token, Deque htmlStack) { - var isExtra = true; + boolean isExtra = true; for (final HtmlTag tag : htmlStack) { // Loop, looking for tags that are closed. // The loop is needed in case there are unclosed 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 9c65e678bd14..7dd198ac65ab 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 @@ -267,7 +267,7 @@ private static boolean isTextOrAttributeValueNode(DetailNode node) { * @return true if the node has a violation. */ private boolean isViolation(DetailNode textNode) { - var result = false; + boolean result = false; final String text = textNode.getText(); if (text.length() <= offset) { if (CommonUtil.isBlank(text)) { @@ -296,7 +296,7 @@ else if (!CommonUtil.isBlank(text.substring(1, offset + 1))) { * @return {@code true} if the node is inside a block tag, {@code false} otherwise */ private static boolean isBlockDescription(DetailNode description) { - var isBlock = false; + boolean isBlock = false; DetailNode currentNode = description; while (currentNode != null) { if (currentNode.getType() == JavadocCommentsTokenTypes.JAVADOC_BLOCK_TAG) { @@ -315,7 +315,7 @@ private static boolean isBlockDescription(DetailNode description) { * @return true, if description node is a description of in-line tag. */ private static boolean isInlineDescription(DetailNode description) { - var isInline = false; + boolean isInline = false; DetailNode currentNode = description; while (currentNode != null) { if (currentNode.getType() == JavadocCommentsTokenTypes.JAVADOC_INLINE_TAG) { 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 2ac552d8554a..72951b305963 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 @@ -73,7 +73,7 @@ public enum JavadocTagInfo { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); return astType == TokenTypes.PACKAGE_DEF || TokenUtil.isTypeDeclaration(astType); } @@ -87,7 +87,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); return DEF_TOKEN_TYPES.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -101,7 +101,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); return DEF_TOKEN_TYPES.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -115,7 +115,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); return DEF_TOKEN_TYPES_DEPRECATED.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -129,7 +129,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); return astType == TokenTypes.METHOD_DEF || astType == TokenTypes.CTOR_DEF; } @@ -142,7 +142,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); return astType == TokenTypes.METHOD_DEF && ast.findFirstToken(TokenTypes.MODIFIERS) @@ -159,7 +159,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); return DEF_TOKEN_TYPES.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -173,7 +173,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); return DEF_TOKEN_TYPES.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -187,7 +187,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); return DEF_TOKEN_TYPES.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -201,7 +201,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); return astType == TokenTypes.CLASS_DEF || astType == TokenTypes.INTERFACE_DEF || astType == TokenTypes.METHOD_DEF @@ -217,7 +217,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); final DetailAST returnType = ast.findFirstToken(TokenTypes.TYPE); return astType == TokenTypes.METHOD_DEF @@ -233,7 +233,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); return DEF_TOKEN_TYPES.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -247,7 +247,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); return astType == TokenTypes.VARIABLE_DEF && !ScopeUtil.isLocalVariableDef(ast); @@ -262,7 +262,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); final DetailAST methodNameAst = ast.findFirstToken(TokenTypes.IDENT); final String methodName = methodNameAst.getText(); @@ -284,7 +284,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); final DetailAST varType = ast.findFirstToken(TokenTypes.TYPE); return astType == TokenTypes.VARIABLE_DEF @@ -301,7 +301,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); return DEF_TOKEN_TYPES.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -315,7 +315,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); return astType == TokenTypes.METHOD_DEF || astType == TokenTypes.CTOR_DEF; } @@ -329,7 +329,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); return DEF_TOKEN_TYPES.get(astType) && !ScopeUtil.isLocalVariableDef(ast); } @@ -343,7 +343,7 @@ public boolean isValidOn(final DetailAST ast) { @Override public boolean isValidOn(final DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); return astType == TokenTypes.PACKAGE_DEF || TokenUtil.isTypeDeclaration(astType); } 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 135771fe274a..c2b211c9c851 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 @@ -239,7 +239,7 @@ public int[] getRequiredTokens() { public void visitToken(DetailAST ast) { if (shouldCheck(ast)) { final FileContents contents = getFileContents(); - final var lineNo = ast.getLineNo(); + final int lineNo = ast.getLineNo(); final TextBlock textBlock = contents.getJavadocBefore(lineNo); if (textBlock != null) { final List tags = getJavadocTags(textBlock); @@ -314,7 +314,7 @@ private List getJavadocTags(TextBlock textBlock) { private void checkTag(DetailAST ast, Iterable tags, String tagName, Pattern formatPattern) { if (formatPattern != null) { - var hasTag = false; + boolean hasTag = false; final String tagPrefix = "@"; for (final JavadocTag tag :tags) { @@ -343,7 +343,7 @@ private void checkComponentParamTag(DetailAST ast, Collection tags, String recordComponentName) { - final var found = tags + final boolean found = tags .stream() .filter(JavadocTag::isParamTag) .anyMatch(tag -> tag.getFirstArg().indexOf(recordComponentName) == 0); @@ -367,7 +367,7 @@ private void checkTypeParamTag(DetailAST ast, final String typeParamNameWithBrackets = OPEN_ANGLE_BRACKET + typeParamName + CLOSE_ANGLE_BRACKET; - final var found = tags + final boolean found = tags .stream() .filter(JavadocTag::isParamTag) .anyMatch(tag -> tag.getFirstArg().indexOf(typeParamNameWithBrackets) == 0); @@ -393,7 +393,7 @@ private void checkUnusedParamTags( for (final JavadocTag tag: tags) { if (tag.isParamTag()) { final String paramName = extractParamNameFromTag(tag); - final var found = typeParamNames.contains(paramName) + final boolean found = typeParamNames.contains(paramName) || recordComponentNames.contains(paramName); if (!found) { 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 e8d471713f99..15ffc98854d0 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 @@ -165,7 +165,7 @@ private boolean matchAccessModifiers(AccessModifierOption accessModifier) { * @return whether we should check a given node. */ private boolean shouldCheck(final DetailAST ast) { - var result = false; + boolean result = false; if (!ScopeUtil.isInCodeBlock(ast) && !isIgnored(ast)) { final AccessModifierOption accessModifier = getAccessModifierFromModifiersTokenWithPrivateEnumSupport(ast); 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 b7d66df0310a..4f0e792b1dd2 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 @@ -95,7 +95,7 @@ public void visitToken(DetailAST ast) { * @return true if there is javadoc, false otherwise */ private static boolean hasJavadoc(DetailAST ast) { - final var hasJavadocBefore = ast.getPreviousSibling() != null + final boolean hasJavadocBefore = ast.getPreviousSibling() != null && isJavadoc(ast.getPreviousSibling()); return hasJavadocBefore || hasJavadocAboveAnnotation(ast); } @@ -110,7 +110,7 @@ private static boolean hasJavadocAboveAnnotation(DetailAST ast) { final Optional firstAnnotationChild = Optional.of(ast.getFirstChild()) .map(DetailAST::getFirstChild) .map(DetailAST::getFirstChild); - var result = false; + boolean result = false; if (firstAnnotationChild.isPresent()) { for (DetailAST child = firstAnnotationChild.orElseThrow(); child != null; child = child.getNextSibling()) { 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 3268d63915f2..8d0e9c254b62 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 @@ -122,7 +122,7 @@ public int[] getRequiredTokens() { public void visitToken(DetailAST ast) { if (shouldCheck(ast)) { final FileContents contents = getFileContents(); - final var lineNo = ast.getLineNo(); + final int lineNo = ast.getLineNo(); final TextBlock textBlock = contents.getJavadocBefore(lineNo); if (textBlock == null) { log(ast, MSG_JAVADOC_MISSING); 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 4e30c8d583a2..55315ae31900 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 @@ -111,7 +111,7 @@ && hasInsufficientConsecutiveNewlines(tagNode)) { * @return true when there is a javadoc tag before the provided tagNode. */ private static boolean isAnotherTagBefore(DetailNode tagNode) { - var found = false; + boolean found = false; DetailNode currentNode = tagNode.getPreviousSibling(); while (currentNode != null) { if (currentNode.getType() == JavadocCommentsTokenTypes.JAVADOC_BLOCK_TAG) { @@ -179,7 +179,7 @@ private static boolean isOnlyTagInWholeJavadoc(DetailNode tagNode) { * @return true if there are not enough empty lines before the tagNode. */ private static boolean hasInsufficientConsecutiveNewlines(DetailNode tagNode) { - var count = 0; + int count = 0; DetailNode currentNode = tagNode.getPreviousSibling(); while (currentNode != null && (CommonUtil.isBlank(currentNode.getText()) 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 b7070a505744..582788601287 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 @@ -145,7 +145,7 @@ private boolean hasJavadocInlineTags(DetailNode javadocRoot) { DetailNode javadocTagSection = JavadocUtil.findFirstToken( javadocRoot, JavadocCommentsTokenTypes.JAVADOC_INLINE_TAG); - var foundTag = false; + boolean foundTag = false; while (javadocTagSection != null) { if (!isTagIgnored(javadocTagSection)) { foundTag = true; 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 f9b4cb053b95..851ab7e75b3b 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 @@ -205,7 +205,7 @@ else if (!period.isEmpty()) { * @return {@code true} if the {@code {@summary}} tag is defined first in the javadoc */ private static boolean isDefinedFirst(DetailNode inlineTagNode) { - var isDefinedFirst = true; + boolean isDefinedFirst = true; DetailNode currentAst = inlineTagNode.getPreviousSibling(); while (currentAst != null && isDefinedFirst) { switch (currentAst.getType()) { @@ -235,7 +235,7 @@ private static boolean isDefinedFirst(DetailNode inlineTagNode) { * @return {@code true} if some text is present inside the HTML element */ public static boolean isHtmlTagWithoutText(DetailNode node) { - var isEmpty = true; + boolean isEmpty = true; final DetailNode htmlContentToken = JavadocUtil.findFirstToken(node, JavadocCommentsTokenTypes.HTML_CONTENT); @@ -283,7 +283,7 @@ private void validateSummaryTag(DetailNode inlineSummaryTag) { log(inlineSummaryTag.getLineNumber(), MSG_SUMMARY_JAVADOC_MISSING); } else if (!period.isEmpty()) { - final var isPeriodNotAtEnd = + final boolean isPeriodNotAtEnd = summaryVisible.lastIndexOf(period) != summaryVisible.length() - 1; if (isPeriodNotAtEnd) { log(inlineSummaryTag.getLineNumber(), MSG_SUMMARY_MISSING_PERIOD); @@ -369,7 +369,7 @@ private boolean containsForbiddenFragment(String firstSentence) { */ private static String trimExcessWhitespaces(String text) { final StringBuilder result = new StringBuilder(256); - var previousWhitespace = true; + boolean previousWhitespace = true; for (char letter : text.toCharArray()) { final char print; @@ -399,7 +399,7 @@ private static String trimExcessWhitespaces(String text) { * @return {@code true} if the javadoc starts with an {@inheritDoc}. */ private static boolean startsWithInheritDoc(DetailNode root) { - var found = false; + boolean found = false; DetailNode node = root.getFirstChild(); while (node != null) { @@ -525,10 +525,10 @@ private static Stream streamTextParts(DetailNode node) { * or empty Optional if no ending was found. */ private static Optional findSentenceEnding(String text, String period) { - var periodIndex = text.indexOf(period); + int periodIndex = text.indexOf(period); Optional result = Optional.empty(); while (periodIndex >= 0) { - final var afterPeriodIndex = periodIndex + period.length(); + final int afterPeriodIndex = periodIndex + period.length(); // Handle western period separately as it is only the end of a sentence if followed // by whitespace. Other period characters often include whitespace in the character. 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 4c9f69e7e9f5..08227ae97fc1 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 @@ -96,7 +96,7 @@ private void add(HtmlTag tag) { * @param lineNo the source line number. */ private void parseTags(String[] text, int lineNo) { - final var nLines = text.length; + final int nLines = text.length; Point position = new Point(0, 0); while (position.lineNo() < nLines) { // if this is html comment then skip it @@ -125,11 +125,11 @@ else if (isTag(text, position)) { private Point parseTag(String[] text, int lineNo, final int nLines, Point position) { // find end of tag final Point endTag = findChar(text, '>', position); - final var incompleteTag = endTag.lineNo() >= nLines; + final boolean incompleteTag = endTag.lineNo() >= nLines; // get tag id (one word) final String tagId = getTagId(text, position); // is this closed tag - final var closedTag = + final boolean closedTag = endTag.lineNo() < nLines && text[endTag.lineNo()] .charAt(endTag.columnNo() - 1) == '/'; @@ -151,7 +151,7 @@ private Point parseTag(String[] text, int lineNo, final int nLines, Point positi * @return {@code true} some HTML tag starts from given position. */ private static boolean isTag(String[] javadocText, Point pos) { - final var column = pos.columnNo() + 1; + final int column = pos.columnNo() + 1; final String text = javadocText[pos.lineNo()]; // Character.isJavaIdentifier... may not be a valid HTML @@ -170,14 +170,14 @@ private static boolean isTag(String[] javadocText, Point pos) { */ private static String getTagId(String[] javadocText, Point tagStart) { String tagId = ""; - var column = tagStart.columnNo() + 1; + int column = tagStart.columnNo() + 1; String text = javadocText[tagStart.lineNo()]; if (column < text.length()) { if (text.charAt(column) == '/') { column++; } text = text.substring(column); - var position = 0; + int position = 0; // Character.isJavaIdentifier... may not be a valid HTML // identifier but is valid for generics @@ -246,8 +246,8 @@ private static Point findChar(String[] text, char character, Point from) { * @return next point to be examined */ private static Point getNextPoint(String[] text, Point from) { - var line = from.lineNo(); - var column = from.columnNo() + 1; + int line = from.lineNo(); + int column = from.columnNo() + 1; while (line < text.length && column >= text[line].length()) { // go to the next line line++; 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 d26efffdd147..ed2fba823ef1 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 @@ -213,13 +213,13 @@ private static int countCommentLines(DetailAST blockComment) { */ private void checkTag(int astLineNo, int javadocLineNo, String... comment) { if (tagRegExp != null) { - var hasTag = false; - for (var i = 0; i < comment.length; i++) { + boolean hasTag = false; + for (int i = 0; i < comment.length; i++) { final String commentValue = comment[i]; final Matcher matcher = tagRegExp.matcher(commentValue); if (matcher.find()) { hasTag = true; - final var contentStart = matcher.start(1); + final int contentStart = matcher.start(1); final String content = commentValue.substring(contentStart); if (tagFormat == null || tagFormat.matcher(content).find()) { logTag(astLineNo + i, tag, content); 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 3d0031747013..cadd31f27f1a 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 @@ -56,9 +56,9 @@ private BlockTagUtil() { public static List extractBlockTags(String... lines) { final List tags = new ArrayList<>(); - for (var i = 0; i < lines.length; i++) { + for (int i = 0; i < lines.length; i++) { // Starting lines of a comment have a different first line pattern. - final var isFirstLine = i == 0; + final boolean isFirstLine = i == 0; final Pattern pattern; if (isFirstLine) { pattern = BLOCK_TAG_PATTERN_FIRST_LINE; @@ -74,15 +74,15 @@ public static List extractBlockTags(String... lines) { final String tagName = tagMatcher.group(1); // offset of one for the @ character - final var colNum = tagMatcher.start(1) - 1; - final var lineNum = i + 1; + final int colNum = tagMatcher.start(1) - 1; + final int lineNum = i + 1; final String remainder = line.substring(tagMatcher.end(1)); String tagValue = remainder.trim(); // Handle the case where we're on the last line of a Javadoc comment. if (tagValue.endsWith(JAVADOC_CLOSING_TAG)) { - final var endIndex = tagValue.length() - JAVADOC_CLOSING_TAG.length(); + final int endIndex = tagValue.length() - JAVADOC_CLOSING_TAG.length(); tagValue = tagValue.substring(0, endIndex).trim(); } 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 dbed1233772e..c93628946407 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 @@ -88,7 +88,7 @@ public static List extractInlineTags(String... lines) { final String tagValue = matchedTagValue; - final var startIndex = inlineTagMatcher.start(1); + final int startIndex = inlineTagMatcher.start(1); final LineColumn position = getLineColumnOfIndex(commentText, // correct start index offset startIndex - 1); 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 46b7a7acd71f..91f4335aad6d 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 @@ -246,7 +246,7 @@ private void registerImport(DetailAST imp) { final FullIdent ident = FullIdent.createFullIdent( imp.getLastChild().getPreviousSibling()); final String fullName = ident.getText(); - final var lastDot = fullName.lastIndexOf(DOT); + final int lastDot = fullName.lastIndexOf(DOT); importedClassPackages.put(fullName.substring(lastDot + 1), fullName); } @@ -438,9 +438,9 @@ private boolean isFromExcludedPackage(String candidateClassName) { classNameWithPackage = getClassNameWithPackage(candidateClassName) .orElse(""); } - var isFromExcludedPackage = false; + boolean isFromExcludedPackage = false; if (classNameWithPackage.indexOf(DOT) != -1) { - final var lastDotIndex = classNameWithPackage.lastIndexOf(DOT); + final int lastDotIndex = classNameWithPackage.lastIndexOf(DOT); final String candidatePackageName = classNameWithPackage.substring(0, lastDotIndex); isFromExcludedPackage = candidatePackageName.startsWith("java.lang") @@ -467,7 +467,7 @@ private Optional getClassNameWithPackage(String examineClassName) { * @return true if we should not count this class. */ private boolean isExcludedClassRegexp(String candidateClassName) { - var result = false; + boolean result = false; for (Pattern pattern : excludeClassesRegexps) { if (pattern.matcher(candidateClassName).matches()) { result = true; 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 f1b85596b931..67d532ca0aa1 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 @@ -202,7 +202,7 @@ public void leaveToken(DetailAST ast) { */ private void visitMethodDef(DetailAST ast) { contextStack.push(context); - final var check = !CheckUtil.isEqualsMethod(ast); + final boolean check = !CheckUtil.isEqualsMethod(ast); context = new Context(check); } 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 bb839b44930b..ddf0e30d23bb 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 @@ -174,7 +174,7 @@ public void beginTree(DetailAST rootAST) { @Override public void visitToken(DetailAST ast) { - final var tokenType = ast.getType(); + final int tokenType = ast.getType(); if (tokenType == TokenTypes.CLASS_DEF || tokenType == TokenTypes.RECORD_DEF @@ -192,13 +192,13 @@ public void visitToken(DetailAST ast) { @Override public void leaveToken(DetailAST ast) { - final var tokenType = ast.getType(); + final int tokenType = ast.getType(); if (isMethodOrCtorOrInitDefinition(tokenType)) { // pop counter from the stack final Counter counter = counters.pop(); - final var count = counter.getCount(); + final int count = counter.getCount(); if (count > methodMaximum) { log(ast, MSG_METHOD, count, methodMaximum); } @@ -207,7 +207,7 @@ else if (tokenType == TokenTypes.CLASS_DEF) { // pop counter from the stack final Counter counter = counters.pop(); - final var count = counter.getCount(); + final int count = counter.getCount(); if (count > classMaximum) { log(ast, MSG_CLASS, count, classMaximum); } @@ -216,7 +216,7 @@ else if (tokenType == TokenTypes.RECORD_DEF) { // pop counter from the stack final Counter counter = counters.pop(); - final var count = counter.getCount(); + final int count = counter.getCount(); if (count > recordMaximum) { log(ast, MSG_RECORD, count, recordMaximum); } @@ -228,7 +228,7 @@ public void finishTree(DetailAST rootAST) { // pop counter from the stack final Counter counter = counters.pop(); - final var count = counter.getCount(); + final int count = counter.getCount(); if (count > fileMaximum) { log(rootAST, MSG_FILE, count, fileMaximum); } @@ -287,9 +287,9 @@ public void setMethodMaximum(int methodMaximum) { * @return true if the token is countable */ private static boolean isCountable(DetailAST ast) { - var countable = true; + boolean countable = true; - final var tokenType = ast.getType(); + final int tokenType = ast.getType(); // check if an expression is countable if (tokenType == TokenTypes.EXPR) { @@ -309,11 +309,11 @@ else if (tokenType == TokenTypes.VARIABLE_DEF) { * @return true if the variable definition is countable, false otherwise */ private static boolean isVariableDefCountable(DetailAST ast) { - var countable = false; + boolean countable = false; // count variable definitions only if they are direct child to a slist or // object block - final var parentType = ast.getParent().getType(); + final int parentType = ast.getParent().getType(); if (parentType == TokenTypes.SLIST || parentType == TokenTypes.OBJBLOCK) { @@ -341,7 +341,7 @@ private static boolean isExpressionCountable(DetailAST ast) { // count expressions only if they are direct child to a slist (method // body, for loop...) // or direct child of label,if,else,do,while,for - final var parentType = ast.getParent().getType(); + final int parentType = ast.getParent().getType(); return switch (parentType) { case TokenTypes.SLIST, TokenTypes.LABELED_STAT, TokenTypes.LITERAL_FOR, TokenTypes.LITERAL_DO, 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 1fe4a6550a0c..28f5aa075505 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 @@ -237,13 +237,13 @@ public void visitToken(DetailAST ast) { case TokenTypes.LITERAL_WHEN -> visitWhenExpression(ast, 1); case TokenTypes.CASE_GROUP -> { - final var caseNumber = countCaseTokens(ast); + final int caseNumber = countCaseTokens(ast); branchVisited = true; pushValue(caseNumber); } case TokenTypes.SWITCH_RULE -> { - final var caseConstantNumber = countCaseConstants(ast); + final int caseConstantNumber = countCaseConstants(ast); branchVisited = true; pushValue(caseConstantNumber); } @@ -318,7 +318,7 @@ public void leaveToken(DetailAST ast) { * @param basicBranchingFactor default number of branches added. */ private void visitConditional(DetailAST ast, int basicBranchingFactor) { - var expressionValue = basicBranchingFactor; + int expressionValue = basicBranchingFactor; DetailAST bracketed; for (bracketed = ast.findFirstToken(TokenTypes.LPAREN); bracketed.getType() != TokenTypes.RPAREN; @@ -337,7 +337,7 @@ private void visitConditional(DetailAST ast, int basicBranchingFactor) { * @param basicBranchingFactor default number of branches added. */ private void visitWhenExpression(DetailAST ast, int basicBranchingFactor) { - final var expressionValue = basicBranchingFactor + countConditionalOperators(ast); + final int expressionValue = basicBranchingFactor + countConditionalOperators(ast); processingTokenEnd.setToken(getLastToken(ast)); pushValue(expressionValue); } @@ -350,11 +350,11 @@ private void visitWhenExpression(DetailAST ast, int basicBranchingFactor) { * @param basicBranchingFactor number of branches inherently added by this token. */ private void visitUnitaryOperator(DetailAST ast, int basicBranchingFactor) { - final var isAfter = processingTokenEnd.isAfter(ast); + final boolean isAfter = processingTokenEnd.isAfter(ast); afterValues.push(isAfter); if (!isAfter) { processingTokenEnd.setToken(getLastToken(ast)); - final var expressionValue = basicBranchingFactor + countConditionalOperators(ast); + final int expressionValue = basicBranchingFactor + countConditionalOperators(ast); pushValue(expressionValue); } } @@ -441,7 +441,7 @@ private void pushValue(Integer expressionValue) { * @return pair of head values from both of the stacks. */ private Values popValue() { - final var expressionValue = expressionValues.pop(); + final int expressionValue = expressionValues.pop(); return new Values(rangeValues.pop(), BigInteger.valueOf(expressionValue)); } @@ -464,10 +464,10 @@ private void leaveMultiplyingConditional() { * Java Language Specification, §15.25 */ private static int countConditionalOperators(DetailAST ast) { - var number = 0; + int number = 0; for (DetailAST child = ast.getFirstChild(); child != null; child = child.getNextSibling()) { - final var type = child.getType(); + final int type = child.getType(); if (type == TokenTypes.LOR || type == TokenTypes.LAND) { number++; } @@ -504,7 +504,7 @@ private static DetailAST getLastToken(DetailAST ast) { * @return number of case tokens. */ private static int countCaseTokens(DetailAST ast) { - var counter = 0; + int counter = 0; for (DetailAST iterator = ast.getFirstChild(); iterator != null; iterator = iterator.getNextSibling()) { if (iterator.getType() == TokenTypes.LITERAL_CASE) { @@ -521,7 +521,7 @@ private static int countCaseTokens(DetailAST ast) { * @return number of case constant tokens. */ private static int countCaseConstants(DetailAST ast) { - var counter = 0; + int counter = 0; final DetailAST literalCase = ast.getFirstChild(); for (DetailAST node = literalCase.getFirstChild(); node != null; @@ -571,8 +571,8 @@ public void reset() { * @return true, if saved coordinates located after given token. */ public boolean isAfter(DetailAST ast) { - final var lineNo = ast.getLineNo(); - final var columnNo = ast.getColumnNo(); + final int lineNo = ast.getLineNo(); + final int columnNo = ast.getColumnNo(); return lineNo <= endLineNo && (lineNo != endLineNo || columnNo <= endColumnNo); 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 f460eafd247c..3c796971c40c 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 @@ -157,7 +157,7 @@ private static DetailAST checkOrderSuggestedByJls(List modifiers) { // All modifiers are annotations, no problem if (modifier.getType() != TokenTypes.ANNOTATION) { - var index = 0; + int index = 0; while (modifier != null && offendingModifier == null) { @@ -211,10 +211,10 @@ private static DetailAST skipAnnotations(Iterator modifierIterator) { * @return true if annotation on type takes place. */ private static boolean isAnnotationOnType(DetailAST modifier) { - var annotationOnType = false; + boolean annotationOnType = false; final DetailAST modifiers = modifier.getParent(); final DetailAST definition = modifiers.getParent(); - final var definitionType = definition.getType(); + final int definitionType = definition.getType(); if (definitionType == TokenTypes.VARIABLE_DEF || definitionType == TokenTypes.PARAMETER_DEF || definitionType == TokenTypes.CTOR_DEF) { @@ -222,7 +222,7 @@ private static boolean isAnnotationOnType(DetailAST modifier) { } else if (definitionType == TokenTypes.METHOD_DEF) { final DetailAST typeToken = definition.findFirstToken(TokenTypes.TYPE); - final var methodReturnType = typeToken.getLastChild().getType(); + final int methodReturnType = typeToken.getLastChild().getType(); if (methodReturnType != TokenTypes.LITERAL_VOID) { annotationOnType = true; } 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 fffca9ebe694..444f7dee6230 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 @@ -267,8 +267,8 @@ else if (ast.getType() == TokenTypes.METHOD_DEF) { * @return true if there is a modifier to be ignored */ private boolean hasIgnoredModifiers(DetailAST modifiers) { - final var isStatic = modifiers.findFirstToken(TokenTypes.LITERAL_STATIC) != null; - final var isFinal = modifiers.findFirstToken(TokenTypes.FINAL) != null; + final boolean isStatic = modifiers.findFirstToken(TokenTypes.LITERAL_STATIC) != null; + final boolean isFinal = modifiers.findFirstToken(TokenTypes.FINAL) != null; final boolean result; if (isStatic && isFinal) { result = ignoreStaticFinal; @@ -287,7 +287,7 @@ private boolean hasIgnoredModifiers(DetailAST modifiers) { * or @interface definition. */ private static boolean isInterfaceDeclaration(DetailAST variableDefAst) { - var result = false; + boolean result = false; final DetailAST astBlock = variableDefAst.getParent(); final DetailAST astParent2 = astBlock.getParent(); @@ -307,7 +307,7 @@ private static boolean isInterfaceDeclaration(DetailAST variableDefAst) { * @return true if method has "@Override" annotation. */ private static boolean hasOverrideAnnotation(DetailAST methodModifiersAST) { - var result = false; + boolean result = false; for (DetailAST child : getChildren(methodModifiersAST)) { final DetailAST annotationIdent = child.findFirstToken(TokenTypes.IDENT); @@ -328,12 +328,12 @@ private static boolean hasOverrideAnnotation(DetailAST methodModifiersAST) { * separate String. */ private String getDisallowedAbbreviation(String str) { - var beginIndex = 0; - var abbrStarted = false; + int beginIndex = 0; + boolean abbrStarted = false; String result = null; - for (var index = 0; index < str.length(); index++) { - final var symbol = str.charAt(index); + for (int index = 0; index < str.length(); index++) { + final char symbol = str.charAt(index); if (Character.isUpperCase(symbol)) { if (!abbrStarted) { @@ -363,7 +363,7 @@ else if (abbrStarted) { } // if abbreviation at the end of name (example: scaleX) if (abbrStarted) { - final var endIndex = str.length() - 1; + final int endIndex = str.length() - 1; result = getAbbreviationIfIllegal(str, beginIndex, endIndex, allowedAbbreviationLength); } return result; @@ -383,7 +383,7 @@ else if (abbrStarted) { private String getAbbreviationIfIllegal(String str, int beginIndex, int endIndex, int allowedLength) { String result = null; - final var abbrLength = endIndex - beginIndex; + final int abbrLength = endIndex - beginIndex; if (abbrLength > allowedLength) { final String abbr = getAbbreviation(str, beginIndex, endIndex); if (!allowedAbbreviations.contains(abbr)) { 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 74f395fa07a9..23ffb3c7445e 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 @@ -81,13 +81,13 @@ protected boolean mustCheckName(DetailAST ast) { * @return true if we should check such member. */ protected boolean shouldCheckInScope(DetailAST modifiers) { - final var isProtected = modifiers + final boolean isProtected = modifiers .findFirstToken(TokenTypes.LITERAL_PROTECTED) != null; - final var isPrivate = modifiers + final boolean isPrivate = modifiers .findFirstToken(TokenTypes.LITERAL_PRIVATE) != null; - final var isPublic = isPublic(modifiers); + final boolean isPublic = isPublic(modifiers); - final var isPackage = !(isPublic || isProtected || isPrivate); + final boolean isPackage = !(isPublic || isProtected || isPrivate); return applyToPublic && isPublic || applyToProtected && isProtected 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 e1873ba53f77..84a1648e348b 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 @@ -103,11 +103,11 @@ public final void setApplyToPublic(boolean applyTo) { @Override protected final boolean mustCheckName(DetailAST ast) { - var returnValue = false; + boolean returnValue = false; final DetailAST modifiersAST = ast.findFirstToken(TokenTypes.MODIFIERS); - final var isStaticFinal = + final boolean isStaticFinal = modifiersAST.findFirstToken(TokenTypes.LITERAL_STATIC) != null && modifiersAST.findFirstToken(TokenTypes.FINAL) != null || ScopeUtil.isInAnnotationBlock(ast) 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 2d9d730b9dac..1376452146d6 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 @@ -58,7 +58,7 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { - final var isInSwitchRule = ast.getParent().getType() == TokenTypes.SWITCH_RULE; + final boolean isInSwitchRule = ast.getParent().getType() == TokenTypes.SWITCH_RULE; if (Objects.nonNull(ast.findFirstToken(TokenTypes.PARAMETERS))) { final DetailAST parametersNode = ast.findFirstToken(TokenTypes.PARAMETERS); 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 8e459ae9ebbc..9fed1f05f81f 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 @@ -70,7 +70,7 @@ public int[] getRequiredTokens() { protected final boolean mustCheckName(DetailAST ast) { final DetailAST modifiersAST = ast.findFirstToken(TokenTypes.MODIFIERS); - final var isFinal = ast.getType() == TokenTypes.RESOURCE + final boolean isFinal = ast.getType() == TokenTypes.RESOURCE || modifiersAST.findFirstToken(TokenTypes.FINAL) != null; return isFinal && ScopeUtil.isLocalVariableDef(ast); } 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 8f481b365127..b51d721d65a9 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 @@ -92,7 +92,7 @@ protected final boolean mustCheckName(DetailAST ast) { } else { final DetailAST modifiersAST = ast.findFirstToken(TokenTypes.MODIFIERS); - final var isFinal = modifiersAST.findFirstToken(TokenTypes.FINAL) != null; + final boolean isFinal = modifiersAST.findFirstToken(TokenTypes.FINAL) != null; result = !isFinal && ScopeUtil.isLocalVariableDef(ast); } return result; @@ -105,7 +105,7 @@ protected final boolean mustCheckName(DetailAST ast) { * @return true if a variable is the loop's one. */ private static boolean isForLoopVariable(DetailAST variableDef) { - final var parentType = variableDef.getParent().getType(); + final int parentType = variableDef.getParent().getType(); return parentType == TokenTypes.FOR_INIT || parentType == TokenTypes.FOR_EACH_CLAUSE; } 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 d9fcc8457471..ebf667c31ffb 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 @@ -101,7 +101,7 @@ public final void setApplyToPublic(boolean applyTo) { protected final boolean mustCheckName(DetailAST ast) { final DetailAST modifiersAST = ast.findFirstToken(TokenTypes.MODIFIERS); - final var isStatic = modifiersAST.findFirstToken(TokenTypes.LITERAL_STATIC) != null; + final boolean isStatic = modifiersAST.findFirstToken(TokenTypes.LITERAL_STATIC) != null; return !isStatic && !ScopeUtil.isInInterfaceOrAnnotationBlock(ast) && !ScopeUtil.isLocalVariableDef(ast) 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 b50a7f4a1202..3c9d4f6ce50b 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 @@ -107,7 +107,7 @@ public int[] getRequiredTokens() { @Override protected boolean mustCheckName(DetailAST ast) { - var checkName = true; + boolean checkName = true; final DetailAST parent = ast.getParent(); if (ignoreOverridden && isOverriddenMethod(ast) || parent.getType() == TokenTypes.LITERAL_CATCH @@ -138,7 +138,7 @@ private boolean matchAccessModifiers(final AccessModifierOption accessModifier) * @return true if a method is annotated with Override annotation. */ private static boolean isOverriddenMethod(DetailAST ast) { - var overridden = false; + boolean overridden = false; final DetailAST parent = ast.getParent().getParent(); final Optional annotation = 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 66aa261489e4..d79d07f70e08 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 @@ -101,8 +101,8 @@ public final void setApplyToPublic(boolean applyTo) { protected final boolean mustCheckName(DetailAST ast) { final DetailAST modifiersAST = ast.findFirstToken(TokenTypes.MODIFIERS); - final var isStatic = modifiersAST.findFirstToken(TokenTypes.LITERAL_STATIC) != null; - final var isFinal = modifiersAST.findFirstToken(TokenTypes.FINAL) != null; + final boolean isStatic = modifiersAST.findFirstToken(TokenTypes.LITERAL_STATIC) != null; + final boolean isFinal = modifiersAST.findFirstToken(TokenTypes.FINAL) != null; return isStatic && !isFinal 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 697876d1c462..04efe8fbb877 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 @@ -257,7 +257,7 @@ public DetectorOptions build() { * @return Pattern object. */ private Pattern createPattern(String formatValue) { - var options = compileFlags; + int options = compileFlags; if (ignoreCase) { options |= Pattern.CASE_INSENSITIVE; } 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 6b1c767e7c82..7b7b81b4338d 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 @@ -93,7 +93,7 @@ public void processLines(FileText fileText) { /** Method that finds the matches. */ private void findMatch() { try { - var foundMatch = matcher.find(); + boolean foundMatch = matcher.find(); while (foundMatch) { currentMatches++; 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 2c1e3df03a05..a1f221d89be5 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 @@ -261,14 +261,14 @@ public void beginTree(DetailAST rootAST) { @SuppressWarnings("deprecation") private void processRegexpMatches() { final Matcher matcher = format.matcher(getFileContents().getText().getFullText()); - var errorCount = 0; - var matchCount = 0; + int errorCount = 0; + int matchCount = 0; final FileText text = getFileContents().getText(); while (errorCount < errorLimit && matcher.find()) { final LineColumn start = text.lineColumn(matcher.start()); - final var startLine = start.getLine(); + final int startLine = start.getLine(); - final var ignore = isIgnore(startLine, text, start, matcher); + final boolean ignore = isIgnore(startLine, text, start, matcher); if (!ignore) { matchCount++; if (illegalPattern || checkForDuplicates @@ -303,12 +303,12 @@ private boolean isIgnore(int startLine, FileText text, LineColumn start, Matcher else { end = text.lineColumn(matcher.end() - 1); } - var ignore = false; + boolean ignore = false; if (ignoreComments) { final FileContents theFileContents = getFileContents(); - final var startColumn = start.getColumn(); - final var endLine = end.getLine(); - final var endColumn = end.getColumn(); + final int startColumn = start.getColumn(); + final int endLine = end.getLine(); + final int endColumn = end.getColumn(); ignore = theFileContents.hasIntersectionWithComment(startLine, startColumn, endLine, endColumn); } 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 714b2aa087ad..4d6a8efa7b61 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 @@ -207,7 +207,7 @@ private boolean isMatchFolder(String folderPath) { } else { // null pattern means 'match' applies to the folderPattern matching - final var useMatch = fileNamePattern != null || match; + final boolean useMatch = fileNamePattern != null || match; result = folderPattern.matcher(folderPath).find() == useMatch; } 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 cd77d3437aac..eb2cbd369939 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 @@ -65,8 +65,8 @@ class SinglelineDetector { */ public void processLines(FileText fileText) { currentMatches = 0; - var lineNo = 0; - for (var index = 0; index < fileText.size(); index++) { + int lineNo = 0; + for (int index = 0; index < fileText.size(); index++) { final String line = fileText.get(index); lineNo++; checkLine(lineNo, options.getPattern().matcher(line)); @@ -96,11 +96,11 @@ private void finish() { * @param matcher the matcher to use */ private void checkLine(int lineNo, Matcher matcher) { - var startPosition = 0; + int startPosition = 0; while (matcher.find(startPosition)) { // match is found, check for intersection with comment - final var startCol = matcher.start(0); - final var endCol = matcher.end(0); + final int startCol = matcher.start(0); + final int endCol = matcher.end(0); // Note that Matcher.end(int) returns the offset AFTER the // last matched character, but shouldSuppress() // needs column number of the last character. 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 0e217f1e0b22..6dd2a66d59a7 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 @@ -75,7 +75,7 @@ public void visitToken(DetailAST ast) { if (openingBrace != null) { final DetailAST closingBrace = openingBrace.findFirstToken(TokenTypes.RCURLY); - final var length = + final int length = closingBrace.getLineNo() - openingBrace.getLineNo() + 1; if (length > max) { log(ast, MSG_KEY, length, max); 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 fde772120616..460ec85c17c7 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 @@ -148,7 +148,7 @@ private void visitContainerNode(DetailAST ast) { * @param ast the token representing the container node. */ private void leaveContainerNode(DetailAST ast) { - final var count = context.getCount(); + final int count = context.getCount(); if (count > max) { log(ast, MSG_KEY, count, max); } 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 d1b2c108343e..c05b76a870ac 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 @@ -81,7 +81,7 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { if (ast.getParent().getType() != TokenTypes.SWITCH_RULE) { - final var length = getLength(ast); + final int length = getLength(ast); if (length > max) { log(ast, MSG_KEY, length, max); } 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 6ef8c184494b..9d897aa7993c 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 @@ -108,8 +108,8 @@ public void visitToken(DetailAST ast) { * @return number of lines with code for current block */ private static int getLengthOfBlock(DetailAST openingBrace, DetailAST closingBrace) { - final var startLineNo = openingBrace.getLineNo(); - final var endLineNo = closingBrace.getLineNo(); + final int startLineNo = openingBrace.getLineNo(); + final int endLineNo = closingBrace.getLineNo(); return endLineNo - startLineNo + 1; } @@ -125,11 +125,11 @@ private static int countUsedLines(DetailAST ast) { final BitSet usedLines = new BitSet(); while (!nodes.isEmpty()) { final DetailAST node = nodes.removeFirst(); - final var lineIndex = node.getLineNo(); + final int lineIndex = node.getLineNo(); // text block requires special treatment, // since it is the only non-comment token that can span more than one line if (node.getType() == TokenTypes.TEXT_BLOCK_LITERAL_BEGIN) { - final var endLineIndex = node.getLastChild().getLineNo(); + final int endLineIndex = node.getLastChild().getLineNo(); usedLines.set(lineIndex, endLineIndex + 1); } else { 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 c19233efe83c..4321e244ada8 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 @@ -108,7 +108,7 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { final DetailAST params = ast.findFirstToken(TokenTypes.PARAMETERS); - final var count = params.getChildCount(TokenTypes.PARAMETER_DEF); + final int count = params.getChildCount(TokenTypes.PARAMETER_DEF); if (count > max && !shouldIgnoreNumberOfParameters(ast)) { final DetailAST name = ast.findFirstToken(TokenTypes.IDENT); log(name, MSG_KEY, max, count); 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 8641227ba862..05c3c62a3e32 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 @@ -111,7 +111,7 @@ public void visitToken(DetailAST ast) { if (matchAccessModifiers(accessModifier)) { final DetailAST recordComponents = ast.findFirstToken(TokenTypes.RECORD_COMPONENTS); - final var componentCount = countComponents(recordComponents); + final int componentCount = countComponents(recordComponents); if (componentCount > max) { log(ast, MSG_KEY, componentCount, max); 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 0a91131b2c2b..f7cdf624ca88 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 @@ -87,10 +87,10 @@ public void setOption(String optionStr) { */ protected void processLeft(DetailAST ast) { final int[] line = getLineCodePoints(ast.getLineNo() - 1); - final var after = ast.getColumnNo() + 1; + final int after = ast.getColumnNo() + 1; if (after < line.length) { - final var hasWhitespaceAfter = + final boolean hasWhitespaceAfter = CommonUtil.isCodePointWhitespace(line, after); if (option == PadOption.NOSPACE && hasWhitespaceAfter) { log(ast, MSG_WS_FOLLOWED, OPEN_PARENTHESIS); @@ -108,10 +108,10 @@ else if (option == PadOption.SPACE && !hasWhitespaceAfter * @param ast the token representing a right parentheses */ protected void processRight(DetailAST ast) { - final var before = ast.getColumnNo() - 1; + final int before = ast.getColumnNo() - 1; if (before >= 0) { final int[] line = getLineCodePoints(ast.getLineNo() - 1); - final var hasPrecedingWhitespace = + final boolean hasPrecedingWhitespace = CommonUtil.isCodePointWhitespace(line, before); if (option == PadOption.NOSPACE && hasPrecedingWhitespace 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 1bfcbeee69d9..ab57ab1634b1 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 @@ -187,7 +187,7 @@ public void visitToken(DetailAST ast) { * @param nextToken next sibling of the token */ private void checkToken(DetailAST ast, DetailAST nextToken) { - final var astType = ast.getType(); + final int astType = ast.getType(); switch (astType) { case TokenTypes.VARIABLE_DEF -> processVariableDef(ast, nextToken); @@ -231,7 +231,7 @@ private void checkCommentInModifiers(DetailAST packageDef) { * @param ast the ast to check. */ private void processMultipleLinesInside(DetailAST ast) { - final var astType = ast.getType(); + final int astType = ast.getType(); if (isClassMemberBlock(astType)) { final List emptyLines = getEmptyLines(ast); final List emptyLinesToLog = getEmptyLinesToLog(emptyLines); @@ -316,7 +316,7 @@ private static boolean isClassMemberBlock(int astType) { */ private List getEmptyLines(DetailAST ast) { final DetailAST lastToken = ast.getLastChild().getLastChild(); - var lastTokenLineNo = 0; + int lastTokenLineNo = 0; if (lastToken != null) { // -1 as count starts from 0 // -2 as last token line cannot be empty, because it is a RCURLY @@ -324,7 +324,7 @@ private List getEmptyLines(DetailAST ast) { } final List emptyLines = new ArrayList<>(); - for (var lineNo = ast.getLineNo(); lineNo <= lastTokenLineNo; lineNo++) { + for (int lineNo = ast.getLineNo(); lineNo <= lastTokenLineNo; lineNo++) { if (CommonUtil.isBlank(getLine(lineNo))) { emptyLines.add(lineNo); } @@ -340,7 +340,7 @@ private List getEmptyLines(DetailAST ast) { */ private static List getEmptyLinesToLog(Iterable emptyLines) { final List emptyLinesToLog = new ArrayList<>(); - var previousEmptyLineNo = -1; + int previousEmptyLineNo = -1; for (int emptyLineNo : emptyLines) { if (previousEmptyLineNo + 1 == emptyLineNo) { emptyLinesToLog.add(previousEmptyLineNo); @@ -395,7 +395,7 @@ else if (!hasEmptyLineAfter(ast)) { */ private static boolean isLineEmptyAfterPackage(DetailAST ast) { DetailAST nextElement = ast; - final var lastChildLineNo = ast.getLastChild().getLineNo(); + final int lastChildLineNo = ast.getLastChild().getLineNo(); while (nextElement.getLineNo() < lastChildLineNo + 1 && nextElement.getNextSibling() != null) { nextElement = nextElement.getNextSibling(); @@ -411,7 +411,7 @@ private static boolean isLineEmptyAfterPackage(DetailAST ast) { */ private static DetailAST getViolationAstForPackage(DetailAST ast) { DetailAST nextElement = ast; - final var lastChildLineNo = ast.getLastChild().getLineNo(); + final int lastChildLineNo = ast.getLastChild().getLineNo(); while (nextElement.getLineNo() < lastChildLineNo + 1) { nextElement = nextElement.getNextSibling(); } @@ -530,15 +530,15 @@ else if (isCommentInBeginningOfLine(childNode)) { * @return true, if token has empty lines before. */ private boolean isPrePreviousLineEmpty(DetailAST token) { - var result = false; - final var lineNo = token.getLineNo(); + boolean result = false; + final int lineNo = token.getLineNo(); // 3 is the number of the pre-previous line because the numbering starts from zero. - final var number = 3; + final int number = 3; if (lineNo >= number) { final String prePreviousLine = getLine(lineNo - number); result = CommonUtil.isBlank(prePreviousLine); - final var previousLineIsEmpty = CommonUtil.isBlank(getLine(lineNo - 2)); + final boolean previousLineIsEmpty = CommonUtil.isBlank(getLine(lineNo - 2)); if (previousLineIsEmpty && result) { result = true; @@ -558,7 +558,7 @@ else if (token.findFirstToken(TokenTypes.TYPE) != null) { * @return true, if both previous and pre-previous lines from dependent comment are empty */ private boolean isTwoPrecedingPreviousLinesFromCommentEmpty(DetailAST token) { - var upToPrePreviousLinesEmpty = false; + boolean upToPrePreviousLinesEmpty = false; for (DetailAST typeChild = token.findFirstToken(TokenTypes.TYPE).getLastChild(); typeChild != null; typeChild = typeChild.getPreviousSibling()) { @@ -617,9 +617,9 @@ private boolean hasEmptyLineAfter(DetailAST token) { nextToken = nextToken.getNextSibling(); } // Start of the next token - final var nextBegin = nextToken.getLineNo(); + final int nextBegin = nextToken.getLineNo(); // End of current token. - final var currentEnd = lastToken.getLineNo(); + final int currentEnd = lastToken.getLineNo(); return hasEmptyLine(currentEnd + 1, nextBegin - 1); } @@ -648,8 +648,8 @@ private static Optional findCommentUnder(DetailAST packageDef) { */ private boolean hasEmptyLine(int startLine, int endLine) { // Initial value is false - blank line not found - var result = false; - for (var line = startLine; line <= endLine; line++) { + boolean result = false; + for (int line = startLine; line <= endLine; line++) { // Check, if the line is blank. Lines are numbered from 0, so subtract 1 if (CommonUtil.isBlank(getLine(line - 1))) { result = true; @@ -666,8 +666,8 @@ private boolean hasEmptyLine(int startLine, int endLine) { * @return true, if token have empty line before. */ private boolean hasEmptyLineBefore(DetailAST token) { - var result = false; - final var lineNo = token.getLineNo(); + boolean result = false; + final int lineNo = token.getLineNo(); if (lineNo != 1) { // [lineNo - 2] is the number of the previous line as the numbering starts from zero. final String lineBefore = getLine(lineNo - 2); @@ -699,7 +699,7 @@ else if (token.findFirstToken(TokenTypes.TYPE) != null) { private boolean isCommentInBeginningOfLine(DetailAST comment) { // comment.getLineNo() - 1 is the number of the previous line as the numbering starts // from zero. - var result = false; + boolean result = false; if (comment != null) { final String lineWithComment = getLine(comment.getLineNo() - 1).trim(); result = lineWithComment.startsWith("//") || lineWithComment.startsWith("/*"); @@ -714,7 +714,7 @@ private boolean isCommentInBeginningOfLine(DetailAST comment) { * @return true, if token is preceded by javadoc comment. */ private static boolean isPrecededByJavadoc(DetailAST token) { - var result = false; + boolean result = false; final DetailAST previous = token.getPreviousSibling(); if (previous.getType() == TokenTypes.BLOCK_COMMENT_BEGIN && JavadocUtil.isJavadocComment(previous.getFirstChild().getText())) { 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 ec80f713890f..81df419ef068 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 @@ -73,11 +73,11 @@ public class FileTabCharacterCheck extends AbstractFileSetCheck { @Override protected void processFiltered(File file, FileText fileText) { - var lineNum = 0; - for (var index = 0; index < fileText.size(); index++) { + int lineNum = 0; + for (int index = 0; index < fileText.size(); index++) { final String line = fileText.get(index); lineNum++; - final var tabPosition = line.indexOf('\t'); + final int tabPosition = line.indexOf('\t'); if (tabPosition != -1) { if (eachLine) { log(lineNum, tabPosition, MSG_CONTAINS_TAB); 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 dd928c2009a7..75ba9ccce7cd 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 @@ -143,8 +143,8 @@ public void visitToken(DetailAST ast) { */ private void processEnd(DetailAST ast) { final int[] line = getLineCodePoints(ast.getLineNo() - 1); - final var before = ast.getColumnNo() - 1; - final var after = ast.getColumnNo() + 1; + final int before = ast.getColumnNo() - 1; + final int after = ast.getColumnNo() + 1; if (before >= 0 && CommonUtil.isCodePointWhitespace(line, before) && !containsWhitespaceBefore(before, line)) { @@ -179,7 +179,7 @@ private void processNestedGenerics(DetailAST ast, int[] line, int after) { // ^ // should be whitespace if followed by & -+ // - final var indexOfAmp = IntStream.range(after, line.length) + final int indexOfAmp = IntStream.range(after, line.length) .filter(index -> line[index] == '&') .findFirst() .orElse(-1); @@ -205,7 +205,7 @@ else if (line[after] == ' ') { * @param after position after */ private void processSingleGeneric(DetailAST ast, int[] line, int after) { - final var charAfter = Character.toChars(line[after])[0]; + final char charAfter = Character.toChars(line[after])[0]; if (isGenericBeforeMethod(ast) || isGenericBeforeCtorInvocation(ast) || isGenericBeforeRecordHeader(ast)) { @@ -298,8 +298,8 @@ private static boolean isAfterMethodReference(DetailAST genericEnd) { */ private void processStart(DetailAST ast) { final int[] line = getLineCodePoints(ast.getLineNo() - 1); - final var before = ast.getColumnNo() - 1; - final var after = ast.getColumnNo() + 1; + final int before = ast.getColumnNo() - 1; + final int after = ast.getColumnNo() + 1; // Checks if generic needs to be preceded by a whitespace or not. // Handles 3 cases as in: @@ -346,8 +346,8 @@ else if (CommonUtil.isCodePointWhitespace(line, before) * @return whether there are only whitespaces (or nothing) */ private static boolean containsWhitespaceBetween(int fromIndex, int toIndex, int... line) { - var result = true; - for (var i = fromIndex; i < toIndex; i++) { + boolean result = true; + for (int i = fromIndex; i < toIndex; i++) { if (!CommonUtil.isCodePointWhitespace(line, i)) { result = false; break; 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 b80691e4aba4..adc0d0dd7e1a 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 @@ -118,7 +118,7 @@ public void visitToken(DetailAST ast) { } } else { - final var before = parenAST.getColumnNo() - 1; + final int before = parenAST.getColumnNo() - 1; if (option == PadOption.NOSPACE && CommonUtil.isCodePointWhitespace(line, before)) { log(parenAST, MSG_WS_PRECEDED, parenAST.getText()); 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 f254fbf4a6f0..d7819c15c7c8 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 @@ -135,8 +135,8 @@ public void setAllowLineBreaks(boolean allowLineBreaks) { public void visitToken(DetailAST ast) { if (shouldCheckWhitespaceAfter(ast)) { final DetailAST whitespaceFollowedAst = getWhitespaceFollowedNode(ast); - final var whitespaceColumnNo = getPositionAfter(whitespaceFollowedAst); - final var whitespaceLineNo = whitespaceFollowedAst.getLineNo(); + final int whitespaceColumnNo = getPositionAfter(whitespaceFollowedAst); + final int whitespaceLineNo = whitespaceFollowedAst.getLineNo(); if (hasTrailingWhitespace(ast, whitespaceColumnNo, whitespaceLineNo)) { log(ast, MSG_KEY, whitespaceFollowedAst.getText()); @@ -171,7 +171,7 @@ private static DetailAST getWhitespaceFollowedNode(DetailAST ast) { */ private static boolean shouldCheckWhitespaceAfter(DetailAST ast) { final DetailAST previousSibling = ast.getPreviousSibling(); - final var isSynchronizedMethod = ast.getType() == TokenTypes.LITERAL_SYNCHRONIZED + final boolean isSynchronizedMethod = ast.getType() == TokenTypes.LITERAL_SYNCHRONIZED && ast.getFirstChild() == null; return !isSynchronizedMethod && (previousSibling == null || previousSibling.getType() != TokenTypes.ANNOTATIONS); @@ -213,7 +213,7 @@ private static int getPositionAfter(DetailAST ast) { private boolean hasTrailingWhitespace(DetailAST ast, int whitespaceColumnNo, int whitespaceLineNo) { final boolean result; - final var astLineNo = ast.getLineNo(); + final int astLineNo = ast.getLineNo(); final int[] line = getLineCodePoints(astLineNo - 1); if (astLineNo == whitespaceLineNo && whitespaceColumnNo < line.length) { result = CommonUtil.isCodePointWhitespace(line, whitespaceColumnNo); @@ -356,7 +356,7 @@ else if (firstChild.getType() == TokenTypes.IDENT) { private static DetailAST getTypeLastNode(DetailAST ast) { final DetailAST typeLastNode; final DetailAST parent = ast.getParent(); - final var isPrecededByTypeArgs = + final boolean isPrecededByTypeArgs = parent.findFirstToken(TokenTypes.TYPE_ARGUMENTS) != null; final Optional objectArrayType = Optional.ofNullable(getIdentLastToken(ast)); @@ -401,7 +401,7 @@ else if (ident.getLineNo() < ast.getLineNo()) { } // ident and lastTypeNode lay on one line else { - final var instanceOfSize = 13; + final int instanceOfSize = 13; // +2 because ast has `[]` after the ident if (ident.getColumnNo() >= ast.getColumnNo() + 2 // +13 because ident (at most 1 character) is followed by 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 4cc324f5aa0d..7dd3bf0db6a3 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 @@ -109,7 +109,7 @@ else if (parent.getType() == TokenTypes.LITERAL_CASE) { */ private static boolean isWhitespaceBeforeColonOfCase(DetailAST colonAst) { final DetailAST previousSibling = colonAst.getPreviousSibling(); - var offset = 0; + int offset = 0; if (previousSibling.getType() == TokenTypes.BLOCK_COMMENT_BEGIN) { offset = 1; } 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 9dd48aa44bf4..a77921928b0a 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 @@ -87,12 +87,12 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { final int[] line = getLineCodePoints(ast.getLineNo() - 1); - final var columnNoBeforeToken = ast.getColumnNo() - 1; - final var isFirstToken = columnNoBeforeToken == -1; + final int columnNoBeforeToken = ast.getColumnNo() - 1; + final boolean isFirstToken = columnNoBeforeToken == -1; if ((isFirstToken || CommonUtil.isCodePointWhitespace(line, columnNoBeforeToken)) && !isInEmptyForInitializerOrCondition(ast)) { - final var isViolation = !allowLineBreaks + final boolean isViolation = !allowLineBreaks || !isFirstToken && !CodePointUtil.hasWhitespaceBefore(columnNoBeforeToken, line); @@ -109,7 +109,7 @@ public void visitToken(DetailAST ast) { * @return true if semicolon is in empty for initializer or condition. */ private static boolean isInEmptyForInitializerOrCondition(DetailAST semicolonAst) { - var result = false; + boolean result = false; final DetailAST sibling = semicolonAst.getPreviousSibling(); if (sibling != null && (sibling.getType() == TokenTypes.FOR_INIT 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 05023308a09e..5f7886d60bda 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 @@ -294,7 +294,7 @@ private static DetailAST getRightNode(DetailAST node) { */ private static DetailAST adjustParens(DetailAST node, UnaryOperator step) { DetailAST result = node; - var accumulator = 0; + int accumulator = 0; while (true) { if (result.getType() == TokenTypes.LPAREN) { accumulator--; 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 089ed0985079..b7bf9c243132 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 @@ -237,7 +237,7 @@ private static int[] makeAcceptableTokens() { * @return true if ast is a closing paren of a {@link TokenTypes#TYPECAST}. */ private static boolean isInTypecast(DetailAST ast) { - var result = false; + boolean result = false; if (ast.getParent().getType() == TokenTypes.TYPECAST) { final DetailAST firstRparen = ast.getParent().findFirstToken(TokenTypes.RPAREN); if (TokenUtil.areOnSameLine(firstRparen, ast) @@ -255,7 +255,7 @@ private static boolean isInTypecast(DetailAST ast) { * @return whether a token follows an empty for iterator */ private static boolean isFollowsEmptyForIterator(DetailAST ast) { - var result = false; + boolean result = false; final DetailAST parent = ast.getParent(); // Only traditional for statements are examined, not for-each statements if (parent.findFirstToken(TokenTypes.FOR_EACH_CLAUSE) == null) { @@ -273,7 +273,7 @@ private static boolean isFollowsEmptyForIterator(DetailAST ast) { * @return whether a token precedes an empty for initializer */ private static boolean isPrecedingEmptyForInit(DetailAST ast) { - var result = false; + boolean result = false; final DetailAST parent = ast.getParent(); // Only traditional for statements are examined, not for-each statements if (parent.findFirstToken(TokenTypes.FOR_EACH_CLAUSE) == null) { 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 99fabdd5f7c7..dc2b6bb0d4a4 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 @@ -98,13 +98,13 @@ public int[] getRequiredTokens() { @Override public void visitToken(DetailAST ast) { final String text = ast.getText(); - final var colNo = ast.getColumnNo(); - final var lineNo = ast.getLineNo(); + final int colNo = ast.getColumnNo(); + final int lineNo = ast.getLineNo(); final int[] currentLine = getLineCodePoints(lineNo - 1); - final var isLineEmptyAfterToken = CodePointUtil.isBlank( + final boolean isLineEmptyAfterToken = CodePointUtil.isBlank( Arrays.copyOfRange(currentLine, colNo + text.length(), currentLine.length) ); - final var isLineEmptyBeforeToken = CodePointUtil.isBlank( + final boolean isLineEmptyBeforeToken = CodePointUtil.isBlank( Arrays.copyOfRange(currentLine, 0, colNo) ); 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 27ce989acdd2..a80f569b2abb 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 @@ -149,12 +149,12 @@ else if (ast.getType() == TokenTypes.ANNOTATIONS) { * @return true if ast token is followed by a whitespace. */ private static boolean isFollowedByWhitespace(DetailAST targetAST, int... line) { - final var after = + final int after = targetAST.getColumnNo() + targetAST.getText().length(); - var followedByWhitespace = true; + boolean followedByWhitespace = true; if (after < line.length) { - final var codePoint = line[after]; + final int codePoint = line[after]; followedByWhitespace = codePoint == ';' || codePoint == ')' 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 22f6b9fa4c41..7a4bf11b5a44 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/CsvFilterElement.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/CsvFilterElement.java @@ -50,15 +50,15 @@ class CsvFilterElement implements IntFilterElement { final StringTokenizer tokenizer = new StringTokenizer(pattern, ","); while (tokenizer.hasMoreTokens()) { final String token = tokenizer.nextToken().trim(); - final var index = token.indexOf('-'); + final int index = token.indexOf('-'); if (index == -1) { - final var matchValue = Integer.parseInt(token); + final int matchValue = Integer.parseInt(token); addFilter(new IntMatchFilterElement(matchValue)); } else { - final var lowerBound = + final int lowerBound = Integer.parseInt(token.substring(0, index)); - final var upperBound = + final int upperBound = Integer.parseInt(token.substring(index + 1)); addFilter(new IntRangeFilterElement(lowerBound, upperBound)); } @@ -91,7 +91,7 @@ protected Set getFilters() { */ @Override public boolean accept(int intValue) { - var result = false; + boolean result = false; for (IntFilterElement filter : getFilters()) { if (filter.accept(intValue)) { result = true; 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 a7582c66ee5a..b1cd5bd582f9 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java @@ -85,7 +85,7 @@ protected void finishLocalSetup() { @Override public boolean accept(AuditEvent event) { - final var severityMatches = severity == event.getSeverityLevel(); + final boolean severityMatches = severity == event.getSeverityLevel(); return acceptOnMatch == severityMatches; } 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 c86824a26d24..d38e13e87af5 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java @@ -219,7 +219,7 @@ protected void finishLocalSetup() { @Override public boolean accept(TreeWalkerAuditEvent event) { - var accepted = true; + boolean accepted = true; if (event.getViolation() != null) { // Lazy update. If the first event for the current file, update file @@ -244,7 +244,7 @@ public boolean accept(TreeWalkerAuditEvent event) { * @return true if event matches any tag from {@link #tags}, false otherwise. */ private boolean matchesTag(TreeWalkerAuditEvent event) { - var result = false; + boolean result = false; for (final Tag tag : tags) { if (tag.isMatch(event)) { result = true; @@ -279,10 +279,10 @@ private void tagSuppressions() { */ private void tagSuppressions(Collection comments) { for (final TextBlock comment : comments) { - final var startLineNo = comment.getStartLineNo(); + final int startLineNo = comment.getStartLineNo(); final String[] text = comment.getText(); tagCommentLine(text[0], startLineNo); - for (var i = 1; i < text.length; i++) { + for (int i = 1; i < text.length; i++) { tagCommentLine(text[i], startLineNo + i); } } @@ -373,7 +373,7 @@ private Tag(String text, int line, SuppressWithNearbyCommentFilter filter) { format = CommonUtil.fillTemplateWithStringsByRegexp( filter.influenceFormat, text, filter.commentFormat); - final var influence = parseInfluence(format, filter.influenceFormat, text); + final int influence = parseInfluence(format, filter.influenceFormat, text); if (influence >= 1) { firstLine = line; @@ -453,7 +453,7 @@ && isIdMatch(event) * @return true if the {@link TreeWalkerAuditEvent} is in the scope of the suppression. */ private boolean isInScopeOfSuppression(TreeWalkerAuditEvent event) { - final var line = event.getLine(); + final int line = event.getLine(); return line >= firstLine && line <= lastLine; } @@ -475,7 +475,7 @@ private boolean isCheckMatch(TreeWalkerAuditEvent event) { * @return true if the {@link TreeWalkerAuditEvent} module ID matches the ID format. */ private boolean isIdMatch(TreeWalkerAuditEvent event) { - var match = true; + boolean match = true; if (tagIdRegexp != null) { if (event.getModuleId() == null) { match = false; @@ -495,7 +495,7 @@ private boolean isIdMatch(TreeWalkerAuditEvent event) { * @return true if the {@link TreeWalkerAuditEvent} message matches the message format. */ private boolean isMessageMatch(TreeWalkerAuditEvent event) { - var match = true; + boolean match = true; if (tagMessageRegexp != null) { final Matcher messageMatcher = tagMessageRegexp.matcher(event.getMessage()); match = messageMatcher.find(); 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 af429a94c460..21d20f4a05a3 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilter.java @@ -157,7 +157,7 @@ public final void setLineRange(String format) { @Override public boolean accept(AuditEvent event) { - var accepted = true; + boolean accepted = true; if (event.getViolation() != null) { final String eventFileTextAbsolutePath = event.getFileName(); @@ -215,7 +215,7 @@ private static FileText getFileText(String fileName) { private void collectSuppressions(FileText fileText) { suppressions.clear(); - for (var lineNo = 0; lineNo < fileText.size(); lineNo++) { + for (int lineNo = 0; lineNo < fileText.size(); lineNo++) { final Suppression suppression = getSuppression(fileText, lineNo); if (suppression != null) { suppressions.add(suppression); @@ -311,7 +311,7 @@ private Suppression( format = CommonUtil.fillTemplateWithStringsByRegexp(lineRange, text, nearbyTextPattern); - final var range = parseRange(format, lineRange, text); + final int range = parseRange(format, lineRange, text); firstLine = Math.min(lineNo, lineNo + range); lastLine = Math.max(lineNo, lineNo + range); @@ -362,7 +362,7 @@ && isIdMatch(event) * @return true if the {@link AuditEvent} is in the scope of the suppression. */ private boolean isInScopeOfSuppression(AuditEvent event) { - final var eventLine = event.getLine(); + final int eventLine = event.getLine(); return eventLine >= firstLine && eventLine <= lastLine; } @@ -384,7 +384,7 @@ private boolean isCheckMatch(AuditEvent event) { * @return true if the {@link AuditEvent} module ID matches the ID pattern. */ private boolean isIdMatch(AuditEvent event) { - var match = true; + boolean match = true; if (eventIdRegexp != null) { if (event.getModuleId() == null) { match = false; @@ -404,7 +404,7 @@ private boolean isIdMatch(AuditEvent event) { * @return true if the {@link AuditEvent} message matches the message pattern. */ private boolean isMessageMatch(AuditEvent event) { - var match = true; + boolean match = true; if (eventMessageRegexp != null) { final Matcher messageMatcher = eventMessageRegexp.matcher(event.getMessage()); match = messageMatcher.find(); 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 e6f5dab3174f..d91621ec8087 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java @@ -170,7 +170,7 @@ public final void setIdFormat(String format) { @Override public boolean accept(AuditEvent event) { - var accepted = true; + boolean accepted = true; if (event.getViolation() != null) { final String eventFileName = event.getFileName(); @@ -223,7 +223,7 @@ private static FileText getFileText(String fileName) { * @param fileText {@link FileText} instance. */ private void cacheSuppressions(FileText fileText) { - for (var lineNo = 0; lineNo < fileText.size(); lineNo++) { + for (int lineNo = 0; lineNo < fileText.size(); lineNo++) { final Optional suppression = getSuppression(fileText, lineNo); suppression.ifPresent(currentFileSuppressionCache::add); } @@ -426,7 +426,7 @@ private boolean isCheckMatch(AuditEvent event) { * @return true if the {@link AuditEvent} module ID matches the ID format. */ private boolean isIdMatch(AuditEvent event) { - var match = true; + boolean match = true; if (eventIdRegexp != null) { if (event.getModuleId() == null) { match = false; @@ -446,7 +446,7 @@ private boolean isIdMatch(AuditEvent event) { * @return true if the {@link AuditEvent} message matches the message format. */ private boolean isMessageMatch(AuditEvent event) { - var match = true; + boolean match = true; if (eventMessageRegexp != null) { final Matcher messageMatcher = eventMessageRegexp.matcher(event.getMessage()); match = messageMatcher.find(); 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 58f0f3533e8d..3690a10bb472 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java @@ -243,7 +243,7 @@ protected void finishLocalSetup() { @Override public boolean accept(TreeWalkerAuditEvent event) { - var accepted = true; + boolean accepted = true; if (event.getViolation() != null) { // Lazy update. If the first event for the current file, update file @@ -270,7 +270,7 @@ public boolean accept(TreeWalkerAuditEvent event) { private Tag findNearestMatch(TreeWalkerAuditEvent event) { Tag result = null; for (Tag tag : tags) { - final var eventLine = event.getLine(); + final int eventLine = event.getLine(); if (tag.getLine() > eventLine || tag.getLine() == eventLine && tag.getColumn() > event.getColumn()) { @@ -309,10 +309,10 @@ private void tagSuppressions() { */ private void tagSuppressions(Collection comments) { for (TextBlock comment : comments) { - final var startLineNo = comment.getStartLineNo(); + final int startLineNo = comment.getStartLineNo(); final String[] text = comment.getText(); tagCommentLine(text[0], startLineNo, comment.getStartColNo()); - for (var i = 1; i < text.length; i++) { + for (int i = 1; i < text.length; i++) { tagCommentLine(text[i], startLineNo + i, 0); } } @@ -549,7 +549,7 @@ private boolean isCheckMatch(TreeWalkerAuditEvent event) { * @return true if the {@link TreeWalkerAuditEvent} module ID matches the ID format. */ private boolean isIdMatch(TreeWalkerAuditEvent event) { - var match = true; + boolean match = true; if (tagIdRegexp != null) { if (event.getModuleId() == null) { match = false; @@ -569,7 +569,7 @@ private boolean isIdMatch(TreeWalkerAuditEvent event) { * @return true if the {@link TreeWalkerAuditEvent} message matches the message format. */ private boolean isMessageMatch(TreeWalkerAuditEvent event) { - var match = true; + boolean match = true; if (tagMessageRegexp != null) { final Matcher messageMatcher = tagMessageRegexp.matcher(event.getMessage()); match = messageMatcher.find(); 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 475d48d588e6..8373d30ddb13 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilter.java @@ -293,7 +293,7 @@ public int hashCode() { @Override public boolean accept(TreeWalkerAuditEvent treeWalkerAuditEvent) { - var result = true; + boolean result = true; for (TreeWalkerFilter filter : filters) { if (!filter.accept(treeWalkerAuditEvent)) { result = false; 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 9625cd916396..3f1579db62a6 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerSimulator.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/grammar/CrAwareLexerSimulator.java @@ -57,13 +57,13 @@ public CrAwareLexerSimulator(Lexer lexer, ATN augmented, */ @Override public void consume(CharStream input) { - final var currentChar = input.LA(1); + final int currentChar = input.LA(1); if (currentChar == '\n') { line++; charPositionInLine = 0; } else if (currentChar == '\r') { - final var nextChar = input.LA(2); + final int nextChar = input.LA(2); if (nextChar != '\n') { line++; charPositionInLine = 0; 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 8635141f8923..b0c3119fa143 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/BaseCellEditor.java @@ -88,7 +88,7 @@ protected void fireEditingStopped() { final Object[] listeners = listenerList.getListenerList(); // Process the listeners last to first, notifying // those that are interested in this event - for (var i = listeners.length - 2; i >= 0; i -= 2) { + for (int i = listeners.length - 2; i >= 0; i -= 2) { if (listeners[i] == CellEditorListener.class) { ((CellEditorListener) listeners[i + 1]).editingStopped(new ChangeEvent(this)); } @@ -106,7 +106,7 @@ protected void fireEditingCanceled() { final Object[] listeners = listenerList.getListenerList(); // Process the listeners last to first, notifying // those that are interested in this event - for (var i = listeners.length - 2; i >= 0; i -= 2) { + for (int i = listeners.length - 2; i >= 0; i -= 2) { if (listeners[i] == CellEditorListener.class) { ((CellEditorListener) listeners[i + 1]).editingCanceled(new ChangeEvent(this)); } 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 5f8a74e12672..e54ac2f8f59e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ListToTreeSelectionModelWrapper.java @@ -99,12 +99,12 @@ private void updateSelectedPathsFromSelectedRows() { try { // This is way expensive, ListSelectionModel needs an // enumerator for iterating. - final var min = listSelectionModel.getMinSelectionIndex(); - final var max = listSelectionModel.getMaxSelectionIndex(); + final int min = listSelectionModel.getMinSelectionIndex(); + final int max = listSelectionModel.getMaxSelectionIndex(); clearSelection(); if (min != -1 && max != -1) { - for (var counter = min; counter <= max; counter++) { + for (int counter = min; counter <= max; counter++) { updateSelectedPathIfRowIsSelected(counter); } } 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 bcc79e1d3335..19cbc82af1d0 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrame.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrame.java @@ -145,7 +145,7 @@ private JPanel createButtonsPanel() { }); final JLabel modesLabel = new JLabel("Modes:", SwingConstants.RIGHT); - final var leftIndentation = 10; + final int leftIndentation = 10; modesLabel.setBorder(BorderFactory.createEmptyBorder(0, leftIndentation, 0, 0)); modesLabel.setDisplayedMnemonic(KeyEvent.VK_M); modesLabel.setLabelFor(modesCombobox); @@ -226,7 +226,7 @@ public void actionPerformed(ActionEvent event) { final FileFilter filter = new JavaFileFilter(); fileChooser.setFileFilter(filter); - final var returnCode = fileChooser.showOpenDialog(MainFrame.this); + final int returnCode = fileChooser.showOpenDialog(MainFrame.this); if (returnCode == JFileChooser.APPROVE_OPTION) { final File file = fileChooser.getSelectedFile(); openFile(file); 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 6196535dfb26..58c318caabc4 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModel.java @@ -179,7 +179,7 @@ private void fireTreeStructureChanged(Object source, Object[] path, TreeModelEvent event = null; // Process the listeners last to first, notifying // those that are interested in this event - for (var i = listeners.length - 2; i >= 0; i -= 2) { + for (int i = listeners.length - 2; i >= 0; i -= 2) { if (listeners[i] == TreeModelListener.class) { // Lazily create the event: if (event == null) { 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 67edcf96f41c..39b3a05000f6 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentation.java @@ -154,7 +154,7 @@ public Object getChild(Object parent, int index) { if (parent instanceof DetailNode parentNode) { DetailNode node = parentNode.getFirstChild(); - for (var nodeIndex = 0; nodeIndex < index; nodeIndex++) { + for (int nodeIndex = 0; nodeIndex < index; nodeIndex++) { node = node.getNextSibling(); } result = node; @@ -173,7 +173,7 @@ public Object getChild(Object parent, int index) { * @return the number of children of the node parent. */ public int getChildCount(Object parent) { - var result = 0; + int result = 0; if (parent instanceof DetailNode parentNode) { DetailNode node = parentNode.getFirstChild(); @@ -230,8 +230,8 @@ public boolean isLeaf(Object node) { * or don't belong to this tree model. */ public int getIndexOfChild(Object parent, Object child) { - var index = -1; - for (var i = 0; i < getChildCount(parent); i++) { + int index = -1; + for (int i = 0; i < getChildCount(parent); i++) { if (getChild(parent, i).equals(child)) { index = i; break; @@ -267,7 +267,7 @@ private Object getChildAtDetailAst(DetailAST parent, int index) { result = getJavadocTree(parent.getParent()); } else { - var currentIndex = 0; + int currentIndex = 0; DetailAST child = parent.getFirstChild(); while (currentIndex < index) { child = child.getNextSibling(); 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 2eab202880c3..eaaa0960081f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTable.java @@ -111,7 +111,7 @@ public TreeTable(ParseTreeTableModel treeTableModel) { // the table. if (tree.getRowHeight() < 1) { // Metal looks better like this. - final var height = getRowHeight(); + final int height = getRowHeight(); setRowHeight(height); } @@ -184,21 +184,21 @@ private void generateXpath() { private void setColumnsInitialWidth() { final FontMetrics fontMetrics = getFontMetrics(getFont()); // Six character string to contain "Column" column. - final var widthOfSixCharacterString = fontMetrics.stringWidth("XXXXXX"); + final int widthOfSixCharacterString = fontMetrics.stringWidth("XXXXXX"); // Padding must be added to width for columns to make them fully // visible in table header. - final var padding = 10; - final var widthOfColumnContainingSixCharacterString = + final int padding = 10; + final int widthOfColumnContainingSixCharacterString = widthOfSixCharacterString + padding; getColumn("Line").setMaxWidth(widthOfColumnContainingSixCharacterString); getColumn("Column").setMaxWidth(widthOfColumnContainingSixCharacterString); - final var preferredTreeColumnWidth = + final int preferredTreeColumnWidth = Math.toIntExact(Math.round(getPreferredSize().getWidth() * 0.6)); getColumn("Tree").setPreferredWidth(preferredTreeColumnWidth); // Twenty-eight character string to contain "Type" column - final var widthOfTwentyEightCharacterString = + final int widthOfTwentyEightCharacterString = fontMetrics.stringWidth("XXXXXXXXXXXXXXXXXXXXXXXXXXXX"); - final var preferredTypeColumnWidth = widthOfTwentyEightCharacterString + padding; + final int preferredTypeColumnWidth = widthOfTwentyEightCharacterString + padding; getColumn("Type").setPreferredWidth(preferredTypeColumnWidth); } @@ -302,7 +302,7 @@ public void updateUI() { */ @Override public int getEditingRow() { - var rowIndex = -1; + int rowIndex = -1; final Class editingClass = getColumnClass(editingColumn); if (editingClass != ParseTreeTableModel.class) { rowIndex = editingRow; @@ -397,7 +397,7 @@ public Component getTableCellEditorComponent(JTable table, @Override public boolean isCellEditable(EventObject event) { if (event instanceof MouseEvent mouseEvent) { - for (var counter = getColumnCount() - 1; counter >= 0; + for (int counter = getColumnCount() - 1; counter >= 0; counter--) { if (getColumnClass(counter) == ParseTreeTableModel.class) { final MouseEvent newMouseEvent = new MouseEvent(tree, mouseEvent.getID(), 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 95bd67b934df..1091a43645fe 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaReader.java @@ -174,9 +174,9 @@ private static void populateModule(Element mod, ModuleDetails moduleDetails) { */ private static List createProperties(Element properties) { final NodeList propertyList = properties.getElementsByTagName("property"); - final var propertyListLength = propertyList.getLength(); + final int propertyListLength = propertyList.getLength(); final List result = new ArrayList<>(propertyListLength); - for (var i = 0; i < propertyListLength; i++) { + for (int i = 0; i < propertyListLength; i++) { final ModulePropertyDetails propertyDetails = new ModulePropertyDetails(); final Element prop = (Element) propertyList.item(i); propertyDetails.setName(getAttributeValue(prop, XML_TAG_NAME)); @@ -211,9 +211,9 @@ private static List getListContentByAttribute(Element element, String li List result = null; if (!children.isEmpty()) { final NodeList nodeList = children.get(0).getElementsByTagName(listOption); - final var nodeListLength = nodeList.getLength(); + final int nodeListLength = nodeList.getLength(); final List listContent = new ArrayList<>(nodeListLength); - for (var j = 0; j < nodeListLength; j++) { + for (int j = 0; j < nodeListLength; j++) { listContent.add(getAttributeValue((Element) nodeList.item(j), attribute)); } result = listContent; @@ -231,7 +231,7 @@ private static List getListContentByAttribute(Element element, String li private static List getDirectChildsByTag(Element element, String sTagName) { final NodeList children = element.getElementsByTagName(sTagName); final List res = new ArrayList<>(); - for (var i = 0; i < children.getLength(); i++) { + for (int i = 0; i < children.getLength(); i++) { if (children.item(i).getParentNode().equals(element)) { res.add((Element) children.item(i)); } 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 4dd3d2d8de33..15a234655977 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/meta/XmlMetaWriter.java @@ -164,7 +164,7 @@ private static void writeToFile(Document document, ModuleDetails moduleDetails) .matcher(moduleDetails.getFullQualifiedName()) .replaceAll(fileSeparator); final String checkstyleString = "checkstyle"; - final var indexOfCheckstyle = + final int indexOfCheckstyle = moduleFilePath.indexOf(checkstyleString) + checkstyleString.length(); modifiedPath = rootOutputPath + DEFAULT_FILE_SEPARATOR diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/AllCheckSummaries.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/AllCheckSummaries.java index 99e7ed18b35b..95dcc895a177 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/site/AllCheckSummaries.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/AllCheckSummaries.java @@ -532,7 +532,7 @@ private static void addXmlHtmlMapping(Path path, Map map) { final Path fileName = path.getFileName(); if (fileName != null) { final String fileNameString = fileName.toString(); - final var extensionLength = 4; + final int extensionLength = 4; final String base = fileNameString.substring(0, fileNameString.length() - extensionLength) .toLowerCase(Locale.ROOT); @@ -567,7 +567,7 @@ private static String resolveHref(Map xmlMap, String category, result = href + ANCHOR_SEPARATOR + simpleName; } else { - final var lastSlash = href.lastIndexOf('/'); + final int lastSlash = href.lastIndexOf('/'); final String filename; if (lastSlash >= 0) { filename = href.substring(lastSlash + 1); @@ -672,8 +672,8 @@ private static String sanitizeAndFirstSentence(String html) { private static String extractFirstSentence(String text) { String result = ""; if (text != null && !text.isEmpty()) { - var end = -1; - for (var index = 0; index < text.length(); index++) { + int end = -1; + for (int index = 0; index < text.length(); index++) { if (text.charAt(index) == '.' && (index == text.length() - 1 || Character.isWhitespace(text.charAt(index + 1)) @@ -709,11 +709,11 @@ private static String wrapSummary(String text) { final String clean = sanitized.trim(); final StringBuilder result = new StringBuilder(CAPACITY); - var cleanIndex = 0; - final var cleanLen = clean.length(); + int cleanIndex = 0; + final int cleanLen = clean.length(); while (cleanIndex < cleanLen) { - final var remainingChars = cleanLen - cleanIndex; + final int remainingChars = cleanLen - cleanIndex; if (remainingChars <= MAX_CONTENT_WIDTH) { result.append(indent) @@ -722,8 +722,8 @@ private static String wrapSummary(String text) { break; } - final var idealBreak = cleanIndex + MAX_CONTENT_WIDTH; - final var actualBreak = calculateBreakPoint(clean, cleanIndex, idealBreak); + final int idealBreak = cleanIndex + MAX_CONTENT_WIDTH; + final int actualBreak = calculateBreakPoint(clean, cleanIndex, idealBreak); result.append(indent) .append(clean, cleanIndex, actualBreak); @@ -750,7 +750,7 @@ private static String wrapSummary(String text) { * @return the actual break position */ private static int calculateBreakPoint(String clean, int cleanIndex, int idealBreak) { - final var anchorStart = clean.indexOf("= idealBreak; } else { @@ -821,7 +821,7 @@ private static boolean shouldBreakAfterAnchorContent(int anchorStart, int anchor */ private static int findSafeBreakPoint(String text, int start, int idealBreak) { final int actualBreak; - final var lastSpace = text.lastIndexOf(' ', idealBreak); + final int lastSpace = text.lastIndexOf(' ', idealBreak); if (lastSpace > start && lastSpace >= start + MAX_CONTENT_WIDTH / 2) { actualBreak = lastSpace; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/ClassAndPropertiesSettersJavadocScraper.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/ClassAndPropertiesSettersJavadocScraper.java index 9ef531c6739d..b12932ace30c 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/site/ClassAndPropertiesSettersJavadocScraper.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/ClassAndPropertiesSettersJavadocScraper.java @@ -94,7 +94,7 @@ else if (BlockCommentPosition.isOnClass(blockCommentAst)) { private static boolean isMethodOfScrapedModule(DetailAST methodDef) { final DetailAST classDef = getParentAst(methodDef, TokenTypes.CLASS_DEF); - var isMethodOfModule = false; + boolean isMethodOfModule = false; if (classDef != null) { final String className = classDef.findFirstToken(TokenTypes.IDENT).getText(); isMethodOfModule = className.equals(moduleName); @@ -140,7 +140,7 @@ private static String getPropertyName(String setterName) { * @return whether the AST represents a setter method */ private static boolean isSetterMethod(DetailAST ast) { - var setterMethod = false; + boolean setterMethod = false; if (ast.getType() == TokenTypes.METHOD_DEF) { final DetailAST type = ast.findFirstToken(TokenTypes.TYPE); 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 37d389ba51fa..207f531903c7 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/site/ExampleMacro.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/ExampleMacro.java @@ -175,7 +175,7 @@ private static String getCodeSnippet(Collection lines) { */ private static void writeSnippet(Sink sink, String snippet) { sink.rawText("
"); - final var isXml = isXml(snippet); + final boolean isXml = isXml(snippet); final String languageClass; if (isXml) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/site/ModuleJavadocParsingUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/site/ModuleJavadocParsingUtil.java index 506fe47cc281..40f52d1a45cc 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/site/ModuleJavadocParsingUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/ModuleJavadocParsingUtil.java @@ -116,7 +116,7 @@ public static void writeOutJavadocPortion(String javadocPortion, Sink sink) { sink.rawText(javadocPortionLinesSplit[0]); String lastHtmlTag = javadocPortionLinesSplit[0]; - for (var index = 1; index < javadocPortionLinesSplit.length; index++) { + for (int index = 1; index < javadocPortionLinesSplit.length; index++) { final String currentLine = javadocPortionLinesSplit[index].trim(); final String processedLine; @@ -151,7 +151,7 @@ else if (lastHtmlTag.contains(" tokens, String tokenTypesLink, boolean printDotAtTheEnd) throws MacroExecutionException { - for (var index = 0; index < tokens.size(); index++) { + for (int index = 0; index < tokens.size(); index++) { final String token = tokens.get(index); sink.rawText(ModuleJavadocParsingUtil.INDENT_LEVEL_16); if (index != 0) { 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 08bbea42042a..50023e213fab 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/site/SiteUtil.java @@ -520,7 +520,7 @@ private static void assertAllPropertySetterJavadocsAreFound( Set properties, String moduleName, Map javadocs) throws MacroExecutionException { for (String property : properties) { - final var isDocumented = javadocs.containsKey(property) + final boolean isDocumented = javadocs.containsKey(property) || SUPER_CLASS_PROPERTIES_JAVADOCS.containsKey(property) || TOKENS.equals(property) || JAVADOC_TOKENS.equals(property); if (!isDocumented) { @@ -948,7 +948,7 @@ else if (fieldClass == double[].class) { result = removeSquareBrackets(Arrays.toString((double[]) value).replace(".0", "")); } else if (fieldClass == String[].class) { - final var preserveOrder = hasPreserveOrderAnnotation(field); + final boolean preserveOrder = hasPreserveOrderAnnotation(field); result = getStringArrayPropertyValue(value, preserveOrder); } else if (fieldClass == Pattern.class) { @@ -1329,9 +1329,9 @@ public static String getModuleName(File file) { // -@cs[ExecutableStatementCount] Splitting would not make the code more readable. private static String getDescriptionFromJavadocForXdoc(DetailNode javadoc, String moduleName) throws MacroExecutionException { - var isInCodeLiteral = false; - var isInHtmlElement = false; - var isInHrefAttribute = false; + boolean isInCodeLiteral = false; + boolean isInHtmlElement = false; + boolean isInHrefAttribute = false; final StringBuilder description = new StringBuilder(128); final List descriptionNodes = getFirstJavadocParagraphNodes(javadoc); DetailNode node = descriptionNodes.get(0); @@ -1500,7 +1500,7 @@ private static void handleInternalLink(StringBuilder description, href = href.substring(1, href.length() - 1); final String relativeHref = getLinkToDocument(moduleName, href); - final var doubleQuote = '\"'; + final char doubleQuote = '\"'; description.append(doubleQuote).append(relativeHref).append(doubleQuote); } } 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 91535c4f753c..804bc592718e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtil.java @@ -111,7 +111,7 @@ public static boolean containsAnnotation(DetailAST ast, Set annotations) if (annotations == null) { throw new IllegalArgumentException("annotations cannot be null"); } - var result = false; + boolean result = false; if (!annotations.isEmpty()) { final DetailAST firstMatchingAnnotation = findFirstAnnotation(ast, annotationNode -> { final String annotationFullIdent = getAnnotationFullIdent(annotationNode); 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 8beda2c8feb1..3ebe11b15907 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/BlockCommentPosition.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/BlockCommentPosition.java @@ -79,7 +79,7 @@ public static boolean isOnRecord(DetailAST blockComment) { * @return true if node is before package */ public static boolean isOnPackage(DetailAST blockComment) { - var result = isOnTokenWithAnnotation(blockComment, TokenTypes.PACKAGE_DEF); + boolean result = isOnTokenWithAnnotation(blockComment, TokenTypes.PACKAGE_DEF); if (!result) { DetailAST nextSibling = blockComment.getNextSibling(); @@ -209,7 +209,7 @@ public static boolean isOnCompactConstructor(DetailAST blockComment) { */ public static boolean isOnEnumConstant(DetailAST blockComment) { final DetailAST parent = blockComment.getParent(); - var result = false; + boolean result = false; if (parent.getType() == TokenTypes.ENUM_CONSTANT_DEF) { final DetailAST prevSibling = getPrevSiblingSkipComments(blockComment); if (prevSibling.getType() == TokenTypes.ANNOTATIONS && !prevSibling.hasChildren()) { 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 46a7bd626284..3210bea9c851 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ChainedPropertyUtil.java @@ -114,8 +114,8 @@ public static Properties getResolvedProperties(Properties properties) * @return property name */ private static String getPropertyNameFromExpression(String variableExpression) { - final var propertyStartIndex = variableExpression.lastIndexOf('{') + 1; - final var propertyEndIndex = variableExpression.lastIndexOf('}'); + final int propertyStartIndex = variableExpression.lastIndexOf('{') + 1; + final int propertyEndIndex = variableExpression.lastIndexOf('}'); return variableExpression.substring(propertyStartIndex, propertyEndIndex); } 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 27ee3d96d00c..f0c716d8aab4 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/CheckUtil.java @@ -75,11 +75,11 @@ private CheckUtil() { * @return true if ast defines an equals covariant. */ public static boolean isEqualsMethod(DetailAST ast) { - var equalsMethod = false; + boolean equalsMethod = false; if (ast.getType() == TokenTypes.METHOD_DEF) { final DetailAST modifiers = ast.findFirstToken(TokenTypes.MODIFIERS); - final var staticOrAbstract = + final boolean staticOrAbstract = modifiers.findFirstToken(TokenTypes.LITERAL_STATIC) != null || modifiers.findFirstToken(TokenTypes.ABSTRACT) != null; @@ -113,7 +113,7 @@ public static double parseDouble(String text, int type) { case TokenTypes.NUM_FLOAT, TokenTypes.NUM_DOUBLE -> Double.parseDouble(txt); case TokenTypes.NUM_INT, TokenTypes.NUM_LONG -> { - var radix = BASE_10; + int radix = BASE_10; if (txt.startsWith("0x") || txt.startsWith("0X")) { radix = BASE_16; txt = txt.substring(2); @@ -151,7 +151,7 @@ private static double parseNumber(final String text, final int radix, final int } final double result; - final var negative = txt.charAt(0) == '-'; + final boolean negative = txt.charAt(0) == '-'; if (type == TokenTypes.NUM_INT) { if (negative) { result = Integer.parseInt(txt, radix); @@ -270,7 +270,7 @@ public static List getTypeParameters(final DetailAST node) { * @return true if method is a not void one. */ public static boolean isNonVoidMethod(DetailAST methodDefAst) { - var returnValue = false; + boolean returnValue = false; if (methodDefAst.getType() == TokenTypes.METHOD_DEF) { final DetailAST typeAST = methodDefAst.findFirstToken(TokenTypes.TYPE); if (typeAST.findFirstToken(TokenTypes.LITERAL_VOID) == null) { @@ -347,7 +347,7 @@ private static AccessModifierOption getAccessModifierFromModifiersTokenDirectly( AccessModifierOption accessModifier = AccessModifierOption.PACKAGE; for (DetailAST token = modifiersToken.getFirstChild(); token != null; token = token.getNextSibling()) { - final var tokenType = token.getType(); + final int tokenType = token.getType(); if (tokenType == TokenTypes.LITERAL_PUBLIC) { accessModifier = AccessModifierOption.PUBLIC; } @@ -372,7 +372,7 @@ public static AccessModifierOption getSurroundingAccessModifier(DetailAST node) for (DetailAST token = node; returnValue == null && !TokenUtil.isRootNode(token); token = token.getParent()) { - final var type = token.getType(); + final int type = token.getType(); if (type == TokenTypes.CLASS_DEF || type == TokenTypes.INTERFACE_DEF || type == TokenTypes.ANNOTATION_DEF @@ -414,7 +414,7 @@ public static String stripIndentAndInitialNewLineFromTextBlock(String textBlockC ALL_NEW_LINES.matcher(textBlockContent).replaceFirst(""); final List lines = Arrays.asList(ALL_NEW_LINES.split(contentWithInitialNewLineRemoved)); - final var indent = getSmallestIndent(lines); + final int indent = getSmallestIndent(lines); final String suffix = ""; return lines.stream() @@ -431,7 +431,7 @@ public static String stripIndentAndInitialNewLineFromTextBlock(String textBlockC * @return modified string with removed indent and trailing whitespace, or empty string. */ private static String stripIndentAndTrailingWhitespaceFromLine(String line, int indent) { - final var lastNonWhitespace = lastIndexOfNonWhitespace(line); + final int lastNonWhitespace = lastIndexOfNonWhitespace(line); String returnString = ""; if (lastNonWhitespace > 0) { returnString = line.substring(indent, lastNonWhitespace); @@ -486,9 +486,9 @@ private static int lastIndexOfNonWhitespace(String line) { */ public static int typeDeclarationNameMatchingCount(String patternClass, String classToBeMatched) { - final var length = Math.min(classToBeMatched.length(), patternClass.length()); - var result = 0; - for (var i = 0; i < length && patternClass.charAt(i) == classToBeMatched.charAt(i); ++i) { + final int length = Math.min(classToBeMatched.length(), patternClass.length()); + int result = 0; + for (int i = 0; i < length && patternClass.charAt(i) == classToBeMatched.charAt(i); ++i) { if (patternClass.charAt(i) == PACKAGE_SEPARATOR) { result = i; } 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 337dad03d8f1..b4bca30fa83d 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/CodePointUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/CodePointUtil.java @@ -62,7 +62,7 @@ public static boolean hasWhitespaceBefore(int index, int... codePoints) { * @return unicode code points array with trailing whitespaces removed */ public static int[] stripTrailing(int... codePoints) { - var lastIndex = codePoints.length; + int lastIndex = codePoints.length; while (CommonUtil.isCodePointWhitespace(codePoints, lastIndex - 1)) { lastIndex--; } @@ -78,7 +78,7 @@ public static int[] stripTrailing(int... codePoints) { * @return {@code true}, if the unicode code points array ends with provided suffix */ public static boolean endsWith(int[] codePoints, String suffix) { - final var startIndex = codePoints.length - suffix.length(); + final int startIndex = codePoints.length - suffix.length(); return startIndex > -1 && Arrays.equals(Arrays .copyOfRange(codePoints, startIndex, codePoints.length), suffix.codePoints().toArray()); 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 296712701987..784a35e5d155 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtil.java @@ -119,14 +119,14 @@ public static Pattern createPattern(String pattern, int flags) { * @return whether there is a match. */ public static boolean matchesFileExtension(File file, String... fileExtensions) { - var result = false; + boolean result = false; if (fileExtensions == null || fileExtensions.length == 0) { result = true; } else { // normalize extensions so all of them have a leading dot final String[] withDotExtensions = new String[fileExtensions.length]; - for (var i = 0; i < fileExtensions.length; i++) { + for (int i = 0; i < fileExtensions.length; i++) { final String extension = fileExtensions[i]; if (extension.startsWith(EXTENSION_SEPARATOR)) { withDotExtensions[i] = extension; @@ -158,8 +158,8 @@ public static boolean matchesFileExtension(File file, String... fileExtensions) * @return whether there is only whitespace */ public static boolean hasWhitespaceBefore(int index, String line) { - var result = true; - for (var i = 0; i < index; i++) { + boolean result = true; + for (int i = 0; i < index; i++) { if (!Character.isWhitespace(line.charAt(i))) { result = false; break; @@ -178,8 +178,8 @@ public static boolean hasWhitespaceBefore(int index, String line) { * @return the length of the string ignoring all trailing whitespace **/ public static int lengthMinusTrailingWhitespace(String line) { - var len = line.length(); - for (var i = len - 1; i >= 0; i--) { + int len = line.length(); + for (int i = len - 1; i >= 0; i--) { if (!Character.isWhitespace(line.charAt(i))) { break; } @@ -204,8 +204,8 @@ public static int lengthMinusTrailingWhitespace(String line) { public static int lengthExpandedTabs(String inputString, int toIdx, int tabWidth) { - var len = 0; - for (var idx = 0; idx < toIdx; idx++) { + int len = 0; + for (int idx = 0; idx < toIdx; idx++) { if (inputString.codePointAt(idx) == '\t') { len = (len / tabWidth + 1) * tabWidth; } @@ -224,7 +224,7 @@ public static int lengthExpandedTabs(String inputString, * @return true if the pattern is valid false otherwise */ public static boolean isPatternValid(String pattern) { - var isValid = true; + boolean isValid = true; try { Pattern.compile(pattern); } @@ -242,7 +242,7 @@ public static boolean isPatternValid(String pattern) { * @return the base class name from a fully qualified name */ public static String baseClassName(String type) { - final var index = type.lastIndexOf('.'); + final int index = type.lastIndexOf('.'); return type.substring(index + 1); } @@ -469,7 +469,7 @@ public static String fillTemplateWithStringsByRegexp( final Matcher matcher = regexp.matcher(lineToPlaceInTemplate); String result = template; if (matcher.find()) { - for (var i = 0; i <= matcher.groupCount(); i++) { + for (int i = 0; i <= matcher.groupCount(); i++) { // $n expands comment match like in Pattern.subst(). result = result.replaceAll("\\$" + i, matcher.group(i)); } @@ -487,7 +487,7 @@ public static String fillTemplateWithStringsByRegexp( */ public static String getFileNameWithoutExtension(String fullFilename) { final String fileName = new File(fullFilename).getName(); - final var dotIndex = fileName.lastIndexOf('.'); + final int dotIndex = fileName.lastIndexOf('.'); final String fileNameWithoutExtension; if (dotIndex == -1) { fileNameWithoutExtension = fileName; @@ -510,7 +510,7 @@ public static String getFileNameWithoutExtension(String fullFilename) { */ public static String getFileExtension(String fileNameWithExtension) { final String fileName = Path.of(fileNameWithExtension).toString(); - final var dotIndex = fileName.lastIndexOf('.'); + final int dotIndex = fileName.lastIndexOf('.'); final String extension; if (dotIndex == -1) { extension = ""; @@ -528,9 +528,9 @@ public static String getFileExtension(String fileNameWithExtension) { * @return true when the given string contains valid identifier. */ public static boolean isIdentifier(String str) { - var isIdentifier = !str.isEmpty(); + boolean isIdentifier = !str.isEmpty(); - for (var i = 0; isIdentifier && i < str.length(); i++) { + for (int i = 0; isIdentifier && i < str.length(); i++) { if (i == 0) { isIdentifier = Character.isJavaIdentifierStart(str.charAt(0)); } @@ -549,7 +549,7 @@ public static boolean isIdentifier(String str) { * @return true when the given string contains valid name. */ public static boolean isName(String str) { - var isName = false; + boolean isName = false; final String[] identifiers = str.split("\\.", -1); for (String identifier : identifiers) { @@ -581,10 +581,10 @@ public static boolean isBlank(String value) { * @return the index of the first non-whitespace character. */ public static int indexOfNonWhitespace(String value) { - final var length = value.length(); - var left = 0; + final int length = value.length(); + int left = 0; while (left < length) { - final var codePointAt = value.codePointAt(left); + final int codePointAt = value.codePointAt(left); if (!Character.isWhitespace(codePointAt)) { break; } @@ -606,7 +606,7 @@ public static int indexOfNonWhitespace(String value) { public static boolean isCodePointWhitespace(int[] codePoints, int index) { // We only need to check the first member of a surrogate pair to verify that // it is not whitespace. - final var character = Character.toChars(codePoints[index])[0]; + final char character = Character.toChars(codePoints[index])[0]; return Character.isWhitespace(character); } 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 d9305e3d8486..405c658f63cb 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java @@ -97,12 +97,12 @@ private JavadocUtil() { public static JavadocTags getJavadocTags(TextBlock textBlock, JavadocTagType tagType) { final List tags = new ArrayList<>(); - final var isBlockTags = tagType == JavadocTagType.ALL + final boolean isBlockTags = tagType == JavadocTagType.ALL || tagType == JavadocTagType.BLOCK; if (isBlockTags) { tags.addAll(BlockTagUtil.extractBlockTags(textBlock.getText())); } - final var isInlineTags = tagType == JavadocTagType.ALL + final boolean isInlineTags = tagType == JavadocTagType.ALL || tagType == JavadocTagType.INLINE; if (isInlineTags) { tags.addAll(InlineTagUtil.extractInlineTags(textBlock.getText())); @@ -112,12 +112,12 @@ public static JavadocTags getJavadocTags(TextBlock textBlock, final List invalidTags = new ArrayList<>(); for (TagInfo tag : tags) { - final var col = tag.getPosition().getColumn(); + final int col = tag.getPosition().getColumn(); // Add the starting line of the comment to the line number to get the actual line number // in the source. // Lines are one-indexed, so need an off-by-one correction. - final var line = textBlock.getStartLineNo() + tag.getPosition().getLine() - 1; + final int line = textBlock.getStartLineNo() + tag.getPosition().getLine() - 1; if (JavadocTagInfo.isValidName(tag.getName())) { validTags.add( @@ -140,10 +140,10 @@ public static JavadocTags getJavadocTags(TextBlock textBlock, * identifier. */ public static boolean isJavadocComment(String commentContent) { - var result = false; + boolean result = false; if (!commentContent.isEmpty()) { - final var docCommentIdentifier = commentContent.charAt(0); + final char docCommentIdentifier = commentContent.charAt(0); result = docCommentIdentifier == '*'; } @@ -240,7 +240,7 @@ public static List getAllNodesOfType(DetailNode detailNode, int type public static boolean isTag(DetailNode ast, String expectedTagName) { final DetailNode htmlTagStart = findFirstToken(ast, JavadocCommentsTokenTypes.HTML_TAG_START); - var isTag = false; + boolean isTag = false; if (htmlTagStart != null) { final String tagName = findFirstToken(htmlTagStart, JavadocCommentsTokenTypes.TAG_NAME).getText(); 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 2dbfdfbc7032..a34498c2593f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ModuleReflectionUtil.java @@ -86,7 +86,7 @@ && hasDefaultConstructor(clazz) * @return true if the class has a default constructor. */ private static boolean hasDefaultConstructor(Class clazz) { - var result = false; + boolean result = false; for (Constructor constructor : clazz.getDeclaredConstructors()) { if (constructor.getParameterCount() == 0) { result = true; 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 0bc27a6051de..c5252f621b0d 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ParserUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ParserUtil.java @@ -84,8 +84,8 @@ public static DetailAST createBlockCommentNode(CommonToken token) { final DetailAstImpl blockComment = new DetailAstImpl(); blockComment.initialize(TokenTypes.BLOCK_COMMENT_BEGIN, BLOCK_MULTIPLE_COMMENT_BEGIN); - final var tokenCharPositionInLine = token.getCharPositionInLine(); - final var tokenLine = token.getLine(); + final int tokenCharPositionInLine = token.getCharPositionInLine(); + final int tokenLine = token.getLine(); final String tokenText = token.getText(); blockComment.setColumnNo(tokenCharPositionInLine); @@ -122,9 +122,9 @@ public static DetailAST createBlockCommentNode(CommonToken token) { */ private static Map.Entry countLinesColumns( String text, int initialLinesCnt, int initialColumnsCnt) { - var lines = initialLinesCnt; - var columns = initialColumnsCnt; - var foundCr = false; + int lines = initialLinesCnt; + int columns = initialColumnsCnt; + boolean foundCr = false; for (char c : text.toCharArray()) { if (c == '\n') { foundCr = false; 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 1edbd7674618..414115111786 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtil.java @@ -128,7 +128,7 @@ public static Scope getSurroundingScope(DetailAST node) { for (DetailAST token = node; token != null; token = token.getParent()) { - final var type = token.getType(); + final int type = token.getType(); if (TokenUtil.isTypeDeclaration(type)) { final Scope tokenScope = getScope(token); if (returnValue == null || returnValue.isIn(tokenScope)) { @@ -193,7 +193,7 @@ public static boolean isInAnnotationBlock(DetailAST node) { * @return a {@code boolean} value */ public static boolean isInBlockOf(DetailAST node, int tokenType) { - var returnValue = false; + boolean returnValue = false; // Loop up looking for a containing interface block for (DetailAST token = node.getParent(); @@ -226,7 +226,7 @@ public static boolean isInInterfaceOrAnnotationBlock(DetailAST node) { * @return a {@code boolean} value */ public static boolean isInEnumBlock(DetailAST node) { - var returnValue = false; + boolean returnValue = false; // Loop up looking for a containing interface block for (DetailAST token = node.getParent(); @@ -250,7 +250,7 @@ public static boolean isInEnumBlock(DetailAST node) { * @return a {@code boolean} value */ public static boolean isInCodeBlock(DetailAST node) { - var returnValue = false; + boolean returnValue = false; final int[] tokenTypes = { TokenTypes.METHOD_DEF, TokenTypes.CTOR_DEF, @@ -280,7 +280,7 @@ public static boolean isInCodeBlock(DetailAST node) { * @return a {@code boolean} value */ public static boolean isOuterMostType(DetailAST node) { - var returnValue = true; + boolean returnValue = true; for (DetailAST parent = node.getParent(); parent != null; parent = parent.getParent()) { 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 38cd71b1b9ce..25a0886c9fb7 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/TokenUtil.java @@ -284,7 +284,7 @@ public static boolean isTypeDeclaration(int type) { * @return true if type matches one of the given types. */ public static boolean isOfType(int type, int... types) { - var matching = false; + boolean matching = false; for (int tokenType : types) { if (tokenType == type) { matching = true; @@ -336,8 +336,8 @@ public static boolean isRootNode(DetailAST ast) { * @return true if tokenType is LITERAL_TRUE or LITERAL_FALSE */ public static boolean isBooleanLiteralType(final int tokenType) { - final var isTrue = tokenType == TokenTypes.LITERAL_TRUE; - final var isFalse = tokenType == TokenTypes.LITERAL_FALSE; + final boolean isTrue = tokenType == TokenTypes.LITERAL_TRUE; + final boolean isFalse = tokenType == TokenTypes.LITERAL_FALSE; return isTrue || isFalse; } 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 5346bf570e80..04dc2704f94d 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/XpathUtil.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/XpathUtil.java @@ -136,10 +136,10 @@ private XpathUtil() { public static List createChildren(AbstractNode root, AbstractNode parent, DetailAST firstChild) { DetailAST currentChild = firstChild; - final var depth = parent.getDepth() + 1; + final int depth = parent.getDepth() + 1; final List result = new ArrayList<>(); while (currentChild != null) { - final var index = result.size(); + final int index = result.size(); final ElementNode child = new ElementNode(root, parent, currentChild, depth, index); result.add(child); currentChild = currentChild.getNextSibling(); 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 a12839a880ae..075624027470 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/AbstractElementNode.java @@ -98,7 +98,7 @@ protected AbstractElementNode(AbstractNode root, AbstractNode parent, */ @Override public int compareOrder(NodeInfo other) { - var result = 0; + int result = 0; if (other instanceof AbstractNode node) { result = Integer.compare(depth, node.getDepth()); if (result == 0) { @@ -125,8 +125,8 @@ private static int compareCommonAncestorChildrenOrder(NodeInfo first, NodeInfo s child1 = child1.getParent(); child2 = child2.getParent(); } - final var index1 = ((AbstractElementNode) child1).indexAmongSiblings; - final var index2 = ((AbstractElementNode) child2).indexAmongSiblings; + final int index1 = ((AbstractElementNode) child1).indexAmongSiblings; + final int index2 = ((AbstractElementNode) child2).indexAmongSiblings; return Integer.compare(index1, index2); } 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 3a72369e3688..55d225c44850 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGenerator.java @@ -206,7 +206,7 @@ public static String generateXpathQuery(DetailAST ast) { */ private static int findPositionAmongSiblings(DetailAST ast) { DetailAST cur = ast; - var pos = 0; + int pos = 0; while (cur != null) { if (cur.getType() == ast.getType()) { pos++; @@ -292,7 +292,7 @@ private static String getXpathQuery(DetailAST root, DetailAST ast) { * @return if the given ast element has unique {@code TokenTypes} among siblings */ private static boolean hasAtLeastOneSiblingWithSameTokenType(DetailAST ast) { - var result = false; + boolean result = false; DetailAST prev = ast.getPreviousSibling(); while (prev != null) { if (prev.getType() == ast.getType()) { diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractGuiTestSupport.java b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractGuiTestSupport.java index d7d50c026efd..0010a7c0052d 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractGuiTestSupport.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractGuiTestSupport.java @@ -49,7 +49,7 @@ public abstract class AbstractGuiTestSupport extends AbstractPathTestSupport { */ @BeforeEach public void validateGraphicsEnvironment() { - final var isHeadless = GraphicsEnvironment.isHeadless(); + final boolean isHeadless = GraphicsEnvironment.isHeadless(); assumeFalse(isHeadless, "This test is incompatible with headless environment"); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractModuleTestSupport.java b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractModuleTestSupport.java index de2f02ffca30..c881913e9006 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractModuleTestSupport.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractModuleTestSupport.java @@ -706,7 +706,7 @@ private void verifyViolations(Configuration config, assertWithMessage("Violation lines for %s differ.", file) .that(actualViolationLines) .isEqualTo(expectedViolationLines); - for (var index = 0; index < actualViolations.size(); index++) { + for (int index = 0; index < actualViolations.size(); index++) { assertWithMessage("Actual and expected violations differ.") .that(actualViolations.get(index)) .matches(testInputViolations.get(index).toRegex()); @@ -733,7 +733,7 @@ private static void verifyViolations(String file, assertWithMessage("Violation lines for %s differ.", file) .that(actualViolationLines) .isEqualTo(expectedViolationLines); - for (var index = 0; index < actualViolations.size(); index++) { + for (int index = 0; index < actualViolations.size(); index++) { assertWithMessage("Actual and expected violations differ.") .that(actualViolations.get(index)) .matches(testInputViolations.get(index).toRegex()); @@ -922,7 +922,7 @@ private String getMessageBundle() { private static String getMessageBundle(String className) { final String messageBundle; final String messages = "messages"; - final var endIndex = className.lastIndexOf('.'); + final int endIndex = className.lastIndexOf('.'); final Map messageBundleMappings = new HashMap<>(); messageBundleMappings.put("SeverityMatchFilterExamplesTest", "com.puppycrawl.tools.checkstyle.checks.naming.messages"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractXmlTestSupport.java b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractXmlTestSupport.java index edc4f69dd5ed..58b62cc1c66b 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractXmlTestSupport.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractXmlTestSupport.java @@ -86,7 +86,7 @@ protected static void verifyXml(String expectedOutputFile, BiPredicate ordered, String... messages) throws Exception { String expectedContents = readFile(expectedOutputFile); - for (var i = 0; i < messages.length; i++) { + for (int i = 0; i < messages.length; i++) { expectedContents = expectedContents.replace("$" + i, messages[i]); } @@ -229,7 +229,7 @@ private static void verifyXmlAttributes(NamedNodeMap expected, NamedNodeMap actu .that(actual) .isNotNull(); - for (var i = 0; i < expected.getLength(); i++) { + for (int i = 0; i < expected.getLength(); i++) { verifyXmlAttribute(expected.item(i), actual.item(i), path); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java index ec0adde78c51..0b5567a3c67d 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/CheckerTest.java @@ -381,10 +381,10 @@ public void testFileExtensions() throws Exception { final String[] fileExtensions = {"java", "xml", "properties"}; checker.setFileExtensions(fileExtensions); checker.setCacheFile(createTempFile("junit").getPath()); - final var counter = checker.process(files); + final int counter = checker.process(files); // comparing to 1 as there is only one legal file in input - final var numLegalFiles = 1; + final int numLegalFiles = 1; final PropertyCacheFile cache = TestUtil.getInternalState(checker, "cacheFile", PropertyCacheFile.class); assertWithMessage("There were more legal files than expected") @@ -421,10 +421,10 @@ public void testIgnoredFileExtensions() throws Exception { final String[] fileExtensions = {"java", "xml", "properties"}; checker.setFileExtensions(fileExtensions); checker.setCacheFile(createTempFile("junit").getPath()); - final var counter = checker.process(allIgnoredFiles); + final int counter = checker.process(allIgnoredFiles); // comparing to 0 as there is no legal file in input - final var numLegalFiles = 0; + final int numLegalFiles = 0; assertWithMessage("There were more legal files than expected") .that(counter) .isEqualTo(numLegalFiles); @@ -678,7 +678,7 @@ public void testWithCacheWithNoViolation() throws Exception { } // There should 2 objects in cache: processed file (file.java) and checker configuration. - final var expectedNumberOfObjectsInCache = 2; + final int expectedNumberOfObjectsInCache = 2; assertWithMessage("Cache has unexpected size") .that(cache) .hasSize(expectedNumberOfObjectsInCache); @@ -737,7 +737,7 @@ public void testClearExistingCache() throws Exception { assertWithMessage("Cash have changed it hash") .that(cacheHash) .isEqualTo(cacheAfterClear.getProperty(PropertyCacheFile.CONFIG_HASH_KEY)); - final var expectedNumberOfObjectsInCacheAfterSecondRun = 2; + final int expectedNumberOfObjectsInCacheAfterSecondRun = 2; assertWithMessage("Cache has changed number of items") .that(cacheAfterSecondRun) .hasSize(expectedNumberOfObjectsInCacheAfterSecondRun); @@ -958,7 +958,7 @@ public void testCacheAndFilterWhichDoesNotImplementExternalResourceHolderInterfa assertWithMessage("Cache has changed its hash") .that(cacheHash) .isEqualTo(cacheAfterFirstRun.getProperty(PropertyCacheFile.CONFIG_HASH_KEY)); - final var expectedNumberOfObjectsInCache = 2; + final int expectedNumberOfObjectsInCache = 2; assertWithMessage("Number of items in cache differs from expected") .that(cacheAfterFirstRun) .hasSize(expectedNumberOfObjectsInCache); @@ -1005,7 +1005,7 @@ public void testCacheAndCheckWhichAddsNewResourceLocationButKeepsSameCheckerInst cacheAfterFirstRun.load(reader); } - final var expectedNumberOfObjectsInCacheAfterFirstRun = 4; + final int expectedNumberOfObjectsInCacheAfterFirstRun = 4; assertWithMessage("Number of items in cache differs from expected") .that(cacheAfterFirstRun) .hasSize(expectedNumberOfObjectsInCacheAfterFirstRun); @@ -1040,7 +1040,7 @@ public void testCacheAndCheckWhichAddsNewResourceLocationButKeepsSameCheckerInst assertWithMessage("Cache has null as a resource key") .that(cacheAfterFirstRun.getProperty(firstExternalResourceKey)) .isNotNull(); - final var expectedNumberOfObjectsInCacheAfterSecondRun = 4; + final int expectedNumberOfObjectsInCacheAfterSecondRun = 4; assertWithMessage("Number of items in cache differs from expected") .that(cacheAfterSecondRun) .hasSize(expectedNumberOfObjectsInCacheAfterSecondRun); @@ -1629,7 +1629,7 @@ public void testDuplicatedModule() throws Exception { // super.verify does not work here, for we change the logger out.flush(); - final var errs = checker.process(Collections.singletonList(new File(path))); + final int errs = checker.process(Collections.singletonList(new File(path))); try (ByteArrayInputStream inputStream = new ByteArrayInputStream(out.toByteArray()); LineNumberReader lnr = new LineNumberReader( @@ -1643,7 +1643,7 @@ public void testDuplicatedModule() throws Exception { .toList(); Arrays.sort(expected); - for (var i = 0; i < expected.length; i++) { + for (int i = 0; i < expected.length; i++) { final String expectedResult = "[ERROR] " + path + ":" + expected[i]; assertWithMessage("error message %s", i) .that(actual.get(i)) @@ -1926,7 +1926,7 @@ public void visitToken(DetailAST ast) { + " The check does not require comment nodes but there were comment nodes" + " in the AST."); } - final var childCount = ast.getChildCount(); + final int childCount = ast.getChildCount(); if (childCount != METHOD_DEF_CHILD_COUNT) { final String msg = String.format(Locale.ENGLISH, "AST node in no comment tree has wrong number of children. " @@ -1935,12 +1935,12 @@ public void visitToken(DetailAST ast) { log(ast, msg); } // count children where comment lives - var actualChildCount = 0; + int actualChildCount = 0; for (DetailAST child = ast.getFirstChild().getFirstChild(); child != null; child = child.getNextSibling()) { actualChildCount++; } - final var cacheChildCount = ast.getFirstChild().getChildCount(); + final int cacheChildCount = ast.getFirstChild().getChildCount(); if (cacheChildCount != actualChildCount) { final String msg = String.format(Locale.ENGLISH, "AST node with no comment has wrong number of children. " @@ -1984,7 +1984,7 @@ public void visitToken(DetailAST ast) { TokenTypes.BLOCK_COMMENT_BEGIN) == null) { log(ast, "Incorrect AST structure."); } - final var childCount = ast.getChildCount(); + final int childCount = ast.getChildCount(); if (childCount != METHOD_DEF_CHILD_COUNT) { final String msg = String.format(Locale.ENGLISH, "AST node in comment tree has wrong number of children. " @@ -1993,12 +1993,12 @@ public void visitToken(DetailAST ast) { log(ast, msg); } // count children where comment lives - var actualChildCount = 0; + int actualChildCount = 0; for (DetailAST child = ast.getFirstChild().getFirstChild(); child != null; child = child.getNextSibling()) { actualChildCount++; } - final var cacheChildCount = ast.getFirstChild().getChildCount(); + final int cacheChildCount = ast.getFirstChild().getChildCount(); if (cacheChildCount != actualChildCount) { final String msg = String.format(Locale.ENGLISH, "AST node with comment has wrong number of children. " diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java index 4c6756208d70..b3c73300d2da 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java @@ -603,7 +603,7 @@ public void testConfigWithIgnore() throws Exception { new PropertiesExpander(new Properties()), IgnoredModulesOptions.OMIT); final Configuration[] children = config.getChildren(); - final var length = children[0].getChildren().length; + final int length = children[0].getChildren().length; assertWithMessage("Invalid children count") .that(length) .isEqualTo(0); @@ -618,7 +618,7 @@ public void testConfigWithIgnoreUsingInputSource() throws Exception { new PropertiesExpander(new Properties()), IgnoredModulesOptions.OMIT); final Configuration[] children = config.getChildren(); - final var length = children[0].getChildren().length; + final int length = children[0].getChildren().length; assertWithMessage("Invalid children count") .that(length) .isEqualTo(0); @@ -662,7 +662,7 @@ public void testLoadConfigurationDeprecated() throws Exception { new PropertiesExpander(new Properties()), IgnoredModulesOptions.OMIT); final Configuration[] children = config.getChildren(); - final var length = children[0].getChildren().length; + final int length = children[0].getChildren().length; assertWithMessage("Invalid children count") .that(length) .isEqualTo(0); @@ -676,7 +676,7 @@ public void testLoadConfigurationFromClassPath() throws Exception { new PropertiesExpander(new Properties()), IgnoredModulesOptions.OMIT); final Configuration[] children = config.getChildren(); - final var length = children[0].getChildren().length; + final int length = children[0].getChildren().length; assertWithMessage("Invalid children count") .that(length) .isEqualTo(0); @@ -717,7 +717,7 @@ public void testConstructors() throws Exception { ConfigurationLoader.IgnoredModulesOptions.EXECUTE); final Configuration[] children = configuration1.getChildren(); - final var length = children[0].getChildren().length; + final int length = children[0].getChildren().length; assertWithMessage("Unexpected children size") .that(length) .isEqualTo(1); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java index 46c5d59851f1..ece553a4a758 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/DefaultLoggerTest.java @@ -147,7 +147,7 @@ public void testOldCtorWithTwoParametersCloseStreamOptions() { final OutputStream infoStream = new ByteArrayOutputStream(); final DefaultLogger dl = new DefaultLogger(infoStream, AutomaticBean.OutputStreamOptions.CLOSE); - final var closeInfo = TestUtil.getInternalState(dl, "closeInfo", Boolean.class); + final boolean closeInfo = TestUtil.getInternalState(dl, "closeInfo", Boolean.class); assertWithMessage("closeInfo should be true") .that(closeInfo) @@ -164,7 +164,7 @@ public void testOldCtorWithTwoParametersNoneStreamOptions() { final OutputStream infoStream = new ByteArrayOutputStream(); final DefaultLogger dl = new DefaultLogger(infoStream, AutomaticBean.OutputStreamOptions.NONE); - final var closeInfo = TestUtil.getInternalState(dl, "closeInfo", Boolean.class); + final boolean closeInfo = TestUtil.getInternalState(dl, "closeInfo", Boolean.class); assertWithMessage("closeInfo should be false") .that(closeInfo) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java index acd9fe0ae5a6..43abd9c15b1e 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/DetailAstImplTest.java @@ -203,23 +203,23 @@ public void testGetChildCountType() throws Exception { invokeSetParentMethod(firstLevelB, root); - final var childCountLevelB = firstLevelB.getChildCount(0); + final int childCountLevelB = firstLevelB.getChildCount(0); assertWithMessage("Invalid child count") .that(childCountLevelB) .isEqualTo(0); - final var childCountLevelA = firstLevelA.getChildCount(TokenTypes.EXPR); + final int childCountLevelA = firstLevelA.getChildCount(TokenTypes.EXPR); assertWithMessage("Invalid child count") .that(childCountLevelA) .isEqualTo(0); - final var identTypeCount = root.getChildCount(TokenTypes.IDENT); + final int identTypeCount = root.getChildCount(TokenTypes.IDENT); assertWithMessage("Invalid child count") .that(identTypeCount) .isEqualTo(1); - final var exprTypeCount = root.getChildCount(TokenTypes.EXPR); + final int exprTypeCount = root.getChildCount(TokenTypes.EXPR); assertWithMessage("Invalid child count") .that(exprTypeCount) .isEqualTo(1); - final var invalidTypeCount = root.getChildCount(0); + final int invalidTypeCount = root.getChildCount(0); assertWithMessage("Invalid child count") .that(invalidTypeCount) .isEqualTo(0); @@ -432,11 +432,11 @@ public void testClearChildCountCache() { ); for (Consumer method : clearChildCountCacheMethods) { - final var startCount = parent.getChildCount(); + final int startCount = parent.getChildCount(); method.accept(null); - final var intermediateCount = TestUtil.getInternalState(parent, "childCount", + final int intermediateCount = TestUtil.getInternalState(parent, "childCount", Integer.class); - final var finishCount = parent.getChildCount(); + final int finishCount = parent.getChildCount(); assertWithMessage("Child count has changed") .that(finishCount) .isEqualTo(startCount); @@ -445,10 +445,10 @@ public void testClearChildCountCache() { .isEqualTo(Integer.MIN_VALUE); } - final var startCount = child.getChildCount(); + final int startCount = child.getChildCount(); child.addChild(null); - final var intermediateCount = TestUtil.getInternalState(child, "childCount", Integer.class); - final var finishCount = child.getChildCount(); + final int intermediateCount = TestUtil.getInternalState(child, "childCount", Integer.class); + final int finishCount = child.getChildCount(); assertWithMessage("Child count has changed") .that(finishCount) .isEqualTo(startCount); @@ -690,7 +690,7 @@ public void testManyComments() throws Exception { */ """); bw.write("class C {\n"); - for (var i = 0; i <= 30000; i++) { + for (int i = 0; i <= 30000; i++) { bw.write("// " + i + "\n"); } bw.write("}\n"); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/IndentationTrailingCommentsVerticalAlignmentTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/IndentationTrailingCommentsVerticalAlignmentTest.java index 973ab7b3e8f7..d5e0844d09e0 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/IndentationTrailingCommentsVerticalAlignmentTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/IndentationTrailingCommentsVerticalAlignmentTest.java @@ -68,22 +68,22 @@ public void testTrailingCommentsAlignment(Path testFile) throws IOException { } final List lines = Files.readAllLines(testFile); - var expectedStartIndex = -1; + int expectedStartIndex = -1; - for (var idx = 0; idx < lines.size(); idx++) { + for (int idx = 0; idx < lines.size(); idx++) { final String line = lines.get(idx); if (line.trim().startsWith("import ") || line.trim().startsWith("package ")) { continue; } - final var commentStartIndex = line.indexOf("//indent:"); + final int commentStartIndex = line.indexOf("//indent:"); if (commentStartIndex > 0) { final String codePart = line.substring(0, commentStartIndex); if (!codePart.isBlank()) { - var actualStartIndex = + int actualStartIndex = CommonUtil.lengthExpandedTabs(line, commentStartIndex, TAB_WIDTH); // for unicode characters having supplementary code points - final var extraWidth = codePart.codePoints().filter( + final long extraWidth = codePart.codePoints().filter( Character::isSupplementaryCodePoint).count(); actualStartIndex -= Math.toIntExact(extraWidth); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/JavaAstVisitorTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/JavaAstVisitorTest.java index 8a14c8e797bf..c50c259ec850 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/JavaAstVisitorTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/JavaAstVisitorTest.java @@ -173,14 +173,14 @@ public void countExprUsagesInParserGrammar() throws IOException { final String parserGrammarFilename = "src/main/resources/com/puppycrawl" + "/tools/checkstyle/grammar/java/JavaLanguageParser.g4"; - final var actualExprCount = Arrays.stream(new FileText(new File(parserGrammarFilename), + final int actualExprCount = Arrays.stream(new FileText(new File(parserGrammarFilename), StandardCharsets.UTF_8.name()).toLinesArray()) .mapToInt(JavaAstVisitorTest::countExprInLine) .sum(); // Any time we update this count, we should question why we are not building an imaginary // 'EXPR' node. - final var expectedExprCount = 44; + final int expectedExprCount = 44; assertWithMessage("The 'expr' parser rule does not build an imaginary" + " 'EXPR' node. Any usage of this rule should be questioned.") diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGeneratorTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGeneratorTest.java index aad5b9061e98..d9fa0faa1e46 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGeneratorTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/JavadocPropertiesGeneratorTest.java @@ -262,7 +262,7 @@ public void testEmptyJavadoc(@SysErr Capturable systemErr, @SysOut Capturable sy assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo(""); - final var size = FileUtils.sizeOf(DESTFILE); + final long size = FileUtils.sizeOf(DESTFILE); assertWithMessage("File '%s' must be empty", DESTFILE) .that(size) .isEqualTo(0); @@ -279,7 +279,7 @@ public void testNotConstants(@SysErr Capturable systemErr, @SysOut Capturable sy assertWithMessage("Unexpected output log") .that(systemOut.getCapturedData()) .isEqualTo(""); - final var size = FileUtils.sizeOf(DESTFILE); + final long size = FileUtils.sizeOf(DESTFILE); assertWithMessage("File '%s' must be empty", DESTFILE) .that(size) .isEqualTo(0); @@ -309,7 +309,7 @@ public void testJavadocParseError() throws Exception { .that(exc.getMessage()) .contains("mismatched input '' expecting JAVADOC_INLINE_TAG_END"); } - final var size = FileUtils.sizeOf(DESTFILE); + final long size = FileUtils.sizeOf(DESTFILE); assertWithMessage("File '%s' must be empty", DESTFILE) .that(size) .isEqualTo(0); @@ -327,7 +327,7 @@ public void testNotImplementedTag() throws Exception { .that(exc.getMessage()) .isEqualTo("Unsupported inline tag LINK_INLINE_TAG"); } - final var size = FileUtils.sizeOf(DESTFILE); + final long size = FileUtils.sizeOf(DESTFILE); assertWithMessage("File '%s' must be empty", DESTFILE) .that(size) .isEqualTo(0); @@ -345,7 +345,7 @@ public void testInvalidTokensInsideTag() throws Exception { .that(exc.getMessage()) .isEqualTo("Unsupported child in the inline tag NEWLINE"); } - final var size = FileUtils.sizeOf(DESTFILE); + final long size = FileUtils.sizeOf(DESTFILE); assertWithMessage("File '%s' must be empty", DESTFILE) .that(size) .isEqualTo(0); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java index b6b858b743d4..7faa61f5d2db 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java @@ -239,7 +239,7 @@ public void setUp(@SysErr Capturable systemErr, @SysOut Capturable systemOut) { LOG.setLevel(ORIGINAL_LOG_LEVEL); for (Handler handler : LOG.getHandlers()) { - var found = false; + boolean found = false; for (Handler savedHandler : HANDLERS) { if (handler == savedHandler) { @@ -831,10 +831,10 @@ public void testLoadPropertiesIoException() throws Exception { new String[] {""}, null, getClass(), null); final String causeMessage = exc.getCause().getLocalizedMessage(); final String violation = loadPropertiesMessage.getViolation(); - final var samePrefix = causeMessage.substring(0, causeMessage.indexOf(' ')) + final boolean samePrefix = causeMessage.substring(0, causeMessage.indexOf(' ')) .equals(violation .substring(0, violation.indexOf(' '))); - final var sameSuffix = + final boolean sameSuffix = causeMessage.substring(causeMessage.lastIndexOf(' ')) .equals(violation .substring(violation.lastIndexOf(' '))); @@ -855,7 +855,7 @@ public void testExistingDirectoryWithViolations(@SysErr Capturable systemErr, {"InputMainComplexityOverflow", "1", "172"}, }; - final var allowedLength = 170; + final int allowedLength = 170; final String msgKey = "maxLen.file"; final String bundle = "com.puppycrawl.tools.checkstyle.checks.sizes.messages"; diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java index c9245be1aea8..4bf624c4d3a6 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java @@ -540,10 +540,10 @@ public void testPutNonExistentExternalResource(String rawMessages) throws Except // We mock getUriByFilename method of CommonUtil to guarantee that it will // throw CheckstyleException with the specific content. try (MockedStatic commonUtil = mockStatic(CommonUtil.class)) { - final var numberOfRuns = messages.size(); + final int numberOfRuns = messages.size(); final String[] configHashes = new String[numberOfRuns]; final String[] externalResourceHashes = new String[numberOfRuns]; - for (var i = 0; i < numberOfRuns; i++) { + for (int i = 0; i < numberOfRuns; i++) { commonUtil.when(() -> CommonUtil.getUriByFilename(any(String.class))) .thenThrow(new CheckstyleException(messages.get(i))); final Configuration config = new DefaultConfiguration("myConfig"); @@ -581,7 +581,7 @@ public void testPutNonExistentExternalResource(String rawMessages) throws Except assertWithMessage("Invalid config hash") .that(configHashes[0]) .isEqualTo(configHashes[1]); - final var sameException = messages.get(0).equals(messages.get(1)); + final boolean sameException = messages.get(0).equals(messages.get(1)); assertWithMessage("Invalid external resource hashes") .that(externalResourceHashes[0].equals(externalResourceHashes[1])) .isEqualTo(sameException); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/SarifLoggerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/SarifLoggerTest.java index 682d84d52c87..9658e488ab34 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/SarifLoggerTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/SarifLoggerTest.java @@ -308,7 +308,7 @@ public void testCtorWithTwoParametersCloseStreamOptions() throws IOException { final OutputStream infoStream = new ByteArrayOutputStream(); final SarifLogger logger = new SarifLogger(infoStream, AutomaticBean.OutputStreamOptions.CLOSE); - final var closeStream = TestUtil.getInternalState(logger, "closeStream", Boolean.class); + final boolean closeStream = TestUtil.getInternalState(logger, "closeStream", Boolean.class); assertWithMessage("closeStream should be true") .that(closeStream) @@ -323,7 +323,7 @@ public void testCtorWithTwoParametersNoneStreamOptions() throws IOException { final OutputStream infoStream = new ByteArrayOutputStream(); final SarifLogger logger = new SarifLogger(infoStream, AutomaticBean.OutputStreamOptions.NONE); - final var closeStream = TestUtil.getInternalState(logger, "closeStream", Boolean.class); + final boolean closeStream = TestUtil.getInternalState(logger, "closeStream", Boolean.class); assertWithMessage("closeStream should be false") .that(closeStream) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinterTest.java index 623b41571b61..5a02303fe99b 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/SuppressionsStringPrinterTest.java @@ -55,7 +55,7 @@ public void testCorrect() throws Exception { final File input = new File(getPath("InputSuppressionsStringPrinter.java")); final String lineAndColumnNumber = "3:1"; - final var tabWidth = 2; + final int tabWidth = 2; final String result = SuppressionsStringPrinter.printSuppressions(input, lineAndColumnNumber, tabWidth); @@ -78,7 +78,7 @@ public void testCustomTabWidth() throws Exception { final File input = new File(getPath("InputSuppressionsStringPrinter.java")); final String lineAndColumnNumber = "5:13"; - final var tabWidth = 4; + final int tabWidth = 4; final String result = SuppressionsStringPrinter.printSuppressions(input, lineAndColumnNumber, tabWidth); @@ -91,7 +91,7 @@ public void testCustomTabWidth() throws Exception { public void testCustomTabWidthEmptyResult() throws Exception { final File input = new File(getPath("InputSuppressionsStringPrinter.java")); final String lineAndColumnNumber = "5:13"; - final var tabWidth = 6; + final int tabWidth = 6; final String result = SuppressionsStringPrinter.printSuppressions(input, lineAndColumnNumber, tabWidth); assertWithMessage("Invalid xpath queries") @@ -103,7 +103,7 @@ public void testCustomTabWidthEmptyResult() throws Exception { public void testInvalidLineAndColumnNumberParameter() throws Exception { final File input = new File(getPath("InputSuppressionsStringPrinter.java")); final String invalidLineAndColumnNumber = "abc-432"; - final var tabWidth = 2; + final int tabWidth = 2; try { SuppressionsStringPrinter.printSuppressions(input, invalidLineAndColumnNumber, tabWidth); @@ -120,7 +120,7 @@ public void testInvalidLineAndColumnNumberParameter() throws Exception { public void testParseFileTextThrowable() throws Exception { final File input = new File(getNonCompilablePath("InputSuppressionsStringPrinter.java")); final String lineAndColumnNumber = "2:3"; - final var tabWidth = 2; + final int tabWidth = 2; try { SuppressionsStringPrinter.printSuppressions(input, lineAndColumnNumber, tabWidth); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java index 974aa3ac9328..d631bc570fc3 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java @@ -228,7 +228,7 @@ public void testOnEmptyFile() throws Exception { final File emptyFile = new File(temporaryFolder, uniqueFileName); emptyFile.createNewFile(); execute(checkConfig, emptyFile.getPath()); - final var fileSize = Files.size(emptyFile.toPath()); + final long fileSize = Files.size(emptyFile.toPath()); assertWithMessage("File should be empty") .that(fileSize) .isEqualTo(0); @@ -279,7 +279,7 @@ public void testSettersForParameters() throws Exception { treeWalker.setTabWidth(1); treeWalker.configure(config); - final var tabWidth = TestUtil.getInternalState(treeWalker, "tabWidth", Integer.class); + final int tabWidth = TestUtil.getInternalState(treeWalker, "tabWidth", Integer.class); assertWithMessage("Invalid setter result") .that(tabWidth) .isEqualTo(1); @@ -490,7 +490,7 @@ public void testSetupChild() throws Exception { final Set filters = TestUtil.getInternalStateSetTreeWalkerFilter(treeWalker, "filters"); - final var tabWidth = TestUtil.getInternalState(filters.iterator().next(), + final int tabWidth = TestUtil.getInternalState(filters.iterator().next(), "tabWidth", Integer.class); assertWithMessage("expected tab width") @@ -648,7 +648,7 @@ public void testExternalResourceFiltersWithNoExternalResource() throws Exception execute(checkerConfig, filePath.toString()); - final var cacheSize = Files.size(cacheFile.toPath()); + final long cacheSize = Files.size(cacheFile.toPath()); assertWithMessage("cacheFile should not be empty") .that(cacheSize) .isNotEqualTo(0); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java index 0349090ded9d..30434ff5ac0e 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java @@ -435,7 +435,7 @@ public void testFinishLocalSetup() { @Test public void testCtorWithTwoParametersCloseStreamOptions() { final XMLLogger logger = new XMLLogger(outStream, AutomaticBean.OutputStreamOptions.CLOSE); - final var closeStream = TestUtil.getInternalState(logger, "closeStream", Boolean.class); + final boolean closeStream = TestUtil.getInternalState(logger, "closeStream", Boolean.class); assertWithMessage("closeStream should be true") .that(closeStream) @@ -451,7 +451,7 @@ public void testCtorWithTwoParametersCloseStreamOptions() { @Test public void testCtorWithTwoParametersNoneStreamOptions() { final XMLLogger logger = new XMLLogger(outStream, AutomaticBean.OutputStreamOptions.NONE); - final var closeStream = TestUtil.getInternalState(logger, "closeStream", Boolean.class); + final boolean closeStream = TestUtil.getInternalState(logger, "closeStream", Boolean.class); assertWithMessage("closeStream should be false") .that(closeStream) 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 474f94c94967..479236495f0f 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTaskTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTaskTest.java @@ -200,7 +200,7 @@ public final void testBaseDirPresence() throws IOException { final List loggedMessages = antTask.getLoggedMessages(); final String expectedPath = new File(getPath(".")).getAbsolutePath(); - final var containsBaseDir = loggedMessages.stream() + final boolean containsBaseDir = loggedMessages.stream() .anyMatch(msg -> msg.getMsg().contains(expectedPath)); assertWithMessage("Base directory should be present in logs.") @@ -520,7 +520,7 @@ public final void testConfigurationByUrl() throws IOException { antTask.execute(); final List output = readWholeFile(outputFile); - final var sizeOfOutputWithNoViolations = 2; + final int sizeOfOutputWithNoViolations = 2; assertWithMessage("No violations expected") .that(output) .hasSize(sizeOfOutputWithNoViolations); @@ -545,7 +545,7 @@ public final void testConfigurationByResource() throws IOException { antTask.execute(); final List output = readWholeFile(outputFile); - final var sizeOfOutputWithNoViolations = 2; + final int sizeOfOutputWithNoViolations = 2; assertWithMessage("No violations expected") .that(output) .hasSize(sizeOfOutputWithNoViolations); @@ -612,7 +612,7 @@ public final void testXmlOutput() throws IOException { final List expected = readWholeFile( new File(getPath("ExpectedCheckstyleAntTaskXmlOutput.xml"))); final List actual = readWholeFile(outputFile); - for (var i = 0; i < expected.size(); i++) { + for (int i = 0; i < expected.size(); i++) { final String line = expected.get(i); if (!line.startsWith(" expected = readWholeFile( new File(getPath("ExpectedCheckstyleAntTaskSarifOutput.sarif"))); final List actual = readWholeFile(outputFile); - for (var lineNumber = 0; lineNumber < expected.size(); lineNumber++) { + for (int lineNumber = 0; lineNumber < expected.size(); lineNumber++) { final String line = expected.get(lineNumber); final StandardSubjectBuilder assertWithMessage = assertWithMessage("Content of file with violations differs from expected"); @@ -917,7 +917,7 @@ public final void testExecuteLogOutput() throws Exception { .that(loggedMessages) .hasSize(expectedList.size()); - for (var i = 0; i < expectedList.size(); i++) { + for (int i = 0; i < expectedList.size(); i++) { final MessageLevelPair expected = expectedList.get(i); final MessageLevelPair actual = loggedMessages.get(i); assertWithMessage("Log messages should match") @@ -950,10 +950,10 @@ public void testLoggedTime() throws IOException { antTask.setConfig(getPath(CONFIG_FILE)); antTask.setProject(new Project()); antTask.setFile(new File(getPath(FLAWLESS_INPUT))); - final var startTime = System.currentTimeMillis(); + final long startTime = System.currentTimeMillis(); antTask.execute(); - final var endTime = System.currentTimeMillis(); - final var testingTime = endTime - startTime; + final long endTime = System.currentTimeMillis(); + final long testingTime = endTime - startTime; final List loggedMessages = antTask.getLoggedMessages(); assertLoggedTime(loggedMessages, testingTime, "Total execution"); @@ -972,7 +972,7 @@ private static void assertLoggedTime(List loggedMessages, .that(optionalMessageLevelPair.isPresent()) .isTrue(); - final var actualTime = getNumberFromLine(optionalMessageLevelPair.orElseThrow().getMsg()); + final long actualTime = getNumberFromLine(optionalMessageLevelPair.orElseThrow().getMsg()); assertWithMessage("Logged time in '%s' must be less than the testing time", expectedMsg) .that(actualTime) 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 ce47ff496588..79fd5211ca96 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/AbstractCheckTest.java @@ -228,7 +228,7 @@ public int[] getRequiredTokens() { return getDefaultTokens(); } }; - final var tabWidth = 4; + final int tabWidth = 4; check.setTabWidth(tabWidth); assertWithMessage("Invalid tab width") 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 eb6e1363ef88..f9ed3dfa06cd 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/api/LineColumnTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/LineColumnTest.java @@ -30,7 +30,7 @@ public class LineColumnTest { @Test public void testCompareToBothEqual() { - final var actual = new LineColumn(0, 0).compareTo(new LineColumn(0, 0)); + final int actual = new LineColumn(0, 0).compareTo(new LineColumn(0, 0)); assertWithMessage("Invalid LineColumn comparing result") .that(actual) .isEqualTo(0); @@ -40,11 +40,11 @@ public void testCompareToBothEqual() { public void testCompareToFirstLarger() { final LineColumn lineColumn = new LineColumn(0, 0); - final var line1column0 = new LineColumn(1, 0).compareTo(lineColumn); + final int line1column0 = new LineColumn(1, 0).compareTo(lineColumn); assertWithMessage("Invalid LineColumn comparison result") .that(line1column0) .isEqualTo(1); - final var line2Column1 = new LineColumn(0, 1).compareTo(lineColumn); + final int line2Column1 = new LineColumn(0, 1).compareTo(lineColumn); assertWithMessage("Invalid LineColumn comparison result") .that(line2Column1) .isEqualTo(1); @@ -54,11 +54,11 @@ public void testCompareToFirstLarger() { public void testCompareToFirstSmaller() { final Comparable lineColumn = new LineColumn(0, 0); - final var line1Column0 = lineColumn.compareTo(new LineColumn(1, 0)); + final int line1Column0 = lineColumn.compareTo(new LineColumn(1, 0)); assertWithMessage("Invalid LineColumn comparison result") .that(line1Column0) .isEqualTo(-1); - final var line0Column1 = lineColumn.compareTo(new LineColumn(0, 1)); + final int line0Column1 = lineColumn.compareTo(new LineColumn(0, 1)); assertWithMessage("Invalid LineColumn comparison result") .that(line0Column1) .isEqualTo(-1); 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 6a69cbf4e27b..c159ddf279d7 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/api/ViolationTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/ViolationTest.java @@ -162,7 +162,7 @@ public void testCompareToWithDifferentLines() { assertWithMessage("Invalid comparing result") .that(message2.compareTo(message1) > 0) .isTrue(); - final var actual = message1.compareTo(message1a); + final int actual = message1.compareTo(message1a); assertWithMessage("Invalid comparing result") .that(actual) .isEqualTo(0); @@ -180,7 +180,7 @@ public void testCompareToWithDifferentColumns() { assertWithMessage("Invalid comparing result") .that(message2.compareTo(message1) > 0) .isTrue(); - final var actual = message1.compareTo(message1a); + final int actual = message1.compareTo(message1a); assertWithMessage("Invalid comparing result") .that(actual) .isEqualTo(0); 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 36b3576965f2..83c8f55e51e1 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/bdd/InlineConfigParser.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/bdd/InlineConfigParser.java @@ -499,7 +499,7 @@ public static List getViolationsFromInputFile(String inputFi final List lines = readFile(filePath); try { - for (var lineNo = 0; lineNo < lines.size(); lineNo++) { + for (int lineNo = 0; lineNo < lines.size(); lineNo++) { setViolations(testInputConfigBuilder, lines, false, lineNo, true); } } @@ -518,7 +518,7 @@ public static List getFilteredViolationsFromInputFile(String final List lines = readFile(filePath); try { - for (var lineNo = 0; lineNo < lines.size(); lineNo++) { + for (int lineNo = 0; lineNo < lines.size(); lineNo++) { setViolations(testInputConfigBuilder, lines, true, lineNo, true); } } @@ -643,7 +643,7 @@ private static void handleXmlConfig(TestInputConfiguration.Builder testInputConf private static void handleKeyValueConfig(TestInputConfiguration.Builder testInputConfigBuilder, String inputFilePath, List lines) throws CheckstyleException, IOException, ReflectiveOperationException { - var lineNo = 0; + int lineNo = 0; while (lineNo < lines.size()) { final ModuleInputConfiguration.Builder moduleInputConfigBuilder = new ModuleInputConfiguration.Builder(); @@ -662,7 +662,7 @@ private static void handleKeyValueConfig(TestInputConfiguration.Builder testInpu private static Map getDefaultProperties(String fullyQualifiedClassName) { final Map defaultProperties = new HashMap<>(); - final var isSuppressedModule = SUPPRESSED_MODULES.contains(fullyQualifiedClassName); + final boolean isSuppressedModule = SUPPRESSED_MODULES.contains(fullyQualifiedClassName); if (PUBLIC_MODULE_DETAILS_MAP.isEmpty()) { XmlMetaReader.readAllModulesIncludingThirdPartyIfAny().forEach(module -> { @@ -697,12 +697,12 @@ else if (moduleName.startsWith("com.")) { } else { final String path = SLASH_PATTERN.matcher(filePath).replaceAll("."); - final var endIndex = path.lastIndexOf(moduleName.toLowerCase(Locale.ROOT)); + final int endIndex = path.lastIndexOf(moduleName.toLowerCase(Locale.ROOT)); if (endIndex == -1) { throw new CheckstyleException("Unable to resolve module name: " + moduleName + ". Please check for spelling errors or specify fully qualified class name."); } - final var beginIndex = path.indexOf("com.puppycrawl"); + final int beginIndex = path.indexOf("com.puppycrawl"); fullyQualifiedClassName = path.substring(beginIndex, endIndex) + moduleName; if (!fullyQualifiedClassName.endsWith("Filter")) { fullyQualifiedClassName += "Check"; @@ -712,7 +712,7 @@ else if (moduleName.startsWith("com.")) { } private static String getFilePath(String fileName, String inputFilePath) { - final var lastSlashIndex = Math.max(inputFilePath.lastIndexOf('\\'), + final int lastSlashIndex = Math.max(inputFilePath.lastIndexOf('\\'), inputFilePath.lastIndexOf('/')); final String root = inputFilePath.substring(0, lastSlashIndex + 1); return root + fileName; @@ -720,7 +720,7 @@ private static String getFilePath(String fileName, String inputFilePath) { private static String getResourcePath(String fileName, String inputFilePath) { final String filePath = getUriPath(fileName, inputFilePath); - final var lastSlashIndex = filePath.lastIndexOf('/'); + final int lastSlashIndex = filePath.lastIndexOf('/'); final String root = filePath.substring(filePath.indexOf("puppycrawl") - 5, lastSlashIndex + 1); return root + fileName; @@ -943,7 +943,7 @@ private static Object createCheckInstance(String className) throws private static String readPropertiesContent(int beginLineNo, List lines) { final StringBuilder stringBuilder = new StringBuilder(128); - var lineNo = beginLineNo; + int lineNo = beginLineNo; String line = lines.get(lineNo); while (!line.isEmpty() && !"*/".equals(line)) { stringBuilder.append(line).append('\n'); @@ -1076,7 +1076,7 @@ private static boolean shouldSpecifyViolationMessage( TestInputConfiguration.Builder inputConfigBuilder, String inputFilePath) { - var result = false; + boolean result = false; final List moduleLists = inputConfigBuilder.getChildrenModules(); @@ -1103,10 +1103,10 @@ private static void setViolations(TestInputConfiguration.Builder inputConfigBuil String inputFilePath) throws CheckstyleException { - final var specifyViolationMessage = + final boolean specifyViolationMessage = shouldSpecifyViolationMessage(inputConfigBuilder, inputFilePath); - for (var lineNo = 0; lineNo < lines.size(); lineNo++) { + for (int lineNo = 0; lineNo < lines.size(); lineNo++) { setViolations(inputConfigBuilder, lines, useFilteredViolations, lineNo, specifyViolationMessage); } @@ -1170,7 +1170,7 @@ private static void setViolations(TestInputConfiguration.Builder inputConfigBuil VIOLATION_DEFAULT.matcher(lines.get(lineNo)); if (violationMatcher.matches()) { final String violationMessage = violationMatcher.group(1); - final var violationLineNum = lineNo + 1; + final int violationLineNum = lineNo + 1; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addViolation(violationLineNum, violationMessage); @@ -1182,7 +1182,7 @@ else if (violationAboveMatcher.matches()) { } else if (violationBelowMatcher.matches()) { final String violationMessage = violationBelowMatcher.group(1); - final var violationLineNum = lineNo + 2; + final int violationLineNum = lineNo + 2; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addViolation(violationLineNum, violationMessage); @@ -1194,27 +1194,27 @@ else if (violationAboveWithExplanationMatcher.matches()) { } else if (violationBelowWithExplanationMatcher.matches()) { final String violationMessage = violationBelowWithExplanationMatcher.group(1); - final var violationLineNum = lineNo + 2; + final int violationLineNum = lineNo + 2; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addViolation(violationLineNum, violationMessage); } else if (violationWithExplanationMatcher.matches()) { - final var violationLineNum = lineNo + 1; + final int violationLineNum = lineNo + 1; inputConfigBuilder.addViolation(violationLineNum, null); } else if (violationSomeLinesAboveMatcher.matches()) { final String violationMessage = violationSomeLinesAboveMatcher.group(2); - final var linesAbove = Integer.parseInt(violationSomeLinesAboveMatcher.group(1)) - 1; - final var violationLineNum = lineNo - linesAbove; + final int linesAbove = Integer.parseInt(violationSomeLinesAboveMatcher.group(1)) - 1; + final int violationLineNum = lineNo - linesAbove; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addViolation(violationLineNum, violationMessage); } else if (violationSomeLinesBelowMatcher.matches()) { final String violationMessage = violationSomeLinesBelowMatcher.group(2); - final var linesBelow = Integer.parseInt(violationSomeLinesBelowMatcher.group(1)) + 1; - final var violationLineNum = lineNo + linesBelow; + final int linesBelow = Integer.parseInt(violationSomeLinesBelowMatcher.group(1)) + 1; + final int violationLineNum = lineNo + linesBelow; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addViolation(violationLineNum, violationMessage); @@ -1261,7 +1261,7 @@ else if (useFilteredViolations) { lines.get(lineNo), specifyViolationMessage); } else if (violationsDefault.matches()) { - final var violationLineNum = lineNo + 1; + final int violationLineNum = lineNo + 1; inputConfigBuilder.addViolation(violationLineNum, null); } } @@ -1271,9 +1271,9 @@ private static List getExpectedViolationsForSpecificLine( Matcher matcher) { final List results = new ArrayList<>(); - final var expectedMessageCount = + final int expectedMessageCount = Integer.parseInt(matcher.group(1)); - for (var index = 1; index <= expectedMessageCount; index++) { + for (int index = 1; index <= expectedMessageCount; index++) { final String lineWithMessage = lines.get(lineNo + index); final Matcher messageMatcher = VIOLATION_MESSAGE_PATTERN.matcher(lineWithMessage); if (messageMatcher.find()) { @@ -1293,7 +1293,7 @@ private static List getExpectedViolationsForSpecificLine( private static List getExpectedViolations( List lines, int lineNo, Matcher matcher, boolean isAbove) { - final var violationLine = + final int violationLine = Integer.parseInt(matcher.group(2)); final int violationLineNum; if (isAbove) { @@ -1327,30 +1327,30 @@ private static void setFilteredViolation(TestInputConfiguration.Builder inputCon } else if (violationAboveMatcher.matches()) { final String violationMessage = violationAboveMatcher.group(1); - final var violationLineNum = lineNo - 1; + final int violationLineNum = lineNo - 1; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addFilteredViolation(violationLineNum, violationMessage); } else if (violationBelowMatcher.matches()) { final String violationMessage = violationBelowMatcher.group(1); - final var violationLineNum = lineNo + 1; + final int violationLineNum = lineNo + 1; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addFilteredViolation(violationLineNum, violationMessage); } else if (violationSomeLinesAboveMatcher.matches()) { final String violationMessage = violationSomeLinesAboveMatcher.group(2); - final var linesAbove = Integer.parseInt(violationSomeLinesAboveMatcher.group(1)); - final var violationLineNum = lineNo - linesAbove; + final int linesAbove = Integer.parseInt(violationSomeLinesAboveMatcher.group(1)); + final int violationLineNum = lineNo - linesAbove; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addFilteredViolation(violationLineNum, violationMessage); } else if (violationSomeLinesBelowMatcher.matches()) { final String violationMessage = violationSomeLinesBelowMatcher.group(2); - final var linesBelow = Integer.parseInt(violationSomeLinesBelowMatcher.group(1)); - final var violationLineNum = lineNo + linesBelow; + final int linesBelow = Integer.parseInt(violationSomeLinesBelowMatcher.group(1)); + final int violationLineNum = lineNo + linesBelow; checkWhetherViolationSpecified(specifyViolationMessage, violationMessage, violationLineNum); inputConfigBuilder.addFilteredViolation(violationLineNum, violationMessage); 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 e5f2adabeb0a..b02b3846b7da 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckTest.java @@ -473,7 +473,7 @@ public void testGetAcceptableTokens() { @Test public void testAllowEscapesForControlCharacterSetForAllCharacters() throws Exception { - final var indexOfStartLineInInputFile = 16; + final int indexOfStartLineInInputFile = 16; final String message = getCheckMessage(MSG_KEY); final String[] expected = IntStream.rangeClosed(0, 0xFFFF) .parallel() @@ -498,7 +498,7 @@ public void testAllowEscapesForControlCharacterSetForAllCharacters() throws Exce @Test public void testCountMatches() throws Exception { final AvoidEscapedUnicodeCharactersCheck check = new AvoidEscapedUnicodeCharactersCheck(); - final var actual = TestUtil.invokeMethod(check, "countMatches", Integer.class, + final int actual = TestUtil.invokeMethod(check, "countMatches", Integer.class, Pattern.compile("\\\\u[a-fA-F\\d]{4}"), "\\u1234"); assertWithMessage("Unexpected matches count") .that(actual) @@ -523,7 +523,7 @@ public void testNonPrintableCharsAreSorted() { } // Replacing duplications like "\\uF{3}9" with "\\uFFF9" - for (var i = 4; i > 1; i--) { + for (int i = 4; i > 1; i--) { final String regex = "([A-F])\\{" + i + "}"; String replacement = "$1$1{" + (i - 1) + "}"; if (i == 2) { @@ -536,7 +536,7 @@ public void testNonPrintableCharsAreSorted() { final List expressionParts = Splitter.on("|").splitToList(expression); final Pattern unicodeCharPattern = Pattern.compile("^\\\\\\\\u[\\dA-F]{4}$"); String lastChar = null; - for (var i = 0; i < expressionParts.size(); i++) { + for (int i = 0; i < expressionParts.size(); i++) { final String currentChar = expressionParts.get(i); final Matcher matcher = unicodeCharPattern.matcher(currentChar); if (!matcher.matches()) { 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 c75237de6f07..d2544be8434c 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 @@ -541,7 +541,7 @@ private static final class CheckIfStatefulFieldCleared implements Predicate result = new ArrayList<>(); try (BufferedReader br = Files.newBufferedReader(Path.of(aFileName))) { - var lineNumber = 1; + int lineNumber = 1; String line = br.readLine(); IndentComment pendingBelowComment = null; while (line != null) { final Matcher match = LINE_WITH_COMMENT_REGEX.matcher(line); if (pendingBelowComment != null) { - final var actualIndent = getLineStart(line, tabWidth); + final int actualIndent = getLineStart(line, tabWidth); processPendingBelowComment(pendingBelowComment, actualIndent, lineNumber, result); @@ -77,14 +77,14 @@ private static IndentComment[] getLinesWithWarnAndCheckComments(String aFileName pendingBelowComment = null; } else if (match.matches()) { - final var isBelow = line.contains("//below indent:"); + final boolean isBelow = line.contains("//below indent:"); final IndentComment warn = new IndentComment(match, lineNumber); if (isBelow) { pendingBelowComment = warn; } else { - final var actualIndent = getLineStart(line, tabWidth); + final int actualIndent = getLineStart(line, tabWidth); processInlineComment(warn, actualIndent, lineNumber, aFileName, result); } } @@ -154,17 +154,17 @@ private static void processInlineComment(IndentComment warn, int actualIndent, private static boolean isCommentConsistent(IndentComment comment) { final String[] levels = comment.getExpectedWarning().split(", "); - final var indent = comment.getIndent() + comment.getIndentOffset(); + final int indent = comment.getIndent() + comment.getIndentOffset(); final boolean result; if (levels.length > 1) { // multi - final var containsActualLevel = + final boolean containsActualLevel = Arrays.asList(levels).contains(String.valueOf(indent)); result = containsActualLevel != comment.isWarning(); } else { - final var expectedWarning = Integer.parseInt(comment.getExpectedWarning()); + final int expectedWarning = Integer.parseInt(comment.getExpectedWarning()); final boolean test; if (comment.isExpectedNonStrict()) { @@ -182,8 +182,8 @@ private static boolean isCommentConsistent(IndentComment comment) { } private static int getLineStart(String line, final int tabWidth) { - var lineStart = 0; - for (var index = 0; index < line.length(); ++index) { + int lineStart = 0; + for (int index = 0; index < line.length(); ++index) { if (!Character.isWhitespace(line.charAt(index))) { lineStart = CommonUtil.lengthExpandedTabs(line, index, tabWidth); break; @@ -195,7 +195,7 @@ private static int getLineStart(String line, final int tabWidth) { private void verifyWarns(Configuration config, String filePath, String... expected) throws Exception { - final var tabWidth = Integer.parseInt(config.getProperty("tabWidth")); + final int tabWidth = Integer.parseInt(config.getProperty("tabWidth")); final IndentComment[] linesWithWarn = getLinesWithWarnAndCheckComments(filePath, tabWidth); verify(config, filePath, expected, linesWithWarn); @@ -3348,8 +3348,8 @@ public void testArgumentOrderOfErrorMessages() { getCheckMessage(MSG_ERROR_MULTI, arguments), getCheckMessage(MSG_CHILD_ERROR_MULTI, arguments), }; - final var isInOrder = Arrays.stream(messages).allMatch(msg -> { - final var indexOfArgumentZero = msg.indexOf((String) arguments[0]); + final boolean isInOrder = Arrays.stream(messages).allMatch(msg -> { + final int indexOfArgumentZero = msg.indexOf((String) arguments[0]); return Arrays.stream(arguments) .map(String.class::cast) .mapToInt(msg::indexOf) @@ -4185,7 +4185,7 @@ public void fileFinished(AuditEvent event) { @Override public void addError(AuditEvent event) { - final var line = event.getLine(); + final int line = event.getLine(); final String message = event.getMessage(); assertWithMessage( @@ -4272,7 +4272,7 @@ private String[] getExpectedMessages() { private String getExpectedMessagePostfix(final String messageKey) { final String msg = getCheckMessage(IndentationCheck.class, messageKey, FAKE_ARGUMENT_ZERO, indent + indentOffset, expectedWarning); - final var indexOfMsgPostfix = msg.indexOf(FAKE_ARGUMENT_ZERO) + final int indexOfMsgPostfix = msg.indexOf(FAKE_ARGUMENT_ZERO) + FAKE_ARGUMENT_ZERO.length(); return msg.substring(indexOfMsgPostfix); } 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 b59a89ea4d2a..94df732d0ce1 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 @@ -47,7 +47,7 @@ public void testGetColumnNumber() { final JavadocNodeImpl javadocNode = new JavadocNodeImpl(); javadocNode.setColumnNumber(1); - final var result = javadocNode.getColumnNumber(); + final int result = javadocNode.getColumnNumber(); assertWithMessage("Invalid column number") .that(result) 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 d384651ce65b..c9187c9b8c4a 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 @@ -208,7 +208,7 @@ public void testResetSeverityLevel() throws Exception { final Matcher matcher = severityPattern.matcher(output); // First log is just the normal tag one - final var firstMatchFound = matcher.find(); + final boolean firstMatchFound = matcher.find(); assertWithMessage("Severity level should be wrapped in a square bracket []") .that(firstMatchFound) .isTrue(); @@ -222,7 +222,7 @@ public void testResetSeverityLevel() throws Exception { // Now we check for the second log which should log error if // the previous log did not have an issue while resetting the original severity level - final var secondMatchFound = matcher.find(); + final boolean secondMatchFound = matcher.find(); assertWithMessage("Severity level should be wrapped in a square bracket []") .that(secondMatchFound) .isTrue(); @@ -312,14 +312,14 @@ protected void verify(Checker checker, getStream().flush(); final List theFiles = new ArrayList<>(); Collections.addAll(theFiles, processedFiles); - final var errs = checker.process(theFiles); + final int errs = checker.process(theFiles); // process each of the lines try (ByteArrayInputStream localStream = new ByteArrayInputStream(getStream().toByteArray()); LineNumberReader lnr = new LineNumberReader( new InputStreamReader(localStream, StandardCharsets.UTF_8))) { - for (var i = 0; i < expected.length; i++) { + for (int i = 0; i < expected.length; i++) { final String expectedResult = messageFileName + ":" + expected[i]; final String actual = lnr.readLine(); assertWithMessage("error message %s", i) 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 49b5ef97cc55..d17dc4df1e32 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 @@ -99,7 +99,7 @@ public void testSmall() throws Exception { @Test public void testBooleanExpressionComplexityRecordsAndCompactCtors() throws Exception { - final var max = 3; + final int max = 3; final String[] expected = { "16:12: " + getCheckMessage(MSG_KEY, 4, max), @@ -136,7 +136,7 @@ public void testRecordLeaves() throws Exception { @Test public void testWhenExpression() throws Exception { - final var max = 0; + final int max = 0; final String[] expected = { "17:21: " + getCheckMessage(MSG_KEY, 6, max), 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 523097068b4d..8519aa7337cb 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 @@ -188,7 +188,7 @@ public void testEmptyRegularExpression() throws Exception { @Test public void testClassDataAbstractionCouplingRecords() throws Exception { - final var maxAbstraction = 1; + final int maxAbstraction = 1; final String[] expected = { "31:1: " + getCheckMessage(MSG_KEY, 2, maxAbstraction, "[Date, Time]"), "36:1: " + getCheckMessage(MSG_KEY, 2, maxAbstraction, "[Date, Time]"), 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 8957174b346f..67feb58e2dc7 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 @@ -90,7 +90,7 @@ public void test() throws Exception { @Test public void testCyclomaticComplexityRecords() throws Exception { - final var max = 0; + final int max = 0; final String[] expected = { "17:9: " + getCheckMessage(MSG_KEY, 11, max), 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 dcaee5a55274..4f81dc102f74 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 @@ -108,7 +108,7 @@ public void testCalculation3() throws Exception { @Test public void testIntegerOverflow() throws Exception { - final var largerThanMaxInt = 3_486_784_401L; + final long largerThanMaxInt = 3_486_784_401L; final String[] expected = { "20:5: " + getCheckMessage(MSG_KEY, largerThanMaxInt, 0), @@ -193,7 +193,7 @@ public void testDefaultConfiguration() throws Exception { @Test public void testNpathComplexityRecords() throws Exception { - final var max = 1; + final int max = 1; final String[] expected = { "15:5: " + getCheckMessage(MSG_KEY, 3, max), @@ -209,7 +209,7 @@ public void testNpathComplexityRecords() throws Exception { @Test public void testNpathComplexitySwitchExpression() throws Exception { - final var max = 1; + final int max = 1; final String[] expected = { "12:5: " + getCheckMessage(MSG_KEY, 5, max), 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 9fe8b2140eea..0fe1b52f9c5e 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 @@ -35,7 +35,7 @@ public String getPackageLocation() { @Test public void testDefault() throws Exception { - final var expectedCapitalCount = 4; + final int expectedCapitalCount = 4; final String[] expected = { "24:16: " + getWarningMessage("FactoryWithBADNAme", expectedCapitalCount), @@ -54,7 +54,7 @@ public void testDefault() throws Exception { @Test public void testTypeNamesForThreePermittedCapitalLetters() throws Exception { - final var expectedCapitalCount = 4; + final int expectedCapitalCount = 4; final String[] expected = { "22:16: " + getWarningMessage("FactoryWithBADNAme2", expectedCapitalCount), @@ -69,7 +69,7 @@ public void testTypeNamesForThreePermittedCapitalLetters() throws Exception { @Test public void testTypeNamesForFourPermittedCapitalLetters() throws Exception { - final var expectedCapitalCount = 5; + final int expectedCapitalCount = 5; final String[] expected = { "45:11: " + getWarningMessage("AbstractINNERRClass", expectedCapitalCount), @@ -81,7 +81,7 @@ public void testTypeNamesForFourPermittedCapitalLetters() throws Exception { @Test public void testTypeNamesForFivePermittedCapitalLetters() throws Exception { - final var expectedCapitalCount = 6; + final int expectedCapitalCount = 6; final String[] expected = { "45:11: " + getWarningMessage("AbstractINNERRClass", expectedCapitalCount), "50:11: " + getWarningMessage("WellNamedFACTORY", expectedCapitalCount), @@ -93,7 +93,7 @@ public void testTypeNamesForFivePermittedCapitalLetters() throws Exception { @Test public void testTypeAndVariablesAndMethodNames() throws Exception { - final var expectedCapitalCount = 6; + final int expectedCapitalCount = 6; final String[] expected = { "46:11: " + getWarningMessage("AbstractINNERRClass", expectedCapitalCount), @@ -109,7 +109,7 @@ public void testTypeAndVariablesAndMethodNames() throws Exception { @Test public void testTypeAndVariablesAndMethodNamesWithNoIgnores() throws Exception { - final var expectedCapitalCount = 6; + final int expectedCapitalCount = 6; final String[] expected = { "48:15: " + getWarningMessage("AbstractINNERRClass", expectedCapitalCount), @@ -127,7 +127,7 @@ public void testTypeAndVariablesAndMethodNamesWithNoIgnores() throws Exception { @Test public void testTypeAndVariablesAndMethodNamesWithNoIgnoresPart2() throws Exception { - final var expectedCapitalCount = 6; + final int expectedCapitalCount = 6; final String[] expected = { "43:17: " + getWarningMessage("InnerClassOneVIOLATION", expectedCapitalCount), @@ -140,7 +140,7 @@ public void testTypeAndVariablesAndMethodNamesWithNoIgnoresPart2() throws Except @Test public void testTypeAndVariablesAndMethodNamesWithIgnores() throws Exception { - final var expectedCapitalCount = 6; + final int expectedCapitalCount = 6; final String[] expected = { "48:15: " + getWarningMessage("AbstractINNERRClass", expectedCapitalCount), @@ -154,7 +154,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnores() throws Exception { @Test public void testTypeAndVariablesAndMethodNamesWithIgnoresPart2() throws Exception { - final var expectedCapitalCount = 6; + final int expectedCapitalCount = 6; final String[] expected = { "44:17: " + getWarningMessage("InnerClassOneVIOLATION", expectedCapitalCount), @@ -167,7 +167,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnoresPart2() throws Exceptio @Test public void testTypeAndVariablesAndMethodNamesWithIgnoresFinal() throws Exception { - final var expectedCapitalCount = 5; + final int expectedCapitalCount = 5; final String[] expected = { "28:20: " + getWarningMessage("AbstractCLASSName", expectedCapitalCount), @@ -187,7 +187,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnoresFinal() throws Exceptio @Test public void testTypeAndVariablesAndMethodNamesWithIgnoresStatic() throws Exception { - final var expectedCapitalCount = 5; + final int expectedCapitalCount = 5; final String[] expected = { "28:20: " + getWarningMessage("AbstractCLASSName", expectedCapitalCount), @@ -207,7 +207,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnoresStatic() throws Excepti @Test public void testTypeAndVariablesAndMethodNamesWithIgnoresStaticFinal() throws Exception { - final var expectedCapitalCount = 5; + final int expectedCapitalCount = 5; final String[] expected = { "28:20: " + getWarningMessage("AbstractCLASSName", expectedCapitalCount), @@ -229,7 +229,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnoresStaticFinal() throws Ex @Test public void testTypeAndVariablesAndMethodNamesWithIgnoresNonStaticFinal() throws Exception { - final var expectedCapitalCount = 5; + final int expectedCapitalCount = 5; final String[] expected = { "28:20: " + getWarningMessage("AbstractCLASSName", expectedCapitalCount), @@ -258,7 +258,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnoresNonStaticFinal() throws @Test public void testTypeAndVariablesAndMethodNamesWithIgnoresNonStaticFinalPart2() throws Exception { - final var expectedCapitalCount = 5; + final int expectedCapitalCount = 5; final String[] expected = { "28:16: " + getWarningMessage("VALUEEEE", expectedCapitalCount), @@ -277,7 +277,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnoresNonStaticFinalPart2() @Test public void testTypeAndVariablesAndMethodNamesWithIgnoresFinalKeepStaticFinal() throws Exception { - final var expectedCapitalCount = 5; + final int expectedCapitalCount = 5; final String[] expected = { "28:20: " + getWarningMessage("AbstractCLASSName", expectedCapitalCount), @@ -308,7 +308,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnoresFinalKeepStaticFinal() @Test public void testTypeAndVariablesAndMethodNamesWithIgnoresStaticKeepStaticFinal() throws Exception { - final var expectedCapitalCount = 5; + final int expectedCapitalCount = 5; final String[] expected = { "28:20: " + getWarningMessage("AbstractCLASSName", expectedCapitalCount), @@ -339,7 +339,7 @@ public void testTypeAndVariablesAndMethodNamesWithIgnoresStaticKeepStaticFinal() @Test public void testTypeNamesForThreePermittedCapitalLettersWithOverriddenMethod() throws Exception { - final var expectedCapitalCount = 4; + final int expectedCapitalCount = 4; final String[] expected = { "35:20: " + getWarningMessage("oveRRRRRrriddenMethod", expectedCapitalCount), @@ -352,7 +352,7 @@ public void testTypeNamesForThreePermittedCapitalLettersWithOverriddenMethod() @Test public void testOverriddenMethod() throws Exception { - final var expectedCapitalCount = 4; + final int expectedCapitalCount = 4; final String[] expected = { "21:16: " + getWarningMessage("serialNUMBER", expectedCapitalCount), @@ -367,7 +367,7 @@ public void testOverriddenMethod() @Test public void testTypeNamesForZeroPermittedCapitalLetter() throws Exception { - final var expectedCapitalCount = 1; + final int expectedCapitalCount = 1; final String[] expected = { "20:16: " + getWarningMessage("NonAAAAbstractClassName6", expectedCapitalCount), "23:16: " + getWarningMessage("FactoryWithBADNAme66", expectedCapitalCount), @@ -400,7 +400,7 @@ public void testTypeNamesForZeroPermittedCapitalLetter() throws Exception { @Test public void testTypeNamesForZeroPermittedCapitalLetterPart2() throws Exception { - final var expectedCapitalCount = 1; + final int expectedCapitalCount = 1; final String[] expected = { "20:9: " + getWarningMessage("userID", expectedCapitalCount), @@ -429,7 +429,7 @@ public void testNullPointerException() throws Exception { public void testAbbreviationAsWordInNameCheckEnhancedInstanceof() throws Exception { - final var expectedCapitalCount = 4; + final int expectedCapitalCount = 4; final String[] expected = { "25:36: " + getWarningMessage("STRING", expectedCapitalCount), @@ -448,7 +448,7 @@ public void testAbbreviationAsWordInNameCheckEnhancedInstanceof() public void testAbbreviationAsWordInNameCheckEnhancedInstanceofAllowXmlLength1() throws Exception { - final var expectedCapitalCount = 2; + final int expectedCapitalCount = 2; final String[] expected = { "25:36: " + getWarningMessage("STRING", expectedCapitalCount), @@ -469,7 +469,7 @@ public void testAbbreviationAsWordInNameCheckEnhancedInstanceofAllowXmlLength1() public void testAbbreviationAsWordInNameCheckRecords() throws Exception { - final var expectedCapitalCount = 4; + final int expectedCapitalCount = 4; final String[] expected = { "22:11: " + getWarningMessage("myCLASS", expectedCapitalCount), @@ -499,7 +499,7 @@ public void testAbbreviationAsWordInNameCheckRecords() public void testAbbreviationAsWordInNameCheckRecordPatterns() throws Exception { - final var expectedCapitalCount = 4; + final int expectedCapitalCount = 4; final String[] expected = { "23:39: " + getWarningMessage("POINT", expectedCapitalCount), 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 5aba3ecf27f9..8233b6635faf 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 @@ -229,7 +229,7 @@ public void testMinimumWithCustomMessage() throws Exception { private static CharSequence makeLargeXyString() { // now needs 10'000 or 100'000, as just 1000 is no longer enough today to provoke the // StackOverflowError - final var size = 100_000; + final int size = 100_000; return "xy".repeat(size / 2); } 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 81f87c58c0a8..bee26476f8f3 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 @@ -172,7 +172,7 @@ public void testDefaultConfiguration() throws Exception { @Test public void testExecutableStatementCountRecords() throws Exception { - final var max = 1; + final int max = 1; final String[] expected = { "15:9: " + getCheckMessage(MSG_KEY, 3, max), @@ -191,7 +191,7 @@ public void testExecutableStatementCountRecords() throws Exception { @Test public void testExecutableStatementCountLambdas() throws Exception { - final var max = 1; + final int max = 1; final String[] expected = { "16:22: " + getCheckMessage(MSG_KEY, 6, max), 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 cad0bdf10311..f628dc8db044 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 @@ -187,7 +187,7 @@ public void testInterfaceMemberScopeIsPublic() throws Exception { @Test public void testMethodCountRecords() throws Exception { - final var max = 2; + final int max = 2; final String[] expected = { "18:5: " + getCheckMessage(MSG_MANY_METHODS, 3, max), 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 c1e060b45d92..156766ba63f3 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 @@ -108,7 +108,7 @@ public void testWithComments() throws Exception { @Test public void testCountEmpty() throws Exception { - final var max = 2; + final int max = 2; final String[] expected = { "24:5: " + getCheckMessage(MSG_KEY, 3, max, "AA"), "41:5: " + getCheckMessage(MSG_KEY, 3, max, "threeLines"), @@ -136,7 +136,7 @@ public void testAbstractTwo() throws Exception { @Test public void testTextBlocks() throws Exception { - final var max = 2; + final int max = 2; final String[] expected = { "14:5: " + getCheckMessage(MSG_KEY, 21, max, "longEmptyTextBlock"), @@ -153,7 +153,7 @@ public void testTextBlocks() throws Exception { @Test public void testRecordsAndCompactCtors() throws Exception { - final var max = 2; + final int max = 2; final String[] expected = { "26:9: " + getCheckMessage(MSG_KEY, 6, max, "MyTestRecord2"), @@ -170,7 +170,7 @@ public void testRecordsAndCompactCtors() throws Exception { @Test public void testRecordsAndCompactCtorsCountEmpty() throws Exception { - final var max = 2; + final int max = 2; final String[] expected = { "25:9: " + getCheckMessage(MSG_KEY, 3, max, "MyTestRecord2"), 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 8375efcc157d..ae3d4cf2687e 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 @@ -100,7 +100,7 @@ public void testWithInnerClass() throws Exception { @Test public void testWithRecords() throws Exception { - final var max = 1; + final int max = 1; final String[] expected = { "9:1: " + getCheckMessage(MSG_KEY, 2, max), 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 eb0e8bfaec79..5b4254a81cc5 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 @@ -67,7 +67,7 @@ public void testGetAcceptableTokens() { @Test public void testDefaultOne() throws Exception { - final var max = 8; + final int max = 8; final String[] expected = { "57:5: " + getCheckMessage(MSG_KEY, 14, max), @@ -84,7 +84,7 @@ public void testDefaultOne() throws Exception { @Test public void testDefaultTwo() throws Exception { - final var max = 8; + final int max = 8; final String[] expected = { "38:3: " + getCheckMessage(MSG_KEY, 15, max), @@ -98,7 +98,7 @@ public void testDefaultTwo() throws Exception { @Test public void testRecordComponentNumberTopLevel1() throws Exception { - final var max = 8; + final int max = 8; final String[] expected = { "12:1: " + getCheckMessage(MSG_KEY, 15, max), @@ -122,7 +122,7 @@ public void testRecordComponentNumberTopLevel2() throws Exception { @Test public void testRecordComponentNumberMax1() throws Exception { - final var max = 1; + final int max = 1; final String[] expected = { "28:5: " + getCheckMessage(MSG_KEY, 2, max), @@ -156,7 +156,7 @@ public void testRecordComponentNumberMax20() throws Exception { @Test public void testRecordComponentNumberPrivateModifierOne() throws Exception { - final var max = 8; + final int max = 8; final String[] expected = { "70:9: " + getCheckMessage(MSG_KEY, 14, max), @@ -170,7 +170,7 @@ public void testRecordComponentNumberPrivateModifierOne() throws Exception { @Test public void testRecordComponentNumberPrivateModifierTwo() throws Exception { - final var max = 8; + final int max = 8; final String[] expected = { "70:9: " + getCheckMessage(MSG_KEY, 14, max), 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 c260d980fd9a..92095633beb6 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyTextFilterTest.java @@ -59,7 +59,7 @@ public String getPackageLocation() { @Test public void testDefaultConfig() throws Exception { - final var expectedLineLength = 90; + final int expectedLineLength = 90; final String pattern = "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"; final String[] violationMessages = { @@ -87,7 +87,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testNearbyTextPattern() throws Exception { - final var expectedLineLength = 90; + final int expectedLineLength = 90; final String[] violationMessages = { "15: " + getRegexpSinglelineCheckMessage(), @@ -118,7 +118,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testCheckPattern() throws Exception { - final var expectedLineLength = 80; + final int expectedLineLength = 80; final String[] violationMessages = { "15: " + getRegexpSinglelineCheckMessage(), @@ -140,7 +140,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testMessagePattern() throws Exception { - final var expectedLineLength = 90; + final int expectedLineLength = 90; final String[] violationMessages = { "15: " + getRegexpSinglelineCheckMessage(), @@ -162,7 +162,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testIdPattern() throws Exception { - final var expectedLineLength = 80; + final int expectedLineLength = 80; final String[] violationMessages = { "16: " + getRegexpSinglelineCheckMessage(), @@ -184,7 +184,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testLineRangePositive3() throws Exception { - final var expectedLineLength = 92; + final int expectedLineLength = 92; final String[] violationMessages = { "15: " + getRegexpSinglelineCheckMessage(), @@ -216,7 +216,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testLineRangeNegative2() throws Exception { - final var expectedLineLength = 91; + final int expectedLineLength = 91; final String[] violationMessages = { "15: " + getRegexpSinglelineCheckMessage(), @@ -247,7 +247,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testVariableCheckPatternAndLineRange() throws Exception { - final var expectedLineLength = 85; + final int expectedLineLength = 85; final String[] violationMessages = { "19: " + getLineLengthCheckMessage(expectedLineLength, 89), @@ -276,7 +276,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testNearbyTextPatternAny() throws Exception { - final var expectedLineLength = 76; + final int expectedLineLength = 76; final String[] violationMessages = { "18: " + getLineLengthCheckMessage(expectedLineLength, 80), @@ -312,7 +312,7 @@ violationMessages, removeSuppressed(violationMessages, suppressedMessages) @Test public void testNearbyTextPatternUrlLineLengthSuppression() throws Exception { - final var expectedLineLength = 90; + final int expectedLineLength = 90; final String[] violationMessages = { "32: " + getLineLengthCheckMessage(expectedLineLength, 98), @@ -443,7 +443,7 @@ public void testCachingExecution() throws Exception { Object.class, null) ); suppressFilter.accept(auditEvent1); - final var deleted = tempFile.delete(); + final boolean deleted = tempFile.delete(); assertWithMessage("Temporary file should be deleted.") .that(deleted).isTrue(); final AuditEvent auditEvent2 = new AuditEvent( 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 eb5ead6e1b14..3f569a142fb9 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilterTest.java @@ -389,7 +389,7 @@ public void testCachingExecution() throws Exception { Object.class, null) ); filter.accept(auditEvent1); - final var deleted = tempFile.delete(); + final boolean deleted = tempFile.delete(); assertWithMessage("Temporary file should be deleted.") .that(deleted).isTrue(); final AuditEvent auditEvent2 = new AuditEvent( 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 3119112a85b4..eb1582ea9e4c 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilterTest.java @@ -348,7 +348,7 @@ public void testCompareToOfTagClass() { assertWithMessage("Invalid comparing result") .that(tag3.compareTo(tag1) > 0) .isTrue(); - final var actual = tag1.compareTo(tag4); + final int actual = tag1.compareTo(tag4); assertWithMessage("Invalid comparing result") .that(actual) .isEqualTo(0); @@ -608,7 +608,7 @@ public void testFindNearestMatchDontAllowSameColumn() { contents.reportSingleLineComment(1, 0); final TreeWalkerAuditEvent dummyEvent = new TreeWalkerAuditEvent(contents, "filename", new Violation(1, null, null, null, null, Object.class, null), null); - final var result = suppressionCommentFilter.accept(dummyEvent); + final boolean result = suppressionCommentFilter.accept(dummyEvent); assertWithMessage("Filter should not accept event") .that(result) .isFalse(); @@ -646,8 +646,8 @@ private static List> getTagsAfterExecution(SuppressionComment String filename, String... lines) { final FileContents contents = new FileContents( new FileText(new File(filename), Arrays.asList(lines))); - for (var lineNo = 0; lineNo < lines.length; lineNo++) { - final var colNo = lines[lineNo].indexOf("//"); + for (int lineNo = 0; lineNo < lines.length; lineNo++) { + final int colNo = lines[lineNo].indexOf("//"); if (colNo >= 0) { contents.reportSingleLineComment(lineNo + 1, colNo); } @@ -666,8 +666,8 @@ public void testCachingByFileContentsInstance() throws Exception { final String[] lines = {"//CSOFF", "//CSON"}; final FileContents fileContents = new FileContents( new FileText(file, Arrays.asList(lines))); - for (var lineNo = 0; lineNo < lines.length; lineNo++) { - final var colNo = lines[lineNo].indexOf("//"); + for (int lineNo = 0; lineNo < lines.length; lineNo++) { + final int colNo = lines[lineNo].indexOf("//"); if (colNo >= 0) { fileContents.reportSingleLineComment(lineNo + 1, colNo); } 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 af82adb5ec61..01d098cb1bad 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java @@ -55,7 +55,7 @@ public String getPackageLocation() { @Test public void testAccept() throws Exception { final String fileName = getPath("InputSuppressionFilterNone.xml"); - final var optional = false; + final boolean optional = false; final SuppressionFilter filter = createSuppressionFilter(fileName, optional); final AuditEvent ev = new AuditEvent(this, "ATest.java", null); @@ -68,7 +68,7 @@ public void testAccept() throws Exception { @Test public void testAcceptFalse() throws Exception { final String fileName = getPath("InputSuppressionFilterSuppress.xml"); - final var optional = false; + final boolean optional = false; final SuppressionFilter filter = createSuppressionFilter(fileName, optional); final Violation message = new Violation(1, 1, null, "msg", null, @@ -83,7 +83,7 @@ public void testAcceptFalse() throws Exception { @Test public void testAcceptOnNullFile() throws CheckstyleException { final String fileName = null; - final var optional = false; + final boolean optional = false; final SuppressionFilter filter = createSuppressionFilter(fileName, optional); final AuditEvent ev = new AuditEvent(this, "AnyJava.java", null); @@ -96,7 +96,7 @@ public void testAcceptOnNullFile() throws CheckstyleException { public void testNonExistentSuppressionFileWithFalseOptional() { final String fileName = "non_existent_suppression_file.xml"; try { - final var optional = false; + final boolean optional = false; createSuppressionFilter(fileName, optional); assertWithMessage("Exception is expected").fail(); } @@ -111,7 +111,7 @@ public void testNonExistentSuppressionFileWithFalseOptional() { public void testExistingInvalidSuppressionFileWithTrueOptional() throws IOException { final String fileName = getPath("InputSuppressionFilterInvalidFile.xml"); try { - final var optional = true; + final boolean optional = true; createSuppressionFilter(fileName, optional); assertWithMessage("Exception is expected").fail(); } @@ -126,7 +126,7 @@ public void testExistingInvalidSuppressionFileWithTrueOptional() throws IOExcept @Test public void testExistingSuppressionFileWithTrueOptional() throws Exception { final String fileName = getPath("InputSuppressionFilterNone.xml"); - final var optional = true; + final boolean optional = true; final SuppressionFilter filter = createSuppressionFilter(fileName, optional); final AuditEvent ev = new AuditEvent(this, "AnyFile.java", null); @@ -139,7 +139,7 @@ public void testExistingSuppressionFileWithTrueOptional() throws Exception { @Test public void testNonExistentSuppressionFileWithTrueOptional() throws Exception { final String fileName = "non_existent_suppression_file.xml"; - final var optional = true; + final boolean optional = true; final SuppressionFilter filter = createSuppressionFilter(fileName, optional); final AuditEvent ev = new AuditEvent(this, "AnyFile.java", null); @@ -153,7 +153,7 @@ public void testNonExistentSuppressionFileWithTrueOptional() throws Exception { public void testNonExistentSuppressionUrlWithTrueOptional() throws Exception { final String fileName = "https://checkstyle.org/non_existent_suppression.xml"; - final var optional = true; + final boolean optional = true; final SuppressionFilter filter = createSuppressionFilter(fileName, optional); final AuditEvent ev = new AuditEvent(this, "AnyFile.java", null); @@ -224,11 +224,11 @@ public void testUseCacheRemoteFileExternalResourceContentDoesNotChange() throws } private static boolean isConnectionAvailableAndStable(String url) throws Exception { - var available = false; + boolean available = false; if (isUrlReachable(url)) { - final var attemptLimit = 5; - var attemptCount = 0; + final int attemptLimit = 5; + int attemptCount = 0; while (attemptCount <= attemptLimit) { try (InputStream stream = new URL(url).openStream()) { @@ -254,7 +254,7 @@ private static boolean isConnectionAvailableAndStable(String url) throws Excepti } private static boolean isUrlReachable(String url) { - var result = true; + boolean result = true; try { final URL verifiableUrl = new URL(url); final HttpURLConnection urlConnect = (HttpURLConnection) verifiableUrl.openConnection(); @@ -277,7 +277,7 @@ private static SuppressionFilter createSuppressionFilter(String fileName, boolea @Test public void testXpathSuppression() throws Exception { - for (var test = 1; test <= 6; test++) { + for (int test = 1; test <= 6; test++) { final String pattern = "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"; final String[] expected = { "19:29: " + getCheckMessage(ConstantNameCheck.class, MSG_INVALID_PATTERN, 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 89618fe10643..6b1c51abab69 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilterTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionXpathFilterTest.java @@ -82,7 +82,7 @@ public void testAcceptOnNullFile() throws Exception { public void testNonExistentSuppressionFileWithFalseOptional() throws Exception { final String fileName = getPath("non_existent_suppression_file.xml"); try { - final var optional = false; + final boolean optional = false; createSuppressionXpathFilter(fileName, optional); assertWithMessage("Exception is expected").fail(); } @@ -97,7 +97,7 @@ public void testNonExistentSuppressionFileWithFalseOptional() throws Exception { public void testExistingInvalidSuppressionFileWithTrueOptional() throws Exception { final String fileName = getPath("InputSuppressionXpathFilterInvalidFile.xml"); try { - final var optional = true; + final boolean optional = true; createSuppressionXpathFilter(fileName, optional); assertWithMessage("Exception is expected").fail(); } @@ -149,7 +149,7 @@ public void testEqualsAndHashCode() { @Test public void testExternalResource() throws Exception { - final var optional = false; + final boolean optional = false; final String fileName = getPath("InputSuppressionXpathFilterIdAndQuery.xml"); final SuppressionXpathFilter filter = createSuppressionXpathFilter(fileName, optional); final Set expected = Collections.singleton(fileName); @@ -221,7 +221,7 @@ public void testFalseEncodeChar() throws Exception { @Test public void testXpathSuppression() throws Exception { - for (var test = 1; test <= 4; test++) { + for (int test = 1; test <= 4; test++) { final String[] expected = { "20:29: " + getCheckMessage(ConstantNameCheck.class, MSG_INVALID_PATTERN, 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 d4f1b8b3b348..ea4b3da219bc 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java @@ -193,8 +193,8 @@ private static FilterSet loadFilterSet(String url) throws Exception { FilterSet filterSet = null; if (isUrlReachable(url)) { - var attemptCount = 0; - final var attemptLimit = 5; + int attemptCount = 0; + final int attemptLimit = 5; while (attemptCount <= attemptLimit) { try { @@ -218,7 +218,7 @@ private static FilterSet loadFilterSet(String url) throws Exception { } private static boolean isUrlReachable(String url) { - var result = true; + boolean result = true; try { final URL verifiableUrl = new URL(url); final HttpURLConnection urlConnect = (HttpURLConnection) verifiableUrl.openConnection(); 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 a13acbd65adf..b5d2141a7d06 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJavaTokenTypesTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJavaTokenTypesTest.java @@ -747,7 +747,7 @@ public void testTokenNumbering() { final Set modeNames = Set.of(JavaLanguageLexer.modeNames); final Set channelNames = Set.of(JavaLanguageLexer.channelNames); - final var tokenCount = (int) Arrays.stream(JavaLanguageLexer.class.getDeclaredFields()) + final int tokenCount = (int) Arrays.stream(JavaLanguageLexer.class.getDeclaredFields()) .filter(GeneratedJavaTokenTypesTest::isPublicStaticFinalInt) .filter(field -> !modeNames.contains(field.getName())) .filter(field -> !channelNames.contains(field.getName())) @@ -779,9 +779,9 @@ public void testTokenHasBeenAddedToTokensBlockInLexerGrammar() { // Get the starting index of the sublist of tokens, or -1 if sublist // is not present. - final var lastIndexOfSublist = + final int lastIndexOfSublist = Collections.lastIndexOfSubList(allTokenNames, INTERNAL_TOKENS); - final var expectedNumberOfUsedTokens = allTokenNames.size() - INTERNAL_TOKENS.size(); + final int expectedNumberOfUsedTokens = allTokenNames.size() - INTERNAL_TOKENS.size(); assertWithMessage("New tokens must be added to the 'tokens' block in the lexer grammar.") .that(lastIndexOfSublist) @@ -796,7 +796,7 @@ public void testTokenHasBeenAddedToTokensBlockInLexerGrammar() { */ private static boolean isPublicStaticFinalInt(Field field) { final Class fieldType = field.getType(); - final var mods = field.getModifiers(); + final int mods = field.getModifiers(); return fieldType.equals(Integer.TYPE) && Modifier.isPublic(mods) && Modifier.isStatic(mods) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/GeneratedJavadocCommentsTokenTypesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/GeneratedJavadocCommentsTokenTypesTest.java index 9fe30b33fb97..6ddf0e41aca6 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/GeneratedJavadocCommentsTokenTypesTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/grammar/javadoc/GeneratedJavadocCommentsTokenTypesTest.java @@ -346,7 +346,7 @@ public void testTokenNumbers() { final Set modeNames = Set.of(JavadocCommentsLexer.modeNames); final Set channelNames = Set.of(JavadocCommentsLexer.channelNames); - final var tokenCount = (int) Arrays.stream(JavadocCommentsLexer.class.getDeclaredFields()) + final int tokenCount = (int) Arrays.stream(JavadocCommentsLexer.class.getDeclaredFields()) .filter(GeneratedJavadocCommentsTokenTypesTest::isPublicStaticFinalInt) .filter(field -> !modeNames.contains(field.getName())) .filter(field -> !channelNames.contains(field.getName())) @@ -369,7 +369,7 @@ public void testTokenNumbers() { */ private static boolean isPublicStaticFinalInt(Field field) { final Class fieldType = field.getType(); - final var mods = field.getModifiers(); + final int mods = field.getModifiers(); return fieldType.equals(Integer.TYPE) && Modifier.isPublic(mods) && Modifier.isStatic(mods) 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 547dbd1745f5..04df1cdb8d03 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentationTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/CodeSelectorPresentationTest.java @@ -66,9 +66,9 @@ public String getPackageLocation() { */ private static List convertLinesToPosition(List systemLinesToPosition) { final List convertedLinesToPosition = new ArrayList<>(); - final var lineSeparationCorrection = System.lineSeparator().length() - 1; + final int lineSeparationCorrection = System.lineSeparator().length() - 1; convertedLinesToPosition.add(0, systemLinesToPosition.get(0)); - for (var i = 1; i < systemLinesToPosition.size(); i++) { + for (int i = 1; i < systemLinesToPosition.size(); i++) { convertedLinesToPosition.add(i, systemLinesToPosition.get(i) - lineSeparationCorrection * (i - 1)); } @@ -137,7 +137,7 @@ public void testDetailNodeLeafSelection() { .getChild(tree.getFirstChild().getNextSibling().getFirstChild(), 0); DetailNode javadocLeaf = null; DetailNode node = javadoc.getFirstChild(); - for (var index = 0; node != null; index++, node = node.getNextSibling()) { + for (int index = 0; node != null; index++, node = node.getNextSibling()) { if (index == 2) { javadocLeaf = node; break; 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 d68d2858b764..64b0961b87a0 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModelTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModelTest.java @@ -175,7 +175,7 @@ private void verifyCorrectTestDataInFrameModel() throws IOException { .that(model.isReloadActionEnabled()) .isTrue(); - final var expectedLines = 19; + final int expectedLines = 19; assertWithMessage("Invalid lines to position") .that(model.getLinesToPosition()) .hasSize(expectedLines); 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 22a13917016a..4e2ff49559b4 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/MainTest.java @@ -48,7 +48,7 @@ public String getPackageLocation() { @ValueSource(strings = {";", "InputMain.java"}) public void testMain(String argList) throws Exception { final String[] args = argList.split(";"); - for (var i = 0; i < args.length; i++) { + for (int i = 0; i < args.length; i++) { args[i] = getPath(args[i]); } @@ -57,7 +57,7 @@ public void testMain(String argList) throws Exception { SwingUtilities.invokeAndWait(() -> { // Close the main window - final var mainFrameCount = Arrays.stream(Window.getWindows()) + final long mainFrameCount = Arrays.stream(Window.getWindows()) .filter(wnd -> wnd instanceof MainFrame && wnd.isVisible()) .peek(Window::dispose) .count(); 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 d06bea850cbe..ff1d8b9b3aad 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModelTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTableModelTest.java @@ -57,7 +57,7 @@ public void loadTree() throws Exception { @Test public void testChildCount() { - final var childCount = new ParseTreeTableModel(null).getChildCount(classDef); + final int childCount = new ParseTreeTableModel(null).getChildCount(classDef); assertWithMessage("Invalid child count") .that(childCount) .isEqualTo(5); @@ -69,7 +69,7 @@ public void testChild() { assertWithMessage("Invalid child type") .that(child) .isInstanceOf(DetailAST.class); - final var type = ((DetailAST) child).getType(); + final int type = ((DetailAST) child).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(BLOCK_COMMENT_BEGIN); @@ -81,7 +81,7 @@ public void testCommentChildCount() { .findFirstToken(BLOCK_COMMENT_BEGIN).findFirstToken(COMMENT_CONTENT); final ParseTreeTableModel parseTree = new ParseTreeTableModel(null); parseTree.setParseMode(ParseMode.JAVA_WITH_COMMENTS); - final var javadocCommentChildCount = parseTree.getChildCount(commentContentNode); + final int javadocCommentChildCount = parseTree.getChildCount(commentContentNode); assertWithMessage("Invalid child count") .that(javadocCommentChildCount) .isEqualTo(0); @@ -91,7 +91,7 @@ public void testCommentChildCount() { public void testChildCountInJavaAndJavadocMode() { final ParseTreeTableModel parseTree = new ParseTreeTableModel(null); parseTree.setParseMode(ParseMode.JAVA_WITH_JAVADOC_AND_COMMENTS); - final var childCount = parseTree.getChildCount(classDef); + final int childCount = parseTree.getChildCount(classDef); assertWithMessage("Invalid child count") .that(childCount) .isEqualTo(5); @@ -105,7 +105,7 @@ public void testChildInJavaAndJavadocMode() { assertWithMessage("Invalid child type") .that(child) .isInstanceOf(DetailAST.class); - final var type = ((DetailAST) child).getType(); + final int type = ((DetailAST) child).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(BLOCK_COMMENT_BEGIN); @@ -117,7 +117,7 @@ public void testCommentChildCountInJavaAndJavadocMode() { .findFirstToken(BLOCK_COMMENT_BEGIN).findFirstToken(COMMENT_CONTENT); final ParseTreeTableModel parseTree = new ParseTreeTableModel(null); parseTree.setParseMode(ParseMode.JAVA_WITH_JAVADOC_AND_COMMENTS); - final var commentChildCount = parseTree.getChildCount(commentContentNode); + final int commentChildCount = parseTree.getChildCount(commentContentNode); assertWithMessage("Invalid child count") .that(commentChildCount) .isEqualTo(1); @@ -140,12 +140,12 @@ public void testJavadocCommentChildCount() { final DetailAST commentContentNode = classDef .findFirstToken(BLOCK_COMMENT_BEGIN).findFirstToken(COMMENT_CONTENT); final ParseTreeTableModel parseTree = new ParseTreeTableModel(null); - final var commentChildCount = parseTree.getChildCount(commentContentNode); + final int commentChildCount = parseTree.getChildCount(commentContentNode); assertWithMessage("Invalid child count") .that(commentChildCount) .isEqualTo(0); parseTree.setParseMode(ParseMode.JAVA_WITH_JAVADOC_AND_COMMENTS); - final var javadocCommentChildCount = parseTree.getChildCount(commentContentNode); + final int javadocCommentChildCount = parseTree.getChildCount(commentContentNode); assertWithMessage("Invalid child count") .that(javadocCommentChildCount) .isEqualTo(1); @@ -161,7 +161,7 @@ public void testJavadocCommentChild() { assertWithMessage("Invalid child type") .that(child) .isInstanceOf(DetailNode.class); - final var type = ((DetailNode) child).getType(); + final int type = ((DetailNode) child).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(JavadocCommentsTokenTypes.JAVADOC_CONTENT); @@ -169,7 +169,7 @@ public void testJavadocCommentChild() { assertWithMessage("Invalid child type") .that(childSame) .isInstanceOf(DetailNode.class); - final var sameType = ((DetailNode) childSame).getType(); + final int sameType = ((DetailNode) childSame).getType(); assertWithMessage("Invalid child token type") .that(sameType) .isEqualTo(JavadocCommentsTokenTypes.JAVADOC_CONTENT); @@ -185,11 +185,11 @@ public void testJavadocChildCount() { assertWithMessage("Invalid child type") .that(javadoc) .isInstanceOf(DetailNode.class); - final var type = ((DetailNode) javadoc).getType(); + final int type = ((DetailNode) javadoc).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(JavadocCommentsTokenTypes.JAVADOC_CONTENT); - final var javadocChildCount = parseTree.getChildCount(javadoc); + final int javadocChildCount = parseTree.getChildCount(javadoc); assertWithMessage("Invalid child count") .that(javadocChildCount) .isEqualTo(4); @@ -205,7 +205,7 @@ public void testJavadocChild() { assertWithMessage("Invalid child type") .that(javadoc) .isInstanceOf(DetailNode.class); - final var type = ((DetailNode) javadoc).getType(); + final int type = ((DetailNode) javadoc).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(JavadocCommentsTokenTypes.JAVADOC_CONTENT); @@ -213,7 +213,7 @@ public void testJavadocChild() { assertWithMessage("Invalid child type") .that(javadocChild) .isInstanceOf(DetailNode.class); - final var childType = ((DetailNode) javadocChild).getType(); + final int childType = ((DetailNode) javadocChild).getType(); assertWithMessage("Invalid child token type") .that(childType) .isEqualTo(JavadocCommentsTokenTypes.TEXT); @@ -226,16 +226,16 @@ public void testGetIndexOfChild() { .that(child) .isNotNull(); final ParseTreeTableModel parseTree = new ParseTreeTableModel(null); - var index = 0; + int index = 0; while (child != null) { - final var indexOfChild = parseTree.getIndexOfChild(classDef, child); + final int indexOfChild = parseTree.getIndexOfChild(classDef, child); assertWithMessage("Invalid child index") .that(indexOfChild) .isEqualTo(index); child = child.getNextSibling(); index++; } - final var indexOfChild = parseTree.getIndexOfChild(classDef, new DetailAstImpl()); + final int indexOfChild = parseTree.getIndexOfChild(classDef, new DetailAstImpl()); assertWithMessage("Invalid child index") .that(indexOfChild) .isEqualTo(-1); @@ -251,8 +251,8 @@ public void testGetValueAt() { final ParseTreeTableModel parseTree = new ParseTreeTableModel(null); final Object treeModel = parseTree.getValueAt(classIdentNode, 0); final String type = (String) parseTree.getValueAt(classIdentNode, 1); - final var line = (int) parseTree.getValueAt(classIdentNode, 2); - final var column = (int) parseTree.getValueAt(classIdentNode, 3); + final int line = (int) parseTree.getValueAt(classIdentNode, 2); + final int column = (int) parseTree.getValueAt(classIdentNode, 3); final String text = (String) parseTree.getValueAt(classIdentNode, 4); assertWithMessage("Node should be an Identifier") @@ -289,7 +289,7 @@ public void testGetValueAtDetailNode() { assertWithMessage("Comment classDef cannot be null") .that(commentContentNode) .isNotNull(); - final var nodeType = commentContentNode.getType(); + final int nodeType = commentContentNode.getType(); assertWithMessage("Comment classDef should be a comment type") .that(TokenUtil.isCommentType(nodeType)) .isTrue(); @@ -309,8 +309,8 @@ public void testGetValueAtDetailNode() { final Object treeModel = parseTree.getValueAt(child, 0); final String type = (String) parseTree.getValueAt(child, 1); - final var line = (int) parseTree.getValueAt(child, 2); - final var column = (int) parseTree.getValueAt(child, 3); + final int line = (int) parseTree.getValueAt(child, 2); + final int column = (int) parseTree.getValueAt(child, 3); final String text = (String) parseTree.getValueAt(child, 4); final String expectedText = "JAVADOC_CONTENT"; 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 da2d3fa8068f..e5d951c983a0 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentationTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeTablePresentationTest.java @@ -63,7 +63,7 @@ public void testRoot() throws Exception { @Test public void testChildCount() { - final var childCount = new ParseTreeTablePresentation(null).getChildCount(tree); + final int childCount = new ParseTreeTablePresentation(null).getChildCount(tree); assertWithMessage("Invalid child count") .that(childCount) .isEqualTo(5); @@ -73,7 +73,7 @@ public void testChildCount() { public void testChildCountInJavaAndJavadocMode() { final ParseTreeTablePresentation parseTree = new ParseTreeTablePresentation(null); parseTree.setParseMode(ParseMode.JAVA_WITH_JAVADOC_AND_COMMENTS); - final var childCount = parseTree.getChildCount(tree); + final int childCount = parseTree.getChildCount(tree); assertWithMessage("Invalid child count") .that(childCount) .isEqualTo(5); @@ -85,7 +85,7 @@ public void testChild() { assertWithMessage("Invalid child type") .that(child) .isInstanceOf(DetailAST.class); - final var type = ((DetailAST) child).getType(); + final int type = ((DetailAST) child).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(TokenTypes.BLOCK_COMMENT_BEGIN); @@ -99,7 +99,7 @@ public void testChildInJavaAndJavadocMode() { assertWithMessage("Invalid child type") .that(child) .isInstanceOf(DetailAST.class); - final var type = ((DetailAST) child).getType(); + final int type = ((DetailAST) child).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(TokenTypes.BLOCK_COMMENT_BEGIN); @@ -110,7 +110,7 @@ public void testCommentChildCount() { final DetailAST commentContentNode = tree.getFirstChild().getNextSibling().getFirstChild(); final ParseTreeTablePresentation parseTree = new ParseTreeTablePresentation(null); parseTree.setParseMode(ParseMode.JAVA_WITH_COMMENTS); - final var javadocCommentChildCount = parseTree.getChildCount(commentContentNode); + final int javadocCommentChildCount = parseTree.getChildCount(commentContentNode); assertWithMessage("Invalid child count") .that(javadocCommentChildCount) .isEqualTo(0); @@ -122,7 +122,7 @@ public void testCommentChildCountInJavaAndJavadocMode() { parseTree.setParseMode(ParseMode.JAVA_WITH_JAVADOC_AND_COMMENTS); final DetailAST commentContentNode = tree.getLastChild().getLastChild() .getPreviousSibling().getLastChild().getFirstChild().getFirstChild(); - final var commentChildCount = parseTree.getChildCount(commentContentNode); + final int commentChildCount = parseTree.getChildCount(commentContentNode); assertWithMessage("Invalid child count") .that(commentChildCount) .isEqualTo(0); @@ -144,12 +144,12 @@ public void testCommentChildInJavaAndJavadocMode() { public void testJavadocCommentChildCount() { final DetailAST commentContentNode = tree.getFirstChild().getNextSibling().getFirstChild(); final ParseTreeTablePresentation parseTree = new ParseTreeTablePresentation(null); - final var commentChildCount = parseTree.getChildCount(commentContentNode); + final int commentChildCount = parseTree.getChildCount(commentContentNode); assertWithMessage("Invalid child count") .that(commentChildCount) .isEqualTo(0); parseTree.setParseMode(ParseMode.JAVA_WITH_JAVADOC_AND_COMMENTS); - final var javadocCommentChildCount = parseTree.getChildCount(commentContentNode); + final int javadocCommentChildCount = parseTree.getChildCount(commentContentNode); assertWithMessage("Invalid child count") .that(javadocCommentChildCount) .isEqualTo(1); @@ -164,7 +164,7 @@ public void testJavadocCommentChild() { assertWithMessage("Invalid child type") .that(child) .isInstanceOf(DetailNode.class); - final var type = ((DetailNode) child).getType(); + final int type = ((DetailNode) child).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(JavadocCommentsTokenTypes.JAVADOC_CONTENT); @@ -173,7 +173,7 @@ public void testJavadocCommentChild() { assertWithMessage("Invalid child type") .that(childSame) .isInstanceOf(DetailNode.class); - final var sameType = ((DetailNode) childSame).getType(); + final int sameType = ((DetailNode) childSame).getType(); assertWithMessage("Invalid child token type") .that(sameType) .isEqualTo(JavadocCommentsTokenTypes.JAVADOC_CONTENT); @@ -188,11 +188,11 @@ public void testJavadocChildCount() { assertWithMessage("Invalid child type") .that(javadoc) .isInstanceOf(DetailNode.class); - final var type = ((DetailNode) javadoc).getType(); + final int type = ((DetailNode) javadoc).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(JavadocCommentsTokenTypes.JAVADOC_CONTENT); - final var javadocChildCount = parseTree.getChildCount(javadoc); + final int javadocChildCount = parseTree.getChildCount(javadoc); assertWithMessage("Invalid child count") .that(javadocChildCount) .isEqualTo(4); @@ -207,7 +207,7 @@ public void testJavadocChild() { assertWithMessage("Invalid child type") .that(javadoc) .isInstanceOf(DetailNode.class); - final var type = ((DetailNode) javadoc).getType(); + final int type = ((DetailNode) javadoc).getType(); assertWithMessage("Invalid child token type") .that(type) .isEqualTo(JavadocCommentsTokenTypes.JAVADOC_CONTENT); @@ -215,7 +215,7 @@ public void testJavadocChild() { assertWithMessage("Invalid child type") .that(javadocChild) .isInstanceOf(DetailNode.class); - final var childType = ((DetailNode) javadocChild).getType(); + final int childType = ((DetailNode) javadocChild).getType(); assertWithMessage("Invalid child token type") .that(childType) .isEqualTo(JavadocCommentsTokenTypes.TEXT); @@ -228,9 +228,9 @@ public void testGetIndexOfChild() { .that(ithChild) .isNotNull(); final ParseTreeTablePresentation parseTree = new ParseTreeTablePresentation(null); - var index = 0; + int index = 0; while (ithChild != null) { - final var indexOfChild = parseTree.getIndexOfChild(tree, ithChild); + final int indexOfChild = parseTree.getIndexOfChild(tree, ithChild); assertWithMessage("Invalid child index") .that(indexOfChild) .isEqualTo(index); @@ -238,7 +238,7 @@ public void testGetIndexOfChild() { index++; } - final var indexOfChild = parseTree.getIndexOfChild(tree, new DetailAstImpl()); + final int indexOfChild = parseTree.getIndexOfChild(tree, new DetailAstImpl()); assertWithMessage("Invalid child index") .that(indexOfChild) .isEqualTo(-1); @@ -273,8 +273,8 @@ public void testGetValueAt() { final ParseTreeTablePresentation parseTree = new ParseTreeTablePresentation(null); final Object treeModel = parseTree.getValueAt(node, 0); final String type = (String) parseTree.getValueAt(node, 1); - final var line = (int) parseTree.getValueAt(node, 2); - final var column = (int) parseTree.getValueAt(node, 3); + final int line = (int) parseTree.getValueAt(node, 2); + final int column = (int) parseTree.getValueAt(node, 3); final String text = (String) parseTree.getValueAt(node, 4); assertWithMessage("Node should be an Identifier") @@ -310,7 +310,7 @@ public void testGetValueAtDetailNode() { assertWithMessage("Comment node cannot be null") .that(commentContentNode) .isNotNull(); - final var nodeType = commentContentNode.getType(); + final int nodeType = commentContentNode.getType(); assertWithMessage("Comment node should be a comment type") .that(TokenUtil.isCommentType(nodeType)) .isTrue(); @@ -330,8 +330,8 @@ public void testGetValueAtDetailNode() { final Object treeModel = parseTree.getValueAt(child, 0); final String type = (String) parseTree.getValueAt(child, 1); - final var line = (int) parseTree.getValueAt(child, 2); - final var column = (int) parseTree.getValueAt(child, 3); + final int line = (int) parseTree.getValueAt(child, 2); + final int column = (int) parseTree.getValueAt(child, 3); final String text = (String) parseTree.getValueAt(child, 4); final String expectedText = "JAVADOC_CONTENT"; 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 0832b2077b3c..443277c2ec2f 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java @@ -630,7 +630,7 @@ private static void verifyCheckstyleMessage(Map> usedMessag */ private static boolean isSubset(int[] array, int... arrayToCheckIn) { Arrays.sort(arrayToCheckIn); - var result = true; + boolean result = true; for (final int element : array) { if (Arrays.binarySearch(arrayToCheckIn, element) < 0) { result = false; 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 de2d849953dd..1aecf4836726 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllTestsTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/AllTestsTest.java @@ -125,7 +125,7 @@ private static void grabAllTests(Map> allTests, File file) path += "Check"; } - final var slash = path.lastIndexOf(File.separatorChar); + final int slash = path.lastIndexOf(File.separatorChar); final String packge = path.substring(0, slash); final List classes = allTests.computeIfAbsent(packge, key -> new ArrayList<>()); @@ -144,7 +144,7 @@ private static void grabAllFiles(Map> allTests, File file) throw new IllegalStateException(exc); } - final var slash = path.lastIndexOf(File.separatorChar); + final int slash = path.lastIndexOf(File.separatorChar); final String packge = path.substring(0, slash); final List classes = allTests.computeIfAbsent(packge, key -> new ArrayList<>()); @@ -166,7 +166,7 @@ private static void verifyInputFile(Map> allTests, File fil // until https://github.com/checkstyle/checkstyle/issues/5105 if (shouldSkipFileProcessing(path)) { String fileName = file.getName(); - final var skipFileNaming = shouldSkipInputFileNameCheck(path, fileName); + final boolean skipFileNaming = shouldSkipInputFileNameCheck(path, fileName); if (!skipFileNaming) { assertWithMessage("Resource must start with 'Input' or 'Expected': %s", path) @@ -180,7 +180,7 @@ private static void verifyInputFile(Map> allTests, File fil fileName = fileName.substring(8); } - final var period = fileName.lastIndexOf('.'); + final int period = fileName.lastIndexOf('.'); if (period > 0) { fileName = fileName.substring(0, period); @@ -195,11 +195,11 @@ private static void verifyInputFile(Map> allTests, File fil private static void verifyInputFile(Map> allTests, boolean skipFileNaming, String path, String fileName) { List classes; - var slash = path.lastIndexOf(File.separatorChar); + int slash = path.lastIndexOf(File.separatorChar); String packge = path.substring(0, slash); - var found = false; + boolean found = false; - for (var depth = 0; depth < 4; depth++) { + for (int depth = 0; depth < 4; depth++) { // -@cs[MoveVariableInsideIf] assignment value is modified later, so it can't be // moved final String folderPath = packge; @@ -252,7 +252,7 @@ private static void verifyHasProductionFile(Map> allTests, if (!path.contains(File.separatorChar + "grammar" + File.separatorChar) && !path.contains(File.separatorChar + "internal" + File.separatorChar)) { - final var slash = path.lastIndexOf(File.separatorChar); + final int slash = path.lastIndexOf(File.separatorChar); final String packge = path.substring(0, slash); final List classes = allTests.get(packge); @@ -279,7 +279,7 @@ private static boolean isTarget(File file, String fileName) { private static boolean checkInputMatchCorrectFileStructure(List classes, String folderPath, boolean skipFileNaming, String fileName) { - var result = false; + boolean result = false; for (String clss : classes) { if (folderPath.endsWith(File.separatorChar + clss.toLowerCase(Locale.ENGLISH)) 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 bb6c480deb6a..cc6411d72f02 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java @@ -211,7 +211,7 @@ public void testCommitMessageHasProperStructure() throws Exception { final List lastCommits = getCommitsToCheck(); for (RevCommit commit : filterValidCommits(lastCommits)) { final String commitMessage = commit.getFullMessage(); - final var error = validateCommitMessage(commitMessage); + final int error = validateCommitMessage(commitMessage); if (error != 0) { final String commitId = commit.getId().getName(); @@ -338,7 +338,7 @@ private static List getCommitsByLastCommitAuthor( final String lastCommitAuthor = lastCommit.getAuthorIdent().getName(); commits.add(lastCommit); - var wasLastCheckedCommitAuthorSameAsLastCommit = true; + boolean wasLastCheckedCommitAuthorSameAsLastCommit = true; while (wasLastCheckedCommitAuthorSameAsLastCommit && previousCommitsIterator.hasNext()) { final RevCommit currentCommit = previousCommitsIterator.next(); 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 69b2dfb87866..0e458458a178 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/ImmutabilityTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/ImmutabilityTest.java @@ -359,7 +359,7 @@ private static boolean isEnumConstantOrEmptyArray(JavaField javaField) { * if it contains parameterized type */ private static boolean isParameterizedTypeImmutable(JavaField javaField) { - var isParameterizedTypeImmutable = false; + boolean isParameterizedTypeImmutable = false; final JavaType javaType = javaField.getType(); if (javaType instanceof JavaParameterizedType parameterizedType) { @@ -401,7 +401,7 @@ private ModulePropertyPredicate() { * @return {@code true} if field is a module property */ private static boolean isModuleProperty(JavaField javaField) { - var result = false; + boolean result = false; final JavaClass containingClass = javaField.getOwner(); final ModuleDetails moduleDetails = MODULE_DETAILS_MAP.get( containingClass.getFullName()); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsCategoryIndexTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsCategoryIndexTest.java index 97db636196f1..8aa020390e08 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsCategoryIndexTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsCategoryIndexTest.java @@ -162,7 +162,7 @@ private static String getMainSectionName(Path checkXdocFile) final Document document = XmlUtil.getRawXml(checkXdocFile.toString(), content, content); final NodeList sections = document.getElementsByTagName("section"); - for (var sectionIndex = 0; sectionIndex < sections.getLength(); sectionIndex++) { + for (int sectionIndex = 0; sectionIndex < sections.getLength(); sectionIndex++) { final Node sectionNode = sections.item(sectionIndex); if (sectionNode instanceof Element sectionElement && sectionElement.hasAttribute("name")) { @@ -194,7 +194,7 @@ private static String getCheckDescriptionFromXdoc(Path checkXdocFile) final Document document = XmlUtil.getRawXml(checkXdocFile.toString(), content, content); final NodeList subsections = document.getElementsByTagName("subsection"); - for (var subsectionIdx = 0; subsectionIdx < subsections.getLength(); subsectionIdx++) { + for (int subsectionIdx = 0; subsectionIdx < subsections.getLength(); subsectionIdx++) { final Node subsectionNode = subsections.item(subsectionIdx); if (subsectionNode instanceof Element subsectionElement && "Description".equals(subsectionElement.getAttribute("name"))) { @@ -283,7 +283,7 @@ private static Optional findTextInChildElements(Element parent, String t private static Optional getAggregatedDirectText(Element parent) { final StringBuilder directTextContent = new StringBuilder(32); final NodeList directChildren = parent.getChildNodes(); - for (var childIdx = 0; childIdx < directChildren.getLength(); childIdx++) { + for (int childIdx = 0; childIdx < directChildren.getLength(); childIdx++) { final Node directChild = directChildren.item(childIdx); if (directChild.getNodeType() == Node.TEXT_NODE) { directTextContent.append(directChild.getNodeValue()); @@ -321,7 +321,7 @@ private static Map parseCategoryIndex(Path categoryIndex throw new AssertionError(errorMsg); } - for (var tableIdx = 0; tableIdx < tableNodes.getLength(); tableIdx++) { + for (int tableIdx = 0; tableIdx < tableNodes.getLength(); tableIdx++) { final Node tableNode = tableNodes.item(tableIdx); if (tableNode instanceof Element element) { processTableElement(element, indexedChecks); @@ -340,7 +340,7 @@ private static Map parseCategoryIndex(Path categoryIndex private static void processTableElement(Element tableElement, Map indexedChecks) { final List rowElements = getChildrenElementsByTagName(tableElement, "tr"); - var isFirstRowInTable = true; + boolean isFirstRowInTable = true; for (final Element rowElement : rowElements) { if (isFirstRowInTable) { @@ -400,7 +400,7 @@ private static List getChildrenElementsByTagName(Node parent, String ta final List elements = new ArrayList<>(); if (parent != null) { final NodeList children = parent.getChildNodes(); - for (var childIdx = 0; childIdx < children.getLength(); childIdx++) { + for (int childIdx = 0; childIdx < children.getLength(); childIdx++) { final Node child = children.item(childIdx); if (child instanceof Element element && tagName.equals(child.getNodeName())) { elements.add(element); @@ -422,7 +422,7 @@ private static Optional getFirstChildElementByTagName(Node parent, Stri Optional result = Optional.empty(); if (parent != null) { final NodeList children = parent.getChildNodes(); - for (var childIdx = 0; childIdx < children.getLength(); childIdx++) { + for (int childIdx = 0; childIdx < children.getLength(); childIdx++) { final Node child = children.item(childIdx); if (child instanceof Element element && tagName.equals(child.getNodeName())) { result = Optional.of(element); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsExamplesAstConsistencyTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsExamplesAstConsistencyTest.java index e3d9ad50d648..bb6115ac0769 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsExamplesAstConsistencyTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsExamplesAstConsistencyTest.java @@ -399,14 +399,14 @@ private static String extractIndependentPattern(String violation) { */ private static String extractMismatchFileName(String violation) { final String prefix = "Mismatch: "; - final var startIndex = violation.indexOf(prefix); + final int startIndex = violation.indexOf(prefix); final String result; if (startIndex == -1) { result = null; } else { - final var endIndex = violation.indexOf('\n', startIndex); + final int endIndex = violation.indexOf('\n', startIndex); if (endIndex == -1) { result = violation.substring(startIndex + prefix.length()).trim(); } @@ -457,14 +457,14 @@ private static String getRelativePath(Path dir) { */ private static String extractDirectoryPath(String violation) { final String prefix = "Directory: "; - final var startIndex = violation.indexOf(prefix); + final int startIndex = violation.indexOf(prefix); final String result; if (startIndex == -1) { result = null; } else { - final var endIndex = violation.indexOf('\n', startIndex); + final int endIndex = violation.indexOf('\n', startIndex); if (endIndex == -1) { result = null; } @@ -483,7 +483,7 @@ private static String extractDirectoryPath(String violation) { * @return true if the directory contains 2 or more Example*.java files */ private static boolean containsMultipleExamples(Path dir) { - var result = false; + boolean result = false; try (Stream pathStream = Files.list(dir)) { result = pathStream @@ -588,7 +588,7 @@ private static List validateAllMatch(Path dir, List examples) if (referenceDetailAst != null) { final StructuralAstNode referenceAst = toStructuralAst(referenceDetailAst); - for (var index = 1; index < examples.size(); index++) { + for (int index = 1; index < examples.size(); index++) { final Path example = examples.get(index); final String violation = compareSingleExample( dir, example, reference, referenceAst @@ -615,10 +615,10 @@ private static List validateAllMatch(Path dir, List examples) */ private static String extractXdocSection(Path file) throws IOException { final List lines = Files.readAllLines(file, StandardCharsets.UTF_8); - var startIndex = -1; - var endIndex = -1; + int startIndex = -1; + int endIndex = -1; - for (var index = 0; index < lines.size(); index++) { + for (int index = 0; index < lines.size(); index++) { final String line = lines.get(index); if (line.contains(XDOC_START_MARKER)) { startIndex = index + 1; @@ -735,7 +735,7 @@ private static StructuralAstNode toStructuralAst(DetailAST ast) { * @return true if the node is a comment */ private static boolean isCommentNode(DetailAST ast) { - final var type = ast.getType(); + final int type = ast.getType(); return type == TokenTypes.SINGLE_LINE_COMMENT || type == TokenTypes.BLOCK_COMMENT_BEGIN || type == TokenTypes.COMMENT_CONTENT; @@ -761,7 +761,7 @@ private void addChild(StructuralAstNode child) { public boolean equals(Object obj) { final boolean result; if (obj instanceof StructuralAstNode other) { - final var childrenEqual = children.equals(other.children); + final boolean childrenEqual = children.equals(other.children); result = type == other.type && childrenEqual; } else { 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 5c503e15c991..c0239edf9638 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsJavaDocsTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsJavaDocsTest.java @@ -100,7 +100,7 @@ public void testAllCheckSectionJavaDocs() throws Exception { final Document document = XmlUtil.getRawXml(fileName, input, input); final NodeList sources = document.getElementsByTagName("section"); - for (var position = 0; position < sources.getLength(); position++) { + for (int position = 0; position < sources.getLength(); position++) { final Node section = sources.item(position); final String sectionName = XmlUtil.getNameAttributeOfNode(section); @@ -169,13 +169,13 @@ private static String getNodeText(Node node) { // -@cs[CyclomaticComplexity] No simple way to split this apart. private static void appendNodeText(StringBuilder result, Node node) { final String name = transformXmlToJavaDocName(node.getNodeName()); - final var list = "ol".equals(name) || "ul".equals(name); - final var newLineOpenBefore = list || "p".equals(name) || "pre".equals(name) + final boolean list = "ol".equals(name) || "ul".equals(name); + final boolean newLineOpenBefore = list || "p".equals(name) || "pre".equals(name) || "li".equals(name); - final var newLineOpenAfter = newLineOpenBefore && !list; - final var newLineClose = newLineOpenAfter || list; - final var sanitize = "pre".equals(name); - final var changeToTag = "code".equals(name); + final boolean newLineOpenAfter = newLineOpenBefore && !list; + final boolean newLineClose = newLineOpenAfter || list; + final boolean sanitize = "pre".equals(name); + final boolean changeToTag = "code".equals(name); if (newLineOpenBefore) { result.append('\n'); @@ -228,7 +228,7 @@ private static boolean shouldAppendSpace(StringBuilder text, char firstCharToApp result = false; } else { - final var last = text.charAt(text.length() - 1); + final char last = text.charAt(text.length() - 1); result = (firstCharToAppend == '@' || Character.getType(firstCharToAppend) == Character.DASH_PUNCTUATION @@ -259,7 +259,7 @@ else if ("h4".equals(name)) { private static String getAttributeText(String nodeName, NamedNodeMap attributes) { final StringBuilder result = new StringBuilder(20); - for (var i = 0; i < attributes.getLength(); i++) { + for (int i = 0; i < attributes.getLength(); i++) { result.append(' '); final Node attribute = attributes.item(i); @@ -362,7 +362,7 @@ public void visitToken(DetailAST ast) { private static DetailAST getParent(DetailAST node) { DetailAST result = node.getParent(); - var type = result.getType(); + int type = result.getType(); while (type == TokenTypes.MODIFIERS || type == TokenTypes.ANNOTATION) { result = result.getParent(); @@ -413,16 +413,16 @@ private static void visitMethod(DetailAST node, DetailAST parentNode) { * @return whether the AST represents a setter method. */ private static boolean isSetterMethod(DetailAST ast) { - var setterMethod = false; + boolean setterMethod = false; if (ast.getType() == TokenTypes.METHOD_DEF) { final DetailAST type = ast.findFirstToken(TokenTypes.TYPE); final String name = type.getNextSibling().getText(); - final var matchesSetterFormat = SETTER_PATTERN.matcher(name).matches(); - final var voidReturnType = type.findFirstToken(TokenTypes.LITERAL_VOID) != null; + final boolean matchesSetterFormat = SETTER_PATTERN.matcher(name).matches(); + final boolean voidReturnType = type.findFirstToken(TokenTypes.LITERAL_VOID) != null; final DetailAST params = ast.findFirstToken(TokenTypes.PARAMETERS); - final var singleParam = params.getChildCount(TokenTypes.PARAMETER_DEF) == 1; + final boolean singleParam = params.getChildCount(TokenTypes.PARAMETER_DEF) == 1; if (matchesSetterFormat && voidReturnType && singleParam) { final DetailAST slist = ast.findFirstToken(TokenTypes.SLIST); @@ -452,7 +452,7 @@ private static String getJavaDocText(DetailAST node) { } private static String makeFirstUpper(String str) { - final var ch = str.charAt(0); + final char ch = str.charAt(0); final String result; if (Character.isLowerCase(ch)) { 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 d5193e3b0518..9e64ae2b3733 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsMobileWrapperTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsMobileWrapperTest.java @@ -56,7 +56,7 @@ public void testAllCheckSectionMobileWrapper() throws Exception { final Document document = XmlUtil.getRawXml(fileName, input, input); final NodeList sources = document.getElementsByTagName("section"); - for (var position = 0; position < sources.getLength(); position++) { + for (int position = 0; position < sources.getLength(); position++) { final Node section = sources.item(position); final String sectionName = XmlUtil.getNameAttributeOfNode(section); 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 dbd537af04ec..2e8ca836f58a 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XdocsPagesTest.java @@ -318,10 +318,10 @@ public void testAllConfigsHaveLinkInSite() throws Exception { .replace(".xml", ".html") .replaceAll("\\\\", "/") .replaceAll("src[\\\\/]site[\\\\/]xdoc[\\\\/]", ""); - final var isConfigHtmlFile = Pattern.matches("config_[a-z]+.html", expectedFile); - final var isChecksIndexHtmlFile = "checks/index.html".equals(expectedFile); - final var isOldReleaseNotes = path.toString().contains("releasenotes_"); - final var isInnerPage = "report_issue.html".equals(expectedFile); + final boolean isConfigHtmlFile = Pattern.matches("config_[a-z]+.html", expectedFile); + final boolean isChecksIndexHtmlFile = "checks/index.html".equals(expectedFile); + final boolean isOldReleaseNotes = path.toString().contains("releasenotes_"); + final boolean isInnerPage = "report_issue.html".equals(expectedFile); if (!isConfigHtmlFile && !isChecksIndexHtmlFile && !isOldReleaseNotes && !isInnerPage) { @@ -368,7 +368,7 @@ private static void validateModulesSyncWithTheirSummaries(Path availablePagePath final Map summaries = readSummaries(availablePagePath); final NodeList subsectionSources = getTagSourcesNode(path, "subsection"); - for (var position = 0; position < subsectionSources.getLength(); position++) { + for (int position = 0; position < subsectionSources.getLength(); position++) { final Node subsection = subsectionSources.item(position); final String subsectionName = XmlUtil.getNameAttributeOfNode(subsection); if (!"Description".equals(subsectionName)) { @@ -413,7 +413,7 @@ public void testCategoryIndexPageTableInSyncWithAllChecksPageTable() throws Exce final NodeList sources = getTagSourcesNode(path, "tr"); - for (var position = 0; position < sources.getLength(); position++) { + for (int position = 0; position < sources.getLength(); position++) { final Node tableRow = sources.item(position); final Iterator cells = XmlUtil .findChildElementsByTag(tableRow, "td").iterator(); @@ -439,7 +439,7 @@ private static void validateFilterTypeIndexPage(Path availablePath) throws Exception { final NodeList tableRowSources = getTagSourcesNode(availablePath, "tr"); - for (var position = 0; position < tableRowSources.getLength(); position++) { + for (int position = 0; position < tableRowSources.getLength(); position++) { final Node tableRow = tableRowSources.item(position); final Iterator tdCells = XmlUtil .findChildElementsByTag(tableRow, "td").iterator(); @@ -489,7 +489,7 @@ private static NodeList getTagSourcesNode(Path availablePath, String tagName) public void testAlphabetOrderInNames() throws Exception { final NodeList nodes = getTagSourcesNode(SITE_PATH, "item"); - for (var nodeIndex = 0; nodeIndex < nodes.getLength(); nodeIndex++) { + for (int nodeIndex = 0; nodeIndex < nodes.getLength(); nodeIndex++) { final Node current = nodes.item(nodeIndex); if ("Checks".equals(XmlUtil.getNameAttributeOfNode(current))) { @@ -504,8 +504,8 @@ public void testAlphabetOrderInNames() throws Exception { .inOrder(); Node groupNode = current.getFirstChild(); - var index = 0; - final var totalGroups = XmlUtil.getChildrenElements(current).size(); + int index = 0; + final int totalGroups = XmlUtil.getChildrenElements(current).size(); while (index < totalGroups) { if ("item".equals(groupNode.getNodeName())) { final List checkNames = getNames(groupNode); @@ -565,7 +565,7 @@ public void testAlphabetOrderAtIndexPages() throws Exception { public static void validateOrder(Path path, String name) throws Exception { final NodeList nodes = getTagSourcesNode(path, "div"); - for (var nodeIndex = 0; nodeIndex < nodes.getLength(); nodeIndex++) { + for (int nodeIndex = 0; nodeIndex < nodes.getLength(); nodeIndex++) { final Node current = nodes.item(nodeIndex); final List names = getNamesFromIndexPage(current); final List namesSorted = names.stream() @@ -585,8 +585,8 @@ private static List getNamesFromIndexPage(Node node) { Node current = node.getFirstChild(); Node treeNode = current; - var getFirstChild = false; - var index = 0; + boolean getFirstChild = false; + int index = 0; while (current != null && index < children.size()) { if ("tr".equals(current.getNodeName())) { treeNode = current.getNextSibling(); @@ -615,7 +615,7 @@ private static List getNames(Node node) { final Set children = XmlUtil.getChildrenElements(node); final List result = new ArrayList<>(); Node current = node.getFirstChild(); - var index = 0; + int index = 0; while (index < children.size()) { if ("item".equals(current.getNodeName())) { final String name = XmlUtil.getNameAttributeOfNode(current); @@ -631,7 +631,7 @@ private static Map readSummaries(Path availablePath) throws Exce final NodeList rows = getTagSourcesNode(availablePath, "tr"); final Map result = new HashMap<>(); - for (var position = 0; position < rows.getLength(); position++) { + for (int position = 0; position < rows.getLength(); position++) { final Node row = rows.item(position); final Iterator cells = XmlUtil.findChildElementsByTag(row, "td").iterator(); final String name = XmlUtil.sanitizeXml(cells.next().getTextContent()); @@ -649,7 +649,7 @@ public void testAllSubSections() throws Exception { final String fileName = path.getFileName().toString(); final NodeList subSections = getTagSourcesNode(path, "subsection"); - for (var position = 0; position < subSections.getLength(); position++) { + for (int position = 0; position < subSections.getLength(); position++) { final Node subSection = subSections.item(position); final Node name = subSection.getAttributes().getNamedItem("name"); @@ -701,7 +701,7 @@ public void testAllXmlExamples() throws Exception { final String fileName = path.getFileName().toString(); final NodeList sources = getTagSourcesNode(path, "source"); - for (var position = 0; position < sources.getLength(); position++) { + for (int position = 0; position < sources.getLength(); position++) { final String unserializedSource = sources.item(position).getTextContent() .replace("...", "").trim(); @@ -752,7 +752,7 @@ private static String buildXml(String unserializedSource) throws IOException { } private static boolean hasFileSetClass(String xml) { - var found = false; + boolean found = false; for (String find : XML_FILESET_LIST) { if (xml.contains(find)) { @@ -819,7 +819,7 @@ public void testAllCheckSections() throws Exception { final NodeList sources = getTagSourcesNode(path, "section"); String lastSectionName = null; - for (var position = 0; position < sources.getLength(); position++) { + for (int position = 0; position < sources.getLength(); position++) { final Node section = sources.item(position); final String sectionName = XmlUtil.getNameAttributeOfNode(section); @@ -864,7 +864,7 @@ public void testAllCheckSectionsEx() throws Exception { final NodeList sources = getTagSourcesNode(path, "section"); - for (var position = 0; position < sources.getLength(); position++) { + for (int position = 0; position < sources.getLength(); position++) { final Node section = sources.item(position); final String sectionName = XmlUtil.getNameAttributeOfNode(section); @@ -887,7 +887,7 @@ private static void validateCheckSection(ModuleFactory moduleFactory, String fil throw new CheckstyleException(fileName + " couldn't find class: " + sectionName, exc); } - var subSectionPos = 0; + int subSectionPos = 0; for (Node subSection : XmlUtil.getChildrenElements(section)) { if (subSectionPos == 0 && "p".equals(subSection.getNodeName())) { validateSinceDescriptionSection(fileName, sectionName, subSection); @@ -1142,9 +1142,9 @@ else if (AbstractCheck.class.isAssignableFrom(clss)) { private static void validatePropertySectionProperties(String fileName, String sectionName, Node table, Object instance, Set properties) throws Exception { - var skip = true; - var didJavadocTokens = false; - var didTokens = false; + boolean skip = true; + boolean didJavadocTokens = false; + boolean didTokens = false; for (Node row : XmlUtil.getChildrenElements(table)) { final List columns = new ArrayList<>(XmlUtil.getChildrenElements(row)); @@ -1430,7 +1430,7 @@ else if (fieldClass == double[].class) { } } else if (fieldClass == String[].class) { - final var preserveOrder = hasPreserveOrderAnnotation(field); + final boolean preserveOrder = hasPreserveOrderAnnotation(field); result = getStringArrayPropertyValue(propertyName, value, preserveOrder); } else if (fieldClass == URI.class || fieldClass == String.class) { @@ -1483,7 +1483,7 @@ private static String getPatternArrayPropertyValue(Object fieldValue) { if (value instanceof Collection collection) { final Pattern[] newArray = new Pattern[collection.size()]; final Iterator iterator = collection.iterator(); - var index = 0; + int index = 0; while (iterator.hasNext()) { final Object next = iterator.next(); @@ -1497,7 +1497,7 @@ private static String getPatternArrayPropertyValue(Object fieldValue) { if (value != null && Array.getLength(value) > 0) { final String[] newArray = new String[Array.getLength(value)]; - for (var i = 0; i < newArray.length; i++) { + for (int i = 0; i < newArray.length; i++) { newArray[i] = ((Pattern) Array.get(value, i)).pattern(); } @@ -1747,9 +1747,9 @@ private static void validateUsageExample(String fileName, String sectionName, No .that(text) .isEmpty(); - var hasCheckstyle = false; - var hasGoogle = false; - var hasSun = false; + boolean hasCheckstyle = false; + boolean hasGoogle = false; + boolean hasSun = false; for (Node node : XmlUtil.findChildElementsByTag(subSection, "a")) { final String url = node.getAttributes().getNamedItem("href").getTextContent(); @@ -1837,7 +1837,7 @@ private static void validateParentSection(String fileName, String sectionName, private static boolean hasParentModule(String sectionName) { final String search = "\"" + sectionName + "\""; - var result = true; + boolean result = true; for (String find : XML_FILESET_LIST) { if (find.contains(search)) { @@ -1886,7 +1886,7 @@ public void testAllStyleRules() throws Exception { String lastRuleName = null; String[] lastRuleNumberParts = null; - for (var position = 0; position < sources.getLength(); position++) { + for (int position = 0; position < sources.getLength(); position++) { final Node row = sources.item(position); final List columns = new ArrayList<>( XmlUtil.findChildElementsByTag(row, "td")); @@ -1936,11 +1936,11 @@ private static String[] validateRuleNameOrder(String fileName, String lastRuleNa final String[] ruleNumberParts = ruleName.split(" ", 2)[0].split("\\."); if (lastRuleName != null) { - final var ruleNumberPartsAmount = ruleNumberParts.length; - final var lastRuleNumberPartsAmount = lastRuleNumberParts.length; + final int ruleNumberPartsAmount = ruleNumberParts.length; + final int lastRuleNumberPartsAmount = lastRuleNumberParts.length; final String outOfOrderReason = fileName + " rule '" + ruleName + "' is out of order compared to '" + lastRuleName + "'"; - var lastRuleNumberPartWasEqual = false; + boolean lastRuleNumberPartWasEqual = false; int partIndex; for (partIndex = 0; partIndex < ruleNumberPartsAmount; partIndex++) { if (lastRuleNumberPartsAmount <= partIndex) { @@ -1951,14 +1951,14 @@ private static String[] validateRuleNameOrder(String fileName, String lastRuleNa final String ruleNumberPart = ruleNumberParts[partIndex]; final String lastRuleNumberPart = lastRuleNumberParts[partIndex]; - final var ruleNumberPartsAreNumeric = IntStream.concat( + final boolean ruleNumberPartsAreNumeric = IntStream.concat( ruleNumberPart.chars(), lastRuleNumberPart.chars() ).allMatch(Character::isDigit); if (ruleNumberPartsAreNumeric) { - final var numericRuleNumberPart = parseInt(ruleNumberPart); - final var numericLastRuleNumberPart = parseInt(lastRuleNumberPart); + final int numericRuleNumberPart = parseInt(ruleNumberPart); + final int numericLastRuleNumberPart = parseInt(lastRuleNumberPart); assertWithMessage(outOfOrderReason) .that(numericRuleNumberPart) .isAtLeast(numericLastRuleNumberPart); @@ -1994,7 +1994,7 @@ private static void validateStyleAnchors(Set anchors, String fileName, Str .that(anchors) .hasSize(2); - final var space = ruleName.indexOf(' '); + final int space = ruleName.indexOf(' '); assertWithMessage( "%s rule '%s' must have have a space between the rule's number and the rule's name", fileName, ruleName) @@ -2003,7 +2003,7 @@ private static void validateStyleAnchors(Set anchors, String fileName, Str final String ruleNumber = ruleName.substring(0, space); - var position = 1; + int position = 1; for (Node anchor : anchors) { final String actualUrl; @@ -2031,7 +2031,7 @@ private static void validateStyleModules(Set checks, Set configs, Set styleChecks, String styleName, String ruleName) { final Iterator itrChecks = checks.iterator(); final Iterator itrConfigs = configs.iterator(); - final var isGoogleDocumentation = "google".equals(styleName); + final boolean isGoogleDocumentation = "google".equals(styleName); if (isGoogleDocumentation) { validateChapterWiseTesting(itrChecks, itrConfigs, styleChecks, styleName, ruleName); @@ -2051,7 +2051,7 @@ private static void validateModuleWiseTesting(Iterator itrChecks, final Node module = itrChecks.next(); final String moduleName = module.getTextContent().trim(); final String href = module.getAttributes().getNamedItem("href").getTextContent(); - final var moduleIsCheck = href.startsWith("checks/"); + final boolean moduleIsCheck = href.startsWith("checks/"); if (!moduleIsCheck) { continue; @@ -2123,14 +2123,14 @@ else if ("test".equals(configName)) { private static void validateChapterWiseTesting(Iterator itrChecks, Iterator itrSample, Set styleChecks, String styleName, String ruleName) { - var hasChecks = false; + boolean hasChecks = false; final Set usedModules = new HashSet<>(); while (itrChecks.hasNext()) { final Node module = itrChecks.next(); final String moduleName = module.getTextContent().trim(); final String href = module.getAttributes().getNamedItem("href").getTextContent(); - final var moduleIsCheck = href.startsWith("checks/"); + final boolean moduleIsCheck = href.startsWith("checks/"); final String partialConfigUrl = "https://github.com/search?q=" + "path%3Asrc%2Fmain%2Fresources%20path%3A**%2F" + styleName; @@ -2246,7 +2246,7 @@ public void testAllExampleMacrosHaveParagraphWithIdBeforeThem() throws Exception final String fileName = path.getFileName().toString(); final NodeList sources = getTagSourcesNode(path, "macro"); - for (var position = 0; position < sources.getLength(); position++) { + for (int position = 0; position < sources.getLength(); position++) { final Node macro = sources.item(position); final String macroName = macro.getAttributes() .getNamedItem("name").getTextContent(); @@ -2277,7 +2277,7 @@ private static void validatePrecedingParagraphId( String exampleName = ""; String exampleType = ""; final NodeList params = macro.getChildNodes(); - for (var paramPosition = 0; paramPosition < params.getLength(); paramPosition++) { + for (int paramPosition = 0; paramPosition < params.getLength(); paramPosition++) { final Node item = params.item(paramPosition); if (!"param".equals(item.getNodeName())) { @@ -2330,7 +2330,7 @@ public void validateExampleSectionSeparation() throws Exception { final Document doc = parseXmlToDomDocument(template); final NodeList subsectionList = doc.getElementsByTagName("subsection"); - for (var index = 0; index < subsectionList.getLength(); index++) { + for (int index = 0; index < subsectionList.getLength(); index++) { final Element subsection = (Element) subsectionList.item(index); if (!"Examples".equals(subsection.getAttribute("name"))) { continue; @@ -2338,9 +2338,9 @@ public void validateExampleSectionSeparation() throws Exception { final NodeList children = subsection.getChildNodes(); String lastExampleIdPrefix = null; - var separatorSeen = false; + boolean separatorSeen = false; - for (var childIndex = 0; childIndex < children.getLength(); childIndex++) { + for (int childIndex = 0; childIndex < children.getLength(); childIndex++) { final Node child = children.item(childIndex); if (child.getNodeType() != Node.ELEMENT_NODE) { continue; @@ -2392,7 +2392,7 @@ private static Document parseXmlToDomDocument(Path template) throws Exception { } private static String getExamplePrefix(String id) { - final var dash = id.indexOf('-'); + final int dash = id.indexOf('-'); final String result; if (dash == -1) { result = id; diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/VerifyPositionAfterLastTabFileSet.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/VerifyPositionAfterLastTabFileSet.java index 0d3e4c23c4ec..4d9ae7639a62 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/VerifyPositionAfterLastTabFileSet.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/testmodules/VerifyPositionAfterLastTabFileSet.java @@ -28,9 +28,9 @@ public class VerifyPositionAfterLastTabFileSet extends AbstractFileSetCheck { @Override protected void processFiltered(File file, FileText fileText) { - var lineNumber = 0; + int lineNumber = 0; for (String line : getFileContents().getLines()) { - final var position = line.lastIndexOf('\t'); + final int position = line.lastIndexOf('\t'); lineNumber++; if (position != -1) { 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 4d34c01ac0ae..7d280a26f490 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 @@ -37,7 +37,7 @@ public String format(AuditEvent event) { final String message = event.getMessage(); // avoid StringBuffer.expandCapacity - final var bufLen = event.getFileName().length() + event.getMessage().length() + final int bufLen = event.getFileName().length() + event.getMessage().length() + LENGTH_OF_ALL_SEPARATORS; final StringBuilder sb = new StringBuilder(bufLen); 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 6d814cf97abf..7b9eb97214a9 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 @@ -125,7 +125,7 @@ private static Set getCheckStyleModulesReferencedInConfig(String configF final NodeList nodeList = document.getElementsByTagName("module"); final Set checksReferencedInCheckstyleChecksXml = new HashSet<>(); - for (var i = 0; i < nodeList.getLength(); i++) { + for (int i = 0; i < nodeList.getLength(); i++) { final Node currentNode = nodeList.item(i); if (currentNode.getNodeType() == Node.ELEMENT_NODE) { final Element module = (Element) currentNode; @@ -297,10 +297,10 @@ public static String getTokenText(int[] tokens, int... subtractions) { } else { final StringBuilder result = new StringBuilder(50); - var first = true; + boolean first = true; for (int token : tokens) { - var found = false; + boolean found = false; for (int subtraction : subtractions) { if (subtraction == token) { @@ -344,10 +344,10 @@ public static Set getTokenNameSet(int... tokens) { public static String getJavadocTokenText(int[] tokens, int... subtractions) { final StringBuilder result = new StringBuilder(50); - var first = true; + boolean first = true; for (int token : tokens) { - var found = false; + boolean found = false; for (int subtraction : subtractions) { if (subtraction == token) { 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 0962e081e63a..e512001c62c1 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 @@ -81,7 +81,7 @@ private TestUtil() { public static boolean isUtilsClassHasPrivateConstructor(final Class utilClass) throws ReflectiveOperationException { final Constructor constructor = utilClass.getDeclaredConstructor(); - final var result = Modifier.isPrivate(constructor.getModifiers()); + final boolean result = Modifier.isPrivate(constructor.getModifiers()); constructor.setAccessible(true); constructor.newInstance(); return result; @@ -266,7 +266,7 @@ public static int getJdkVersion() { * @return adjusted flush count */ public static int adjustFlushCountForOutputStreamClose(int flushCount) { - var result = flushCount; + int result = flushCount; if (getJdkVersion() >= 13) { ++result; } 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 2c8cd84bf74f..e8d0de3806ac 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 @@ -167,7 +167,7 @@ public static Set getModulesNamesWhichHaveXdoc() throws Exception { final NodeList nodeList = document.getElementsByTagName("section"); - for (var i = 0; i < nodeList.getLength(); i++) { + for (int i = 0; i < nodeList.getLength(); i++) { final Node currentNode = nodeList.item(i); if (currentNode.getNodeType() == Node.ELEMENT_NODE) { final Element module = (Element) currentNode; 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 19a06d0de31b..a63da80e3f04 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtilTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/AnnotationUtilTest.java @@ -214,7 +214,7 @@ public void testContainsAnnotationListWithNullList() { public void testContainsAnnotationListWithEmptyList() { final DetailAST ast = new DetailAstImpl(); final Set annotations = Set.of(); - final var result = AnnotationUtil.containsAnnotation(ast, annotations); + final boolean result = AnnotationUtil.containsAnnotation(ast, annotations); assertWithMessage("An empty set should lead to a false result") .that(result) .isFalse(); @@ -227,7 +227,7 @@ public void testContainsAnnotationListWithNoAnnotationNode() { modifiersAst.setType(TokenTypes.MODIFIERS); ast.addChild(modifiersAst); final Set annotations = Set.of("Override"); - final var result = AnnotationUtil.containsAnnotation(ast, annotations); + final boolean result = AnnotationUtil.containsAnnotation(ast, annotations); assertWithMessage("An empty ast should lead to a false result") .that(result) .isFalse(); @@ -250,7 +250,7 @@ public void testContainsAnnotationListWithNoMatchingAnnotation() { ); ast.addChild(modifiersAst); final Set annotations = Set.of("Deprecated"); - final var result = AnnotationUtil.containsAnnotation(ast, annotations); + final boolean result = AnnotationUtil.containsAnnotation(ast, annotations); assertWithMessage("No matching annotation found") .that(result) .isFalse(); 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 55c15d0cf5da..25e8dfe97b1a 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/BlockCommentPositionTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/BlockCommentPositionTest.java @@ -76,7 +76,7 @@ public void testJavaDocsRecognition() throws Exception { for (BlockCommentPositionTestMetadata metadata : metadataList) { final DetailAST ast = JavaParser.parseFile(new File(getPath(metadata.getFileName())), JavaParser.Options.WITH_COMMENTS); - final var matches = getJavadocsCount(ast, metadata.getAssertion()); + final int matches = getJavadocsCount(ast, metadata.getAssertion()); assertWithMessage("Invalid javadoc count") .that(matches) .isEqualTo(metadata.getMatchesNum()); @@ -96,7 +96,7 @@ public void testJavaDocsRecognitionNonCompilable() throws Exception { final DetailAST ast = JavaParser.parseFile( new File(getPath(metadata.getFileName())), JavaParser.Options.WITH_COMMENTS); - final var matches = getJavadocsCount(ast, metadata.getAssertion()); + final int matches = getJavadocsCount(ast, metadata.getAssertion()); assertWithMessage("Invalid javadoc count") .that(matches) .isEqualTo(metadata.getMatchesNum()); @@ -105,7 +105,7 @@ public void testJavaDocsRecognitionNonCompilable() throws Exception { private static int getJavadocsCount(DetailAST detailAST, Function assertion) { - var matchFound = 0; + int matchFound = 0; DetailAST node = detailAST; while (node != null) { if (node.getType() == TokenTypes.BLOCK_COMMENT_BEGIN 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 42b7cda0a3b1..013002a880d4 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/CheckUtilTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/CheckUtilTest.java @@ -63,7 +63,7 @@ public void testIsProperUtilsClass() throws ReflectiveOperationException { @Test public void testParseDoubleWithIncorrectToken() { - final var parsedDouble = CheckUtil.parseDouble("1_02", TokenTypes.ASSIGN); + final double parsedDouble = CheckUtil.parseDouble("1_02", TokenTypes.ASSIGN); assertWithMessage("Invalid parse result") .that(parsedDouble) .isEqualTo(Double.NaN); @@ -448,7 +448,7 @@ private static DetailAST getNode(DetailAST root, int type) { @Test public void testPackageInfo() { - final var result = CheckUtil.isPackageInfo("/"); + final boolean result = CheckUtil.isPackageInfo("/"); assertWithMessage("Expected isPackageInfo() to return false for ('/')") .that(result) 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 d3f4c373b3db..9cb30beb3b64 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/CommonUtilTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/CommonUtilTest.java @@ -235,7 +235,7 @@ public void testRelativeNormalizedPathWithDenormalizedBaseDirectory() throws IOE @Test public void testPattern() { - final var result = CommonUtil.isPatternValid("someValidPattern"); + final boolean result = CommonUtil.isPatternValid("someValidPattern"); assertWithMessage("Should return true when pattern is valid") .that(result) .isTrue(); @@ -243,7 +243,7 @@ public void testPattern() { @Test public void testInvalidPattern() { - final var result = CommonUtil.isPatternValid("some[invalidPattern"); + final boolean result = CommonUtil.isPatternValid("some[invalidPattern"); assertWithMessage("Should return false when pattern is invalid") .that(result) .isFalse(); 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 31c0fc1eea2f..c2ae45ce8af7 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtilTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtilTest.java @@ -161,11 +161,11 @@ public void testInlineTagPositions() { assertWithMessage("Invalid tags size") .that(tags) .hasSize(1); - final var lineNo = tags.get(0).getLineNo(); + final int lineNo = tags.get(0).getLineNo(); assertWithMessage("Unexpected line number") .that(lineNo) .isEqualTo(0); - final var columnNo = tags.get(0).getColumnNo(); + final int columnNo = tags.get(0).getColumnNo(); assertWithMessage("Unexpected column number") .that(columnNo) .isEqualTo(10); @@ -330,7 +330,7 @@ public void testGetTokenIdThatIsUnknown() { @Test public void testGetTokenId() { - final var tokenId = JavadocUtil.getTokenId("JAVADOC_CONTENT"); + final int tokenId = JavadocUtil.getTokenId("JAVADOC_CONTENT"); assertWithMessage("Invalid token id") .that(tokenId) 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 ac93f89ad73a..f18379ddb9aa 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtilTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/ScopeUtilTest.java @@ -378,7 +378,7 @@ public void testisInInterfaceOrAnnotationBlock() { private static DetailAstImpl getNode(int... nodeTypes) { DetailAstImpl ast = new DetailAstImpl(); ast.setType(nodeTypes[0]); - for (var i = 1; i < nodeTypes.length; i++) { + for (int i = 1; i < nodeTypes.length; i++) { final DetailAstImpl astChild = new DetailAstImpl(); astChild.setType(nodeTypes[i]); ast.addChild(astChild); 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 a13ab3555e9d..47a46a045670 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/utils/TokenUtilTest.java @@ -48,7 +48,7 @@ public void testIsProperUtilsClass() throws ReflectiveOperationException { @Test public void testGetIntFromAccessibleField() throws NoSuchFieldException { final Field field = Integer.class.getField("MAX_VALUE"); - final var maxValue = TokenUtil.getIntFromField(field, 0); + final int maxValue = TokenUtil.getIntFromField(field, 0); assertWithMessage("Invalid getIntFromField result") .that(maxValue) @@ -110,7 +110,7 @@ public void testInvertMap() { @Test public void testTokenValueIncorrect() throws IllegalAccessException { - var maxId = 0; + int maxId = 0; final Field[] fields = TokenTypes.class.getDeclaredFields(); for (final Field field : fields) { // Only process the int declarations. @@ -119,13 +119,13 @@ public void testTokenValueIncorrect() throws IllegalAccessException { } final String name = field.getName(); - final var id = field.getInt(name); + final int id = field.getInt(name); if (id > maxId) { maxId = id; } } - final var nextAfterMaxId = maxId + 1; + final int nextAfterMaxId = maxId + 1; try { TokenUtil.getTokenName(nextAfterMaxId); assertWithMessage("IllegalArgumentException is expected").fail(); @@ -147,7 +147,7 @@ public void testTokenValueCorrect() throws IllegalAccessException { } final String name = field.getName(); - final var id = field.getInt(name); + final int id = field.getInt(name); assertWithMessage("Invalid token name") .that(TokenUtil.getTokenName(id)) @@ -157,7 +157,7 @@ public void testTokenValueCorrect() throws IllegalAccessException { @Test public void testTokenValueIncorrect2() { - final var id = 0; + final int id = 0; try { TokenUtil.getTokenName(id); assertWithMessage("IllegalArgumentException is expected").fail(); @@ -224,7 +224,7 @@ public void testIsCommentType() { @Test public void testGetTokenTypesTotalNumber() { - final var tokenTypesTotalNumber = TokenUtil.getTokenTypesTotalNumber(); + final int tokenTypesTotalNumber = TokenUtil.getTokenTypesTotalNumber(); assertWithMessage("Invalid token total number") .that(tokenTypesTotalNumber) @@ -234,7 +234,7 @@ public void testGetTokenTypesTotalNumber() { @Test public void testGetAllTokenIds() { final int[] allTokenIds = TokenUtil.getAllTokenIds(); - final var sum = Arrays.stream(allTokenIds).sum(); + final int sum = Arrays.stream(allTokenIds).sum(); assertWithMessage("Invalid token length") .that(allTokenIds.length) @@ -246,7 +246,7 @@ public void testGetAllTokenIds() { @Test public void testGetTokenNameWithGreatestPossibleId() { - final var id = TokenTypes.COMMENT_CONTENT; + final int id = TokenTypes.COMMENT_CONTENT; final String tokenName = TokenUtil.getTokenName(id); assertWithMessage("Invalid token name") @@ -342,12 +342,12 @@ public void testIsTypeDeclaration() { @Test public void testIsOfTypeTrue() { - final var type = TokenTypes.LITERAL_CATCH; + final int type = TokenTypes.LITERAL_CATCH; final DetailAstImpl astForTest = new DetailAstImpl(); astForTest.setType(type); - final var result1 = TokenUtil.isOfType(type, TokenTypes.LITERAL_FOR, + final boolean result1 = TokenUtil.isOfType(type, TokenTypes.LITERAL_FOR, TokenTypes.LITERAL_IF, TokenTypes.LITERAL_CATCH); - final var result2 = TokenUtil.isOfType(astForTest, TokenTypes.LITERAL_FOR, + final boolean result2 = TokenUtil.isOfType(astForTest, TokenTypes.LITERAL_FOR, TokenTypes.LITERAL_IF, TokenTypes.LITERAL_CATCH); assertWithMessage("Token type did not match") @@ -360,15 +360,15 @@ public void testIsOfTypeTrue() { @Test public void testIsOfTypeFalse() { - final var type = TokenTypes.LITERAL_CATCH; + final int type = TokenTypes.LITERAL_CATCH; final DetailAstImpl astForTest1 = new DetailAstImpl(); final DetailAstImpl astForTest2 = null; astForTest1.setType(type); - final var result1 = TokenUtil.isOfType(type, TokenTypes.LITERAL_FOR, + final boolean result1 = TokenUtil.isOfType(type, TokenTypes.LITERAL_FOR, TokenTypes.LITERAL_IF, TokenTypes.LITERAL_ELSE); - final var result2 = TokenUtil.isOfType(astForTest1, TokenTypes.LITERAL_FOR, + final boolean result2 = TokenUtil.isOfType(astForTest1, TokenTypes.LITERAL_FOR, TokenTypes.LITERAL_IF, TokenTypes.LITERAL_ELSE); - final var result3 = TokenUtil.isOfType(astForTest2, TokenTypes.LITERAL_FOR, + final boolean result3 = TokenUtil.isOfType(astForTest2, TokenTypes.LITERAL_FOR, TokenTypes.LITERAL_IF, TokenTypes.LITERAL_ELSE); assertWithMessage("Token type should not match") 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 018fb2e34511..af0f609f0c38 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/ElementNodeTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/ElementNodeTest.java @@ -104,7 +104,7 @@ public void testSiblingsOrdering() { public void testCompareOrderWrongInstance() throws Exception { final String xpath = "//OBJBLOCK"; final List nodes = getXpathItems(xpath, rootNode); - final var result = nodes.get(0).compareOrder(null); + final int result = nodes.get(0).compareOrder(null); assertWithMessage("Expected result wrong") .that(result) .isEqualTo(0); @@ -146,7 +146,7 @@ public void testGetNodeByValueNumInt() throws Exception { assertWithMessage("Invalid number of nodes") .that(nodes) .hasSize(1); - final var tokenType = ((AbstractNode) nodes.get(0)).getTokenType(); + final int tokenType = ((AbstractNode) nodes.get(0)).getTokenType(); assertWithMessage("Invalid token type") .that(tokenType) .isEqualTo(TokenTypes.NUM_INT); @@ -159,7 +159,7 @@ public void testGetNodeByValueStringLiteral() throws Exception { assertWithMessage("Invalid number of nodes") .that(nodes) .hasSize(2); - final var tokenType = ((AbstractNode) nodes.get(0)).getTokenType(); + final int tokenType = ((AbstractNode) nodes.get(0)).getTokenType(); assertWithMessage("Invalid token type") .that(tokenType) .isEqualTo(TokenTypes.STRING_LITERAL); 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 5bc857144553..31d7f61bb0c4 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathMapperTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathMapperTest.java @@ -45,7 +45,7 @@ public void testNodeOrdering() throws Exception { final String xpath = "//METHOD_DEF/SLIST/*"; final RootNode rootNode = getRootNode("InputXpathMapperAst.java"); final List nodes = getXpathItems(xpath, rootNode); - for (var i = 1; i < nodes.size(); i++) { + for (int i = 1; i < nodes.size(); i++) { final NodeInfo curr = nodes.get(i); final NodeInfo prev = nodes.get(i - 1); @@ -1258,7 +1258,7 @@ private RootNode getRootNodeWithComments(String fileName) throws Exception { private static DetailAST[] convertToArray(List nodes) { final DetailAST[] result = new DetailAST[nodes.size()]; - for (var i = 0; i < nodes.size(); i++) { + for (int i = 0; i < nodes.size(); i++) { final ElementNode abstractNode = (ElementNode) nodes.get(i); result[i] = abstractNode.getUnderlyingNode(); } 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 fd3acad7b77d..2ef30c441697 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGeneratorTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/xpath/XpathQueryGeneratorTest.java @@ -62,8 +62,8 @@ public void init() throws Exception { @Test public void testClassDef() { - final var lineNumber = 12; - final var columnNumber = 1; + final int lineNumber = 12; + final int columnNumber = 1; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -79,8 +79,8 @@ public void testClassDef() { @Test public void testMethodDef() { - final var lineNumber = 45; - final var columnNumber = 5; + final int lineNumber = 45; + final int columnNumber = 5; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -98,8 +98,8 @@ public void testMethodDef() { @Test public void testVariableDef() { - final var lineNumber = 53; - final var columnNumber = 13; + final int lineNumber = 53; + final int columnNumber = 13; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -127,8 +127,8 @@ public void testVariableDef() { @Test public void testLcurly() { - final var lineNumber = 37; - final var columnNumber = 20; + final int lineNumber = 37; + final int columnNumber = 20; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -142,8 +142,8 @@ public void testLcurly() { @Test public void testRcurly() { - final var lineNumber = 25; - final var columnNumber = 5; + final int lineNumber = 25; + final int columnNumber = 5; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -157,8 +157,8 @@ public void testRcurly() { @Test public void testExpr() { - final var lineNumber = 17; - final var columnNumber = 50; + final int lineNumber = 17; + final int columnNumber = 50; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -174,8 +174,8 @@ public void testExpr() { @Test public void testLparen() { - final var lineNumber = 45; - final var columnNumber = 31; + final int lineNumber = 45; + final int columnNumber = 31; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -189,8 +189,8 @@ public void testLparen() { @Test public void testEmpty() { - final var lineNumber = 300; - final var columnNumber = 300; + final int lineNumber = 300; + final int columnNumber = 300; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -201,8 +201,8 @@ public void testEmpty() { @Test public void testPackage() { - final var lineNumber = 2; - final var columnNumber = 1; + final int lineNumber = 2; + final int columnNumber = 1; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -216,8 +216,8 @@ public void testPackage() { @Test public void testImport() { - final var lineNumber = 5; - final var columnNumber = 1; + final int lineNumber = 5; + final int columnNumber = 1; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -230,8 +230,8 @@ public void testImport() { @Test public void testMethodParams() { - final var lineNumber = 72; - final var columnNumber = 30; + final int lineNumber = 72; + final int columnNumber = 30; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -261,8 +261,8 @@ public void testMethodParams() { @Test public void testSwitch() { - final var lineNumber = 37; - final var columnNumber = 9; + final int lineNumber = 37; + final int columnNumber = 9; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -276,8 +276,8 @@ public void testSwitch() { @Test public void testSwitchCase() { - final var lineNumber = 38; - final var columnNumber = 13; + final int lineNumber = 38; + final int columnNumber = 13; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -295,8 +295,8 @@ public void testSwitchCase() { @Test public void testVariableStringLiteral() { - final var lineNumber = 47; - final var columnNumber = 26; + final int lineNumber = 47; + final int columnNumber = 26; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -316,8 +316,8 @@ public void testVariableStringLiteral() { @Test public void testComma() { - final var lineNumber = 66; - final var columnNumber = 36; + final int lineNumber = 66; + final int columnNumber = 36; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -332,8 +332,8 @@ public void testComma() { @Test public void testLiteralVoid() { - final var lineNumber = 65; - final var columnNumber = 12; + final int lineNumber = 65; + final int columnNumber = 12; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -349,8 +349,8 @@ public void testLiteralVoid() { @Test public void testFirstImport() { - final var lineNumber = 4; - final var columnNumber = 1; + final int lineNumber = 4; + final int columnNumber = 1; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -363,8 +363,8 @@ public void testFirstImport() { @Test public void testLastImport() { - final var lineNumber = 8; - final var columnNumber = 1; + final int lineNumber = 8; + final int columnNumber = 1; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -377,8 +377,8 @@ public void testLastImport() { @Test public void testImportByText() { - final var lineNumber = 4; - final var columnNumber = 8; + final int lineNumber = 4; + final int columnNumber = 8; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -391,8 +391,8 @@ public void testImportByText() { @Test public void testIdent() { - final var lineNumber = 12; - final var columnNumber = 14; + final int lineNumber = 12; + final int columnNumber = 14; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -411,9 +411,9 @@ public void testTabWidthBeforeMethodDef() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final var lineNumber = 4; - final var columnNumber = 13; - final var tabWidth = 4; + final int lineNumber = 4; + final int columnNumber = 13; + final int tabWidth = 4; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(detailAst, lineNumber, columnNumber, testFileText, tabWidth); final List actual = queryGenerator.generate(); @@ -440,9 +440,9 @@ public void testTabWidthAfterVoidLiteral() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final var lineNumber = 8; - final var columnNumber = 41; - final var tabWidth = 8; + final int lineNumber = 8; + final int columnNumber = 41; + final int tabWidth = 8; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(detailAst, lineNumber, columnNumber, testFileText, tabWidth); final List actual = queryGenerator.generate(); @@ -465,9 +465,9 @@ public void testTabWidthBeforeSlist() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final var lineNumber = 12; - final var columnNumber = 57; - final var tabWidth = 8; + final int lineNumber = 12; + final int columnNumber = 57; + final int tabWidth = 8; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(detailAst, lineNumber, columnNumber, testFileText, tabWidth); final List actual = queryGenerator.generate(); @@ -487,9 +487,9 @@ public void testTabWidthEndOfLine() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final var lineNumber = 16; - final var columnNumber = 58; - final var tabWidth = 8; + final int lineNumber = 16; + final int columnNumber = 58; + final int tabWidth = 8; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(detailAst, lineNumber, columnNumber, testFileText, tabWidth); final List actual = queryGenerator.generate(); @@ -503,8 +503,8 @@ public void testTabWidthEndOfLine() throws Exception { @Test public void testClassDefWithTokenType() { - final var lineNumber = 12; - final var columnNumber = 1; + final int lineNumber = 12; + final int columnNumber = 1; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(rootAst, lineNumber, columnNumber, TokenTypes.CLASS_DEF, fileText, DEFAULT_TAB_WIDTH); final List actual = queryGenerator.generate(); @@ -541,10 +541,10 @@ public void testEscapeCharacters() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final var tabWidth = 8; + final int tabWidth = 8; - final var lineNumberOne = 4; - final var columnNumberOne = 22; + final int lineNumberOne = 4; + final int columnNumberOne = 22; final XpathQueryGenerator queryGeneratorOne = new XpathQueryGenerator(detailAst, lineNumberOne, columnNumberOne, testFileText, tabWidth); final List actualTestOne = queryGeneratorOne.generate(); @@ -564,8 +564,8 @@ public void testEscapeCharacters() throws Exception { .that(actualTestOne) .isEqualTo(expectedTestOne); - final var lineNumberTwo = 6; - final var columnNumberTwo = 22; + final int lineNumberTwo = 6; + final int columnNumberTwo = 22; final XpathQueryGenerator queryGeneratorTwo = new XpathQueryGenerator(detailAst, lineNumberTwo, columnNumberTwo, testFileText, tabWidth); final List actualTestTwo = queryGeneratorTwo.generate(); @@ -592,10 +592,10 @@ public void testTextBlocks() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final var tabWidth = 8; + final int tabWidth = 8; - final var lineNumber = 6; - final var columnNumber = 25; + final int lineNumber = 6; + final int columnNumber = 25; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(detailAst, lineNumber, columnNumber, testFileText, tabWidth); final List actual = queryGenerator.generate(); @@ -619,10 +619,10 @@ public void testTextBlocksWithNewLine() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final var tabWidth = 8; + final int tabWidth = 8; - final var lineNumber = 6; - final var columnNumber = 25; + final int lineNumber = 6; + final int columnNumber = 25; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(detailAst, lineNumber, columnNumber, testFileText, tabWidth); final List actual = queryGenerator.generate(); @@ -646,10 +646,10 @@ public void testTextBlocksWithNewCrlf() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final var tabWidth = 8; + final int tabWidth = 8; - final var lineNumber = 6; - final var columnNumber = 25; + final int lineNumber = 6; + final int columnNumber = 25; final XpathQueryGenerator queryGenerator = new XpathQueryGenerator(detailAst, lineNumber, columnNumber, testFileText, tabWidth); final List actual = queryGenerator.generate(); @@ -674,10 +674,10 @@ public void testXpath() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final var tabWidth = 8; + final int tabWidth = 8; - final var lineNumberOne = 7; - final var columnNumberOne = 12; + final int lineNumberOne = 7; + final int columnNumberOne = 12; final XpathQueryGenerator queryGeneratorOne = new XpathQueryGenerator(detailAst, lineNumberOne, columnNumberOne, testFileText, tabWidth); final List actualTestOne = queryGeneratorOne.generate(); @@ -699,10 +699,10 @@ public void testXpath2() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final var tabWidth = 8; + final int tabWidth = 8; - final var lineNumber3 = 13; - final var columnNumber3 = 21; + final int lineNumber3 = 13; + final int columnNumber3 = 21; final XpathQueryGenerator queryGenerator3 = new XpathQueryGenerator(detailAst, lineNumber3, columnNumber3, testFileText, tabWidth); final List actualTest3 = queryGenerator3.generate(); @@ -723,10 +723,10 @@ public void testXpath3() throws Exception { StandardCharsets.UTF_8.name()); final DetailAST detailAst = JavaParser.parseFile(testFile, JavaParser.Options.WITHOUT_COMMENTS); - final var tabWidth = 8; + final int tabWidth = 8; - final var lineNumber2 = 10; - final var columnNumber2 = 17; + final int lineNumber2 = 10; + final int columnNumber2 = 17; final XpathQueryGenerator queryGenerator2 = new XpathQueryGenerator(detailAst, lineNumber2, columnNumber2, testFileText, tabWidth); final List actualTest = queryGenerator2.generate(); 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 a277df5e78a9..fdf2fc68cbc2 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 @@ -40,7 +40,7 @@ public void testCorrectOrder() { new TestNode()); try (ReverseListIterator iterator = new ReverseListIterator(nodes)) { - for (var i = nodes.size() - 1; i >= 0; i--) { + for (int i = nodes.size() - 1; i >= 0; i--) { assertWithMessage("Invalid node") .that(iterator.next()) .isEqualTo(nodes.get(i)); From 024d26b6d47bdbc62ddd27b735fd61f77950740f Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Fri, 26 Dec 2025 15:36:08 +0100 Subject: [PATCH 4/4] Issue #17487: Add `junit5.CleanupAssertions` --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 3d15e4c670a1..5e2e751d0838 100644 --- a/pom.xml +++ b/pom.xml @@ -677,6 +677,11 @@ rewrite-rewrite 0.17.0 + + org.openrewrite.recipe + rewrite-testing-frameworks + 3.24.0 +