#433 - Update dependency com.puppycrawl.tools:checkstyle to v10.22.0

README.adoc

@@ -1,5 +1,5 @@
 :release-version: 0.0.43
-:checkstyle-version: 9.3
+:checkstyle-version: 10.22.0
 == Spring Java Format
 
 

pom.xml

@@ -39,7 +39,7 @@
 		<ant-contrib.version>1.0b3</ant-contrib.version>
 		<asm.version>9.6</asm.version>
 		<assertj.version>3.8.0</assertj.version>
-		<checkstyle.version>9.3</checkstyle.version>
+		<checkstyle.version>10.22.0</checkstyle.version>
 		<groovy.version>2.4.21</groovy.version>
 		<log4j.version>2.17.1</log4j.version>
 		<maven-core.version>3.8.8</maven-core.version>

samples/spring-javaformat-maven-sample/pom.xml

@@ -32,7 +32,7 @@
 					<dependency>
 						<groupId>com.puppycrawl.tools</groupId>
 						<artifactId>checkstyle</artifactId>
-						<version>8.29</version>
+						<version>10.22.0</version>
 					</dependency>
 					<dependency>
 						<groupId>io.spring.javaformat</groupId>

spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/java/io/spring/format/formatter/intellij/monitor/FileMonitor.java

@@ -71,7 +71,7 @@ public static Factory factory() {
 	/**
 	 * Lister used to check for trigger file updates.
 	 */
-	private class Listener implements VirtualFileListener {
+	private final class Listener implements VirtualFileListener {
 
 		@Override
 		public void fileCreated(VirtualFileEvent event) {

spring-javaformat-intellij-idea/spring-javaformat-intellij-idea-plugin/src/main/java/io/spring/format/formatter/intellij/ui/StatusIndicator.java

@@ -83,8 +83,11 @@ private void hide(final StatusBar statusBar) {
 	/**
 	 * The {@link StatusBarWidget} component for the status.
 	 */
-	private static class Widget implements StatusBarWidget, StatusBarWidget.IconPresentation {
+	private static final class Widget implements StatusBarWidget, StatusBarWidget.IconPresentation {
 
+		/**
+		 * the icon.
+		 */
 		public static final Icon ICON = IconLoader.getIcon("/spring-javaformat/formatOn.png");
 
 		@Override

spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/check/AbstractSpringCheck.java

@@ -25,6 +25,9 @@
  */
 abstract class AbstractSpringCheck extends AbstractCheck {
 
+	/**
+	 * no required tokens.
+	 */
 	public static final int[] NO_REQUIRED_TOKENS = {};
 
 	@Override

spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/check/SpringHeaderCheck.java

@@ -242,7 +242,7 @@ public boolean run(FileText fileText, boolean blankLineAfter) {
 	/**
 	 * {@link HeaderCheck} to enforce that there is no header.
 	 */
-	private class NoHeaderCheck implements HeaderCheck {
+	private final class NoHeaderCheck implements HeaderCheck {
 
 		@Override
 		public boolean run(FileText fileText, boolean blankLineAfter) {

spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/check/SpringJUnit5Check.java

@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -42,25 +41,25 @@ public class SpringJUnit5Check extends AbstractSpringCheck {
 
 	private static final String JUNIT4_TEST_ANNOTATION_NAME = "org.junit.Test";
 
-	private static final List<Annotation> TEST_ANNOTATIONS;
+	private static final Set<Annotation> TEST_ANNOTATIONS;
 	static {
 		Set<Annotation> annotations = new LinkedHashSet<>();
 		annotations.add(new Annotation("org.junit.jupiter.api", "RepeatedTest"));
 		annotations.add(new Annotation("org.junit.jupiter.api", "Test"));
 		annotations.add(new Annotation("org.junit.jupiter.api", "TestFactory"));
 		annotations.add(new Annotation("org.junit.jupiter.api", "TestTemplate"));
 		annotations.add(new Annotation("org.junit.jupiter.api", "ParameterizedTest"));
-		TEST_ANNOTATIONS = Collections.unmodifiableList(new ArrayList<>(annotations));
+		TEST_ANNOTATIONS = Collections.unmodifiableSet(annotations);
 	}
 
-	private static final List<Annotation> LIFECYCLE_ANNOTATIONS;
+	private static final Set<Annotation> LIFECYCLE_ANNOTATIONS;
 	static {
 		Set<Annotation> annotations = new LinkedHashSet<>();
 		annotations.add(new Annotation("org.junit.jupiter.api", "BeforeAll"));
 		annotations.add(new Annotation("org.junit.jupiter.api", "BeforeEach"));
 		annotations.add(new Annotation("org.junit.jupiter.api", "AfterAll"));
 		annotations.add(new Annotation("org.junit.jupiter.api", "AfterEach"));
-		LIFECYCLE_ANNOTATIONS = Collections.unmodifiableList(new ArrayList<>(annotations));
+		LIFECYCLE_ANNOTATIONS = Collections.unmodifiableSet(annotations);
 	}
 
 	private static final Annotation NESTED_ANNOTATION = new Annotation("org.junit.jupiter.api", "Nested");
@@ -120,32 +119,19 @@ public void visitToken(DetailAST ast) {
 	}
 
 	private void visitMethodDef(DetailAST ast) {
-		if (containsAnnotation(ast, TEST_ANNOTATIONS)) {
+		if (containsAnnotation(ast, TEST_ANNOTATIONS) || AnnotationUtil.containsAnnotation(ast, JUNIT4_TEST_ANNOTATION_NAME)) {
 			this.testMethods.add(ast);
 		}
 		if (containsAnnotation(ast, LIFECYCLE_ANNOTATIONS)) {
 			this.lifecycleMethods.add(ast);
 		}
 	}
 
-	private boolean containsAnnotation(DetailAST ast, List<Annotation> annotations) {
-		List<String> annotationNames = annotations.stream()
-			.flatMap((annotation) -> Stream.of(annotation.simpleName, annotation.fullyQualifiedName()))
-			.collect(Collectors.toList());
-		try {
-			return AnnotationUtil.containsAnnotation(ast, annotationNames);
-		}
-		catch (NoSuchMethodError ex) {
-			// Checkstyle >= 10.3 (https://github.com/checkstyle/checkstyle/issues/14134)
-			Set<String> annotationNamesSet = new HashSet<>(annotationNames);
-			try {
-				return (boolean) AnnotationUtil.class.getMethod("containsAnnotation", DetailAST.class, Set.class)
-					.invoke(null, ast, annotationNamesSet);
-			}
-			catch (Exception ex2) {
-				throw new RuntimeException("containsAnnotation failed", ex2);
-			}
-		}
+	private boolean containsAnnotation(DetailAST ast, Set<Annotation> annotations) {
+		Set<String> annotationNames = annotations.stream()
+			.flatMap(annotation -> Stream.of(annotation.simpleName, annotation.fullyQualifiedName()))
+			.collect(Collectors.toSet());
+		return AnnotationUtil.containsAnnotation(ast, annotationNames);
 	}
 
 	private void visitImport(DetailAST ast) {
@@ -158,7 +144,7 @@ private void visitClassDefinition(DetailAST ast) {
 			this.testClass = ast;
 		}
 		else {
-			if (containsAnnotation(ast, Arrays.asList(NESTED_ANNOTATION))) {
+			if (containsAnnotation(ast, Collections.singleton(NESTED_ANNOTATION))) {
 				this.nestedTestClasses.add(ast);
 			}
 		}

spring-javaformat/spring-javaformat-checkstyle/src/main/resources/io/spring/javaformat/checkstyle/spring-checkstyle.xml

@@ -90,7 +90,7 @@
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck" />
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
-			<property name="scope" value="public"/>
+			<property name="accessModifiers" value="public"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck">
 			<property name="checkEmptyJavadoc" value="true"/>

spring-javaformat/spring-javaformat-checkstyle/src/test/java/io/spring/javaformat/checkstyle/SpringChecksTests.java

@@ -134,7 +134,7 @@ private static boolean sourceFile(File file) {
 		return file.isFile() && !file.getName().startsWith(".") && !file.getName().equals("package-info.java");
 	}
 
-	private static class Parameter {
+	private static final class Parameter {
 
 		private final String name;
 

spring-javaformat/spring-javaformat-checkstyle/src/test/java/io/spring/javaformat/checkstyle/SpringConfigurationLoaderTests.java

@@ -50,9 +50,9 @@ public void loadShouldLoadChecks() {
 		assertThat(checks).hasSize(5);
 		TreeWalker treeWalker = (TreeWalker) checks.toArray()[4];
 		Set<?> ordinaryChecks = (Set<?>) Extractors.byName("ordinaryChecks").extract(treeWalker);
-		assertThat(ordinaryChecks).hasSize(61);
+		assertThat(ordinaryChecks).hasSize(60);
 		Set<?> commentChecks = (Set<?>) Extractors.byName("commentChecks").extract(treeWalker);
-		assertThat(commentChecks).hasSize(6);
+		assertThat(commentChecks).hasSize(7);
 	}
 
 	@Test
@@ -64,9 +64,9 @@ public void loadWithExcludeShouldExcludeChecks() {
 		assertThat(checks).hasSize(5);
 		TreeWalker treeWalker = (TreeWalker) checks.toArray()[4];
 		Set<?> ordinaryChecks = (Set<?>) Extractors.byName("ordinaryChecks").extract(treeWalker);
-		assertThat(ordinaryChecks).hasSize(60);
+		assertThat(ordinaryChecks).hasSize(59);
 		Set<?> commentChecks = (Set<?>) Extractors.byName("commentChecks").extract(treeWalker);
-		assertThat(commentChecks).hasSize(5);
+		assertThat(commentChecks).hasSize(6);
 	}
 
 	@Test

spring-javaformat/spring-javaformat-checkstyle/src/test/resources/source/JUnit5BadModifier.java

@@ -99,7 +99,7 @@ public void nestedPublicTest() {
 	}
 
 	@Nested
-	private static class PrivateNestedTests {
+	private static final class PrivateNestedTests {
 
 	}
 

spring-javaformat/spring-javaformat-checkstyle/src/test/resources/source/JavadocMissingSince.java

@@ -24,7 +24,7 @@ public class JavadocMissingSince {
 	/**
 	 * Inner class.
 	 */
-	private static class Inner {
+	private static final class Inner {
 
 	}
 

spring-javaformat/spring-javaformat-checkstyle/src/test/resources/source/JavadocNonPublicSince.java

@@ -27,7 +27,7 @@ class JavadocNonPublicSince {
 	 *
 	 * @since 1.2.3
 	 */
-	private static class Inner {
+	private static final class Inner {
 
 	}
 

spring-javaformat/spring-javaformat-checkstyle/src/test/resources/source/MethodVisibilityInnerClassesWithPublicMethod.java

@@ -21,7 +21,7 @@
  */
 public class MethodVisibilityInnerClassesWithPublicMethod {
 
-	private static class PrivateInnerClass {
+	private static final class PrivateInnerClass {
 
 		public void badPrivateInner() {
 		}

spring-javaformat/spring-javaformat-checkstyle/src/test/resources/source/MethodVisibilityWithOverride.java

@@ -21,7 +21,7 @@
  */
 public class MethodVisibilityWithOverride {
 
-	private static class PrivateInnerClass {
+	private static final class PrivateInnerClass {
 
 		@Override
 		public void okPrivateInner() {

spring-javaformat/spring-javaformat-formatter-eclipse-rewriter/src/main/java/io/spring/javaformat/formatter/eclipse/rewrite/EclipseRewriter.java

@@ -254,7 +254,15 @@ public void visitEnd() {
 
 	enum JdkVersion {
 
-		V8, V11
+		/**
+		 * JDK version 8.
+		 */
+		V8,
+
+		/**
+		 * JDK version 11.
+		 */
+		V11
 
 	}
 

src/checkstyle/checkstyle.xml

@@ -93,7 +93,7 @@
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck" />
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
-			<property name="scope" value="public"/>
+			<property name="accessModifiers" value="public"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck">
 			<property name="checkEmptyJavadoc" value="true"/>