Skip to content

Commit c0466f1

Browse files
LarciusLarcius
committed
spring-io#433 - Update dependency com.puppycrawl.tools:checkstyle to v10.22.0
1 parent def2b30 commit c0466f1

File tree

18 files changed

+44
-44
lines changed

18 files changed

+44
-44
lines changed

‎README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
:release-version: 0.0.43
2-
:checkstyle-version: 9.3
2+
:checkstyle-version: 10.22.0
33
== Spring Java Format
44

55

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<ant-contrib.version>1.0b3</ant-contrib.version>
4040
<asm.version>9.6</asm.version>
4141
<assertj.version>3.8.0</assertj.version>
42-
<checkstyle.version>9.3</checkstyle.version>
42+
<checkstyle.version>10.22.0</checkstyle.version>
4343
<groovy.version>2.4.21</groovy.version>
4444
<log4j.version>2.17.1</log4j.version>
4545
<maven-core.version>3.8.8</maven-core.version>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>com.puppycrawl.tools</groupId>
3434
<artifactId>checkstyle</artifactId>
35-
<version>8.29</version>
35+
<version>10.22.0</version>
3636
</dependency>
3737
<dependency>
3838
<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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public static Factory factory() {
7171
/**
7272
* Lister used to check for trigger file updates.
7373
*/
74-
private class Listener implements VirtualFileListener {
74+
private final class Listener implements VirtualFileListener {
7575

7676
@Override
7777
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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,11 @@ private void hide(final StatusBar statusBar) {
8383
/**
8484
* The {@link StatusBarWidget} component for the status.
8585
*/
86-
private static class Widget implements StatusBarWidget, StatusBarWidget.IconPresentation {
86+
private static final class Widget implements StatusBarWidget, StatusBarWidget.IconPresentation {
8787

88+
/**
89+
* the icon.
90+
*/
8891
public static final Icon ICON = IconLoader.getIcon("/spring-javaformat/formatOn.png");
8992

9093
@Override

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
*/
2626
abstract class AbstractSpringCheck extends AbstractCheck {
2727

28+
/**
29+
* no required tokens.
30+
*/
2831
public static final int[] NO_REQUIRED_TOKENS = {};
2932

3033
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ public boolean run(FileText fileText, boolean blankLineAfter) {
242242
/**
243243
* {@link HeaderCheck} to enforce that there is no header.
244244
*/
245-
private class NoHeaderCheck implements HeaderCheck {
245+
private final class NoHeaderCheck implements HeaderCheck {
246246

247247
@Override
248248
public boolean run(FileText fileText, boolean blankLineAfter) {

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

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.ArrayList;
2020
import java.util.Arrays;
2121
import java.util.Collections;
22-
import java.util.HashSet;
2322
import java.util.LinkedHashMap;
2423
import java.util.LinkedHashSet;
2524
import java.util.List;
@@ -42,25 +41,25 @@ public class SpringJUnit5Check extends AbstractSpringCheck {
4241

4342
private static final String JUNIT4_TEST_ANNOTATION_NAME = "org.junit.Test";
4443

45-
private static final List<Annotation> TEST_ANNOTATIONS;
44+
private static final Set<Annotation> TEST_ANNOTATIONS;
4645
static {
4746
Set<Annotation> annotations = new LinkedHashSet<>();
4847
annotations.add(new Annotation("org.junit.jupiter.api", "RepeatedTest"));
4948
annotations.add(new Annotation("org.junit.jupiter.api", "Test"));
5049
annotations.add(new Annotation("org.junit.jupiter.api", "TestFactory"));
5150
annotations.add(new Annotation("org.junit.jupiter.api", "TestTemplate"));
5251
annotations.add(new Annotation("org.junit.jupiter.api", "ParameterizedTest"));
53-
TEST_ANNOTATIONS = Collections.unmodifiableList(new ArrayList<>(annotations));
52+
TEST_ANNOTATIONS = Collections.unmodifiableSet(annotations);
5453
}
5554

56-
private static final List<Annotation> LIFECYCLE_ANNOTATIONS;
55+
private static final Set<Annotation> LIFECYCLE_ANNOTATIONS;
5756
static {
5857
Set<Annotation> annotations = new LinkedHashSet<>();
5958
annotations.add(new Annotation("org.junit.jupiter.api", "BeforeAll"));
6059
annotations.add(new Annotation("org.junit.jupiter.api", "BeforeEach"));
6160
annotations.add(new Annotation("org.junit.jupiter.api", "AfterAll"));
6261
annotations.add(new Annotation("org.junit.jupiter.api", "AfterEach"));
63-
LIFECYCLE_ANNOTATIONS = Collections.unmodifiableList(new ArrayList<>(annotations));
62+
LIFECYCLE_ANNOTATIONS = Collections.unmodifiableSet(annotations);
6463
}
6564

6665
private static final Annotation NESTED_ANNOTATION = new Annotation("org.junit.jupiter.api", "Nested");
@@ -120,32 +119,19 @@ public void visitToken(DetailAST ast) {
120119
}
121120

122121
private void visitMethodDef(DetailAST ast) {
123-
if (containsAnnotation(ast, TEST_ANNOTATIONS)) {
122+
if (containsAnnotation(ast, TEST_ANNOTATIONS) || AnnotationUtil.containsAnnotation(ast, JUNIT4_TEST_ANNOTATION_NAME)) {
124123
this.testMethods.add(ast);
125124
}
126125
if (containsAnnotation(ast, LIFECYCLE_ANNOTATIONS)) {
127126
this.lifecycleMethods.add(ast);
128127
}
129128
}
130129

131-
private boolean containsAnnotation(DetailAST ast, List<Annotation> annotations) {
132-
List<String> annotationNames = annotations.stream()
133-
.flatMap((annotation) -> Stream.of(annotation.simpleName, annotation.fullyQualifiedName()))
134-
.collect(Collectors.toList());
135-
try {
136-
return AnnotationUtil.containsAnnotation(ast, annotationNames);
137-
}
138-
catch (NoSuchMethodError ex) {
139-
// Checkstyle >= 10.3 (https://github.com/checkstyle/checkstyle/issues/14134)
140-
Set<String> annotationNamesSet = new HashSet<>(annotationNames);
141-
try {
142-
return (boolean) AnnotationUtil.class.getMethod("containsAnnotation", DetailAST.class, Set.class)
143-
.invoke(null, ast, annotationNamesSet);
144-
}
145-
catch (Exception ex2) {
146-
throw new RuntimeException("containsAnnotation failed", ex2);
147-
}
148-
}
130+
private boolean containsAnnotation(DetailAST ast, Set<Annotation> annotations) {
131+
Set<String> annotationNames = annotations.stream()
132+
.flatMap(annotation -> Stream.of(annotation.simpleName, annotation.fullyQualifiedName()))
133+
.collect(Collectors.toSet());
134+
return AnnotationUtil.containsAnnotation(ast, annotationNames);
149135
}
150136

151137
private void visitImport(DetailAST ast) {
@@ -158,7 +144,7 @@ private void visitClassDefinition(DetailAST ast) {
158144
this.testClass = ast;
159145
}
160146
else {
161-
if (containsAnnotation(ast, Arrays.asList(NESTED_ANNOTATION))) {
147+
if (containsAnnotation(ast, Collections.singleton(NESTED_ANNOTATION))) {
162148
this.nestedTestClasses.add(ast);
163149
}
164150
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
</module>
9191
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck" />
9292
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
93-
<property name="scope" value="public"/>
93+
<property name="accessModifiers" value="public"/>
9494
</module>
9595
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck">
9696
<property name="checkEmptyJavadoc" value="true"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ private static boolean sourceFile(File file) {
134134
return file.isFile() && !file.getName().startsWith(".") && !file.getName().equals("package-info.java");
135135
}
136136

137-
private static class Parameter {
137+
private static final class Parameter {
138138

139139
private final String name;
140140

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ public void loadShouldLoadChecks() {
5050
assertThat(checks).hasSize(5);
5151
TreeWalker treeWalker = (TreeWalker) checks.toArray()[4];
5252
Set<?> ordinaryChecks = (Set<?>) Extractors.byName("ordinaryChecks").extract(treeWalker);
53-
assertThat(ordinaryChecks).hasSize(61);
53+
assertThat(ordinaryChecks).hasSize(60);
5454
Set<?> commentChecks = (Set<?>) Extractors.byName("commentChecks").extract(treeWalker);
55-
assertThat(commentChecks).hasSize(6);
55+
assertThat(commentChecks).hasSize(7);
5656
}
5757

5858
@Test
@@ -64,9 +64,9 @@ public void loadWithExcludeShouldExcludeChecks() {
6464
assertThat(checks).hasSize(5);
6565
TreeWalker treeWalker = (TreeWalker) checks.toArray()[4];
6666
Set<?> ordinaryChecks = (Set<?>) Extractors.byName("ordinaryChecks").extract(treeWalker);
67-
assertThat(ordinaryChecks).hasSize(60);
67+
assertThat(ordinaryChecks).hasSize(59);
6868
Set<?> commentChecks = (Set<?>) Extractors.byName("commentChecks").extract(treeWalker);
69-
assertThat(commentChecks).hasSize(5);
69+
assertThat(commentChecks).hasSize(6);
7070
}
7171

7272
@Test

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void nestedPublicTest() {
9999
}
100100

101101
@Nested
102-
private static class PrivateNestedTests {
102+
private static final class PrivateNestedTests {
103103

104104
}
105105

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class JavadocMissingSince {
2424
/**
2525
* Inner class.
2626
*/
27-
private static class Inner {
27+
private static final class Inner {
2828

2929
}
3030

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class JavadocNonPublicSince {
2727
*
2828
* @since 1.2.3
2929
*/
30-
private static class Inner {
30+
private static final class Inner {
3131

3232
}
3333

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
public class MethodVisibilityInnerClassesWithPublicMethod {
2323

24-
private static class PrivateInnerClass {
24+
private static final class PrivateInnerClass {
2525

2626
public void badPrivateInner() {
2727
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
public class MethodVisibilityWithOverride {
2323

24-
private static class PrivateInnerClass {
24+
private static final class PrivateInnerClass {
2525

2626
@Override
2727
public void okPrivateInner() {

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,15 @@ public void visitEnd() {
254254

255255
enum JdkVersion {
256256

257-
V8, V11
257+
/**
258+
* JDK version 8.
259+
*/
260+
V8,
261+
262+
/**
263+
* JDK version 11.
264+
*/
265+
V11
258266

259267
}
260268

‎src/checkstyle/checkstyle.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</module>
9494
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck" />
9595
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
96-
<property name="scope" value="public"/>
96+
<property name="accessModifiers" value="public"/>
9797
</module>
9898
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck">
9999
<property name="checkEmptyJavadoc" value="true"/>

0 commit comments

Comments
 (0)