Skip to content

Commit 4d3417e

Browse files
committed
Replace JavadocStyleCheck with more focused javadoc checks
Replace `JavadocStyleCheck` with the more focused `SummaryJavadocCheck` and `MissingJavadocPackageCheck` to ensure compatibility with checkstyle 13.9.0+. Fixes gh-479
1 parent 3036fca commit 4d3417e

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@
9090
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
9191
<property name="{{javadocVariableCheckScopeProperty}}" value="public"/>
9292
</module>
93-
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck">
94-
<property name="checkEmptyJavadoc" value="true"/>
95-
</module>
93+
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.SummaryJavadocCheck" />
94+
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocPackageCheck" />
95+
9696
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck" />
9797
<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck">
9898
<property name="offset" value="0"/>

‎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(63);
53+
assertThat(ordinaryChecks).hasSize(62);
5454
Set<?> commentChecks = (Set<?>) Extractors.byName("commentChecks").extract(treeWalker);
55-
assertThat(commentChecks).hasSize(6);
55+
assertThat(commentChecks).hasSize(8);
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(62);
67+
assertThat(ordinaryChecks).hasSize(61);
6868
Set<?> commentChecks = (Set<?>) Extractors.byName("commentChecks").extract(treeWalker);
69-
assertThat(commentChecks).hasSize(5);
69+
assertThat(commentChecks).hasSize(7);
7070
}
7171

7272
@Test

0 commit comments

Comments
 (0)