Apply UnnecessarySemicolonInEnumeration Checkstyle module

This commit also applies it to this project itself and fixes its violations. See gh-408
spring-io · Mar 28, 2024 · 1317cbc · 1317cbc
1 parent c31476f
commit 1317cbc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/...ormat-checkstyle/src/main/resources/io/spring/javaformat/checkstyle/spring-checkstyle.xml b/...ormat-checkstyle/src/main/resources/io/spring/javaformat/checkstyle/spring-checkstyle.xml
@@ -70,6 +70,7 @@
  <property name="validateOnlyOverlapping" value="false" />
  </module>
  <module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck" />
+ <module name="com.puppycrawl.tools.checkstyle.checks.coding.UnnecessarySemicolonInEnumerationCheck"/>
 
  <!-- Imports -->
  <module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck" />

diff --git a/...ckstyle/src/test/java/io/spring/javaformat/checkstyle/SpringConfigurationLoaderTests.java b/...ckstyle/src/test/java/io/spring/javaformat/checkstyle/SpringConfigurationLoaderTests.java
@@ -48,7 +48,7 @@ public void loadShouldLoadChecks() {
  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(61);
  }
 
  @Test
@@ -59,7 +59,7 @@ public void loadWithExcludeShouldExcludeChecks() {
  assertThat(checks).hasSize(5);
  TreeWalker treeWalker = (TreeWalker) checks.toArray()[4];
  Set<?> ordinaryChecks = (Set<?>) Extractors.byName("ordinaryChecks").extract(treeWalker);
- assertThat(ordinaryChecks).hasSize(59);
+ assertThat(ordinaryChecks).hasSize(60);
  }
 
  @Test

diff --git a/...matter-eclipse-jdt-jdk17/src/main/java/org/eclipse/jdt/internal/formatter/Preparator.java b/...matter-eclipse-jdt-jdk17/src/main/java/org/eclipse/jdt/internal/formatter/Preparator.java
@@ -54,7 +54,7 @@ enum Phase {
  /**
  * Apply the preparator after wrapping.
  */
- POST_WRAPPING;
+ POST_WRAPPING
 
  }
 

diff --git a/...rmatter-eclipse-jdt-jdk8/src/main/java/org/eclipse/jdt/internal/formatter/Preparator.java b/...rmatter-eclipse-jdt-jdk8/src/main/java/org/eclipse/jdt/internal/formatter/Preparator.java
@@ -54,7 +54,7 @@ enum Phase {
  /**
  * Apply the preparator after wrapping.
  */
- POST_WRAPPING;
+ POST_WRAPPING
 
  }
 

diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
@@ -65,6 +65,7 @@
  <property name="validateOnlyOverlapping" value="false" />
  </module>
  <module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck" />
+ <module name="com.puppycrawl.tools.checkstyle.checks.coding.UnnecessarySemicolonInEnumerationCheck"/>
 
  <!-- Imports -->
  <module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck" />