Fix quality gate (SonarSource#4590)

ericmorand-sonarsource · Mar 5, 2024 · fba5e23 · fba5e23
1 parent 52a6133
commit fba5e23
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/sonar-plugin/javascript-checks/src/main/java/org/sonar/javascript/checks/CheckList.java b/sonar-plugin/javascript-checks/src/main/java/org/sonar/javascript/checks/CheckList.java
@@ -22,7 +22,6 @@
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 import org.sonar.plugins.javascript.api.JavaScriptCheck;
 import org.sonar.plugins.javascript.api.JavaScriptRule;
 import org.sonar.plugins.javascript.api.TypeScriptRule;
@@ -48,10 +47,7 @@ private static List<Class<? extends JavaScriptCheck>> filterChecksByAnnotation(
     Class<? extends Annotation> annotation
   ) {
     List<Class<? extends JavaScriptCheck>> allChecks = getAllChecks();
-    return allChecks
-      .stream()
-      .filter(c -> c.isAnnotationPresent(annotation))
-      .collect(Collectors.toList());
+    return allChecks.stream().filter(c -> c.isAnnotationPresent(annotation)).toList();
   }
 
   public static List<Class<? extends JavaScriptCheck>> getAllChecks() {

diff --git a/sonar-plugin/javascript-checks/src/test/java/org/sonar/javascript/checks/CheckListTest.java b/sonar-plugin/javascript-checks/src/test/java/org/sonar/javascript/checks/CheckListTest.java
@@ -46,7 +46,7 @@ void count() throws Exception {
       .list(Paths.get("src/main/java/org/sonar/javascript/checks/"))
       .filter(p -> p.toString().endsWith("Check.java") && !p.toString().startsWith("Abstract"))
       .count();
-    assertThat(CheckList.getAllChecks().size()).isEqualTo(count);
+    assertThat(CheckList.getAllChecks()).hasSize((int) count);
   }
 
   /**
@@ -111,18 +111,17 @@ void test_eslint_key() throws IllegalAccessException, InstantiationException {
 
   @Test
   void testTypeScriptChecks() {
-    List<Class<? extends JavaScriptCheck>> typeScriptChecks = CheckList.getTypeScriptChecks();
-    assertThat(typeScriptChecks).isNotEmpty();
-    assertThat(typeScriptChecks).isNotEqualTo(CheckList.getAllChecks());
-    typeScriptChecks.removeIf(c -> c == ParsingErrorCheck.class);
-    assertThat(typeScriptChecks).allMatch(EslintBasedCheck.class::isAssignableFrom);
+    var typeScriptChecks = CheckList.getTypeScriptChecks();
+    assertThat(typeScriptChecks)
+      .isNotEmpty()
+      .isNotEqualTo(CheckList.getAllChecks())
+      .allMatch(c -> c == ParsingErrorCheck.class || EslintBasedCheck.class.isAssignableFrom(c));
   }
 
   @Test
   void testJavaScriptChecks() {
-    List<Class<? extends JavaScriptCheck>> javaScriptChecks = CheckList.getJavaScriptChecks();
-    assertThat(javaScriptChecks).isNotEmpty();
-    assertThat(javaScriptChecks).isNotEqualTo(CheckList.getAllChecks());
+    var javaScriptChecks = CheckList.getJavaScriptChecks();
+    assertThat(javaScriptChecks).isNotEmpty().isNotEqualTo(CheckList.getAllChecks());
   }
 
   @Test