Skip to content

Commit 9563519

Browse files
JAVASE-7 Remove NullDereferenceCheck registration from the plugin (#26)
1 parent b050a45 commit 9563519

File tree

9 files changed

+5
-187
lines changed

9 files changed

+5
-187
lines changed

its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public class JavaRulingTest {
6161
private static final Logger LOG = LoggerFactory.getLogger(JavaRulingTest.class);
6262

6363
private static final ImmutableSet<String> SUBSET_OF_ENABLED_RULES = ImmutableSet.of(
64-
"S2095", "S2189", "S2222", "S2259", "S2583", "S2589", "S2637", "S2689", "S2755", "S3065",
64+
"S2095", "S2189", "S2222", "S2583", "S2589", "S2637", "S2689", "S2755", "S3065",
6565
"S3516", "S3518", "S3546", "S3655", "S3824", "S3958", "S3959", "S4165", "S4449", "S6373", "S6374", "S6376", "S6377");
6666

6767
@ClassRule
@@ -96,7 +96,7 @@ public static void prepare() throws Exception {
9696
List<String> extraNonDefaultRules = List.of("S3546", "S6374");
9797
ProfileGenerator.generate(ORCHESTRATOR, "Sonar Way", ImmutableMap.of(), new HashSet<>(), SUBSET_OF_ENABLED_RULES, result,
9898
extraNonDefaultRules);
99-
assertThat(result).hasSize(23); // ALL symbolic-execution rules
99+
assertThat(result).hasSize(22); // ALL symbolic-execution rules
100100

101101
Path allRulesFolder = Paths.get("src/test/resources");
102102
effectiveDumpOldFolder = tmpDumpOldFolder.getRoot().toPath().toAbsolutePath();

java-symbolic-execution/java-symbolic-execution-plugin/src/main/java/org/sonar/java/se/plugin/JavaSECheckList.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.sonar.java.se.checks.MinMaxRangeCheck;
3030
import org.sonar.java.se.checks.NoWayOutLoopCheck;
3131
import org.sonar.java.se.checks.NonNullSetToNullCheck;
32-
import org.sonar.java.se.checks.NullDereferenceCheck;
3332
import org.sonar.java.se.checks.ObjectOutputStreamCheck;
3433
import org.sonar.java.se.checks.OptionalGetBeforeIsPresentCheck;
3534
import org.sonar.java.se.checks.ParameterNullnessCheck;
@@ -51,7 +50,6 @@ private JavaSECheckList(){
5150
public static List<Class<? extends SECheck>> getChecks() {
5251
return List.of(
5352
// SEChecks ordered by ExplodedGraphWalker need
54-
NullDereferenceCheck.class,
5553
DivisionByZeroCheck.class,
5654
UnclosedResourcesCheck.class,
5755
LocksNotUnlockedCheck.class,

java-symbolic-execution/java-symbolic-execution-plugin/src/main/java/org/sonar/java/se/plugin/RulesList.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public static List<RuleKey> getSonarWayRuleKeys() {
2929
"S2095",
3030
"S2189",
3131
"S2222",
32-
"S2259",
3332
"S2583",
3433
"S2589",
3534
"S2637",

java-symbolic-execution/java-symbolic-execution-plugin/src/main/resources/org/sonar/l10n/java/rules/javase/S2259.html

Lines changed: 0 additions & 144 deletions
This file was deleted.

java-symbolic-execution/java-symbolic-execution-plugin/src/main/resources/org/sonar/l10n/java/rules/javase/S2259.json

Lines changed: 0 additions & 34 deletions
This file was deleted.

java-symbolic-execution/java-symbolic-execution-plugin/src/main/resources/org/sonar/l10n/java/rules/javase/Sonar_way_profile.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"S2095",
55
"S2189",
66
"S2222",
7-
"S2259",
87
"S2583",
98
"S2589",
109
"S2637",

java-symbolic-execution/java-symbolic-execution-plugin/src/test/java/org/sonar/java/se/plugin/JavaSECheckListTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class JavaSECheckListTest {
2424

2525
@Test
2626
void getChecks() {
27-
assertThat(JavaSECheckList.getChecks()).isNotNull().hasSize(23);
27+
assertThat(JavaSECheckList.getChecks()).isNotNull().hasSize(22);
2828
}
2929

3030
}

java-symbolic-execution/java-symbolic-execution-plugin/src/test/java/org/sonar/java/se/plugin/JavaSECheckRegistrarTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void rules_definition() {
8585
assertThat(repository.name()).isEqualTo("Sonar");
8686
assertThat(repository.language()).isEqualTo("java");
8787
List<RulesDefinition.Rule> rules = repository.rules();
88-
assertThat(rules).hasSize(23);
88+
assertThat(rules).hasSize(22);
8989

9090
var activeByDefault = rules.stream()
9191
.filter(k -> !rulesNotActiveByDefault.contains(k.key()))

java-symbolic-execution/java-symbolic-execution-plugin/src/test/java/org/sonar/java/se/plugin/JavaSEProfileRegistrarTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void constructor() {
2828
JavaSEProfileRegistrar registrar = new JavaSEProfileRegistrar();
2929
TestProfileRegistrarContext context = new TestProfileRegistrarContext();
3030
registrar.register(context);
31-
assertThat(context.defaultQualityProfileRules).hasSize(21); // 2 are not in the default profile
31+
assertThat(context.defaultQualityProfileRules).hasSize(20); // 2 are not in the default profile
3232
}
3333

3434
}

0 commit comments

Comments
 (0)