|
20 | 20 | package org.sonar.plugins.java; |
21 | 21 |
|
22 | 22 | import java.util.Arrays; |
| 23 | +import java.util.Comparator; |
23 | 24 | import java.util.List; |
24 | 25 | import java.util.Set; |
25 | 26 | import java.util.stream.Collectors; |
@@ -1380,8 +1381,12 @@ public final class CheckList { |
1380 | 1381 | TooManyAssertionsCheck.class, |
1381 | 1382 | UnusedTestRuleCheck.class); |
1382 | 1383 |
|
1383 | | - private static final List<Class<?>> ALL_CHECKS = Stream.of(JAVA_MAIN_CHECKS, JAVA_TEST_CHECKS) |
1384 | | - .flatMap(List::stream).collect(Collectors.toList()); |
| 1384 | + private static final List<Class<? extends JavaCheck>> JAVA_MAIN_AND_TEST_CHECKS = Arrays.asList(); |
| 1385 | + |
| 1386 | + private static final List<Class<?>> ALL_CHECKS = Stream.of(JAVA_MAIN_CHECKS, JAVA_MAIN_AND_TEST_CHECKS, JAVA_TEST_CHECKS) |
| 1387 | + .flatMap(List::stream) |
| 1388 | + .sorted(Comparator.comparing(Class::getSimpleName)) |
| 1389 | + .collect(Collectors.toList()); |
1385 | 1390 |
|
1386 | 1391 | private static final Set<Class<? extends JavaCheck>> JAVA_CHECKS_NOT_WORKING_FOR_AUTOSCAN = Set.of( |
1387 | 1392 | // Symbolic executions rules are not in this list because they are dynamically excluded |
@@ -1439,15 +1444,22 @@ public static List<Class<?>> getChecks() { |
1439 | 1444 | } |
1440 | 1445 |
|
1441 | 1446 | public static List<Class<? extends JavaCheck>> getJavaChecks() { |
1442 | | - return JAVA_MAIN_CHECKS; |
| 1447 | + return sortedJoin(JAVA_MAIN_CHECKS, JAVA_MAIN_AND_TEST_CHECKS); |
1443 | 1448 | } |
1444 | 1449 |
|
1445 | 1450 | public static List<Class<? extends JavaCheck>> getJavaTestChecks() { |
1446 | | - return JAVA_TEST_CHECKS; |
| 1451 | + return sortedJoin(JAVA_MAIN_AND_TEST_CHECKS, JAVA_TEST_CHECKS); |
1447 | 1452 | } |
1448 | 1453 |
|
1449 | 1454 | public static Set<Class<? extends JavaCheck>> getJavaChecksNotWorkingForAutoScan() { |
1450 | 1455 | return JAVA_CHECKS_NOT_WORKING_FOR_AUTOSCAN; |
1451 | 1456 | } |
1452 | 1457 |
|
| 1458 | + @SafeVarargs |
| 1459 | + private static List<Class<? extends JavaCheck>> sortedJoin(List<Class<? extends JavaCheck>>... lists) { |
| 1460 | + return Arrays.stream(lists) |
| 1461 | + .flatMap(List::stream) |
| 1462 | + .sorted(Comparator.comparing(Class::getSimpleName)) |
| 1463 | + .toList(); |
| 1464 | + } |
1453 | 1465 | } |
0 commit comments