@org.springframework.beans.factory.annotation.Autowired @javax.inject.Inject @com.fasterxml.jackson.annotation.JsonCreator @io.micronaut.http.annotation.Get) may have a lot of parameters, encapsulation being possible. Such methods are therefore ignored.
+Also, if a class annotated as a Spring component (like @org.springframework.stereotype.Component) has a single constructor, that
+constructor will be considered @Autowired and ignored by the rule.
Default (no-argument) constructors are ignored when there are other constructors in the class, as are empty methods in abstract classes.
+This does not raise an issue in the following cases:
+@org.aspectj.lang.annotation.Pointcut()
public abstract class Animal {
void speak() { // default implementation ignored
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1186_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1186.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1186_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1186.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1188_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1188.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1188_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1188.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1188_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1188.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1188_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1188.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S119_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S119.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S119_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S119.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S119_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S119.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S119_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S119.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1190_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1190.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1190_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1190.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1190_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1190.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1190_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1190.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1191_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1191.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1191_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1191.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1191_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1191.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1191_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1191.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1192_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1192.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1192_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1192.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1192_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1192.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1192_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1192.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1193_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1193.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1193_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1193.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1193_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1193.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1193_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1193.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1194_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1194.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1194_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1194.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1194_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1194.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1194_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1194.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1195_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1195.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1195_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1195.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1195_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1195.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1195_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1195.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1197_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1197.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1197_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1197.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1197_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1197.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1197_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1197.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1199_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1199.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1199_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1199.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1199_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1199.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1199_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1199.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S120_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S120.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S120_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S120.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S120_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S120.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S120_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S120.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1200_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1200.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1200_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1200.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1200_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1200.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1200_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1200.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1201_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1201.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1201_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1201.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1201_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1201.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1201_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1201.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1206_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1206.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1206_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1206.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1206_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1206.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1206_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1206.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S121_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S121.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S121_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S121.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S121_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S121.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S121_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S121.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1210_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1210.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1210_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1210.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1210_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1210.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1210_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1210.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1213_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1213.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1213_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1213.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1213_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1213.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1213_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1213.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1214_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1214.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1214_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1214.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1214_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1214.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1214_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1214.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1215_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1215.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1215_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1215.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1215_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1215.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1215_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1215.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1217_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1217.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1217_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1217.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1217_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1217.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1217_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1217.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1219_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1219.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1219_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1219.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1219_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1219.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1219_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1219.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S122_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S122.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S122_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S122.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S122_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S122.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S122_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S122.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1220_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1220.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1220_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1220.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1220_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1220.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1220_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1220.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1221_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1221.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1221_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1221.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1221_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1221.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1221_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1221.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1223_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1223.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1223_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1223.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1223_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1223.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1223_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1223.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1226_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1226.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1226_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1226.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1226_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1226.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1226_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1226.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1228_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1228.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1228_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1228.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1228_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1228.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1228_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1228.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S124_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S124.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S124_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S124.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S124_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S124.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S124_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S124.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1244_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1244.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1244_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1244.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1244_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1244.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1244_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1244.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S125_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S125.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S125_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S125.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S125_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S125.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S125_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S125.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1258_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1258.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1258_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1258.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1258_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1258.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1258_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1258.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S126_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S126.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S126_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S126.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S126_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S126.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S126_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S126.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1264_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1264.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1264_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1264.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1264_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1264.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1264_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1264.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S127_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S127.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S127_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S127.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S127_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S127.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S127_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S127.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S128_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S128.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S128_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S128.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S128_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S128.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S128_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S128.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1301_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1301.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1301_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1301.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1301_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1301.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1301_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1301.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1309_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1309.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1309_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1309.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1309_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1309.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1309_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1309.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S131_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S131.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S131_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S131.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S131_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S131.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S131_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S131.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1310_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1310.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1310_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1310.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1310_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1310.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1310_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1310.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1312_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1312.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1312_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1312.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1312_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1312.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1312_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1312.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1313_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1313.html
similarity index 94%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1313_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1313.html
index 8f1ad651ca6..8648b39b783 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1313_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1313.html
@@ -47,8 +47,8 @@ Exceptions
See
-Connection conn = null;
-try {
- conn = DriverManager.getConnection("jdbc:mysql://localhost/test?" +
- "user=steve&password=blue"); // Sensitive
- String uname = "steve";
- String password = "blue";
- conn = DriverManager.getConnection("jdbc:mysql://localhost/test?" +
- "user=" + uname + "&password=" + password); // Sensitive
-
- java.net.PasswordAuthentication pa = new java.net.PasswordAuthentication("userName", "1234".toCharArray()); // Sensitive
+String username = "steve";
+String password = "blue";
+Connection conn = DriverManager.getConnection("jdbc:mysql://localhost/test?" +
+ "user=" + uname + "&password=" + password); // Sensitive
-Connection conn = null;
-try {
- String uname = getEncryptedUser();
- String password = getEncryptedPass();
- conn = DriverManager.getConnection("jdbc:mysql://localhost/test?" +
- "user=" + uname + "&password=" + password);
+String username = getEncryptedUser();
+String password = getEncryptedPassword();
+Connection conn = DriverManager.getConnection("jdbc:mysql://localhost/test?" +
+ "user=" + uname + "&password=" + password);
There is a risk if you answered yes to any of those questions.
When parsing the XML file, the content of the external entities is retrieved from an external storage such as the file system or network, which may lead, if no restrictions are put in place, to arbitrary file disclosures or server-side request forgery (SSRF) vulnerabilities.
+href="https://owasp.org/www-community/attacks/Server_Side_Request_Forgery">server-side request forgery (SSRF) vulnerabilities.It’s recommended to limit resolution of external entities by using one of these solutions:
Cognitive Complexity is a measure of how hard the control flow of a method is to understand. Methods with high Cognitive Complexity will be difficult to maintain.
+equals and hashCode methods are ignored because they might be automatically generated and might end up being difficult to
+understand, especially in presence of many fields.
It is recommended to secure all transport channels (even local network) as it can take a single non secure connection to compromise an entire application or system.
@@ -121,8 +121,8 @@Encryption operation mode and the padding scheme should be chosen appropriately to guarantee data confidentiality, integrity and authenticity:
+Encryption algorithms should use secure modes and padding schemes where appropriate to guarantee data confidentiality and integrity.
-Cipher c1 = Cipher.getInstance("AES"); // Noncompliant: by default ECB mode is chosen
-Cipher c2 = Cipher.getInstance("AES/ECB/NoPadding"); // Noncompliant: ECB doesn't provide serious message confidentiality
+Cipher.getInstance("AES"); // Noncompliant: by default ECB mode is chosen
+Cipher.getInstance("AES/ECB/NoPadding"); // Noncompliant: ECB doesn't provide serious message confidentiality
-Cipher c3 = Cipher.getInstance("RSA/None/NoPadding"); // Noncompliant: RSA without OAEP padding scheme is not recommanded
+Cipher.getInstance("AES/CBC/PKCS5Padding"); // Noncompliant: Vulnerable to Padding Oracle attacks
+
+Cipher.getInstance("RSA/None/NoPadding"); // Noncompliant: RSA without OAEP padding scheme is not recommended
-// Recommended for block ciphers
-Cipher c1 = Cipher.getInstance("AES/GCM/NoPadding"); // Compliant
+Cipher.getInstance("AES/GCM/NoPadding");
-// Recommended for RSA
-Cipher c3 = Cipher.getInstance("RSA/None/OAEPWITHSHA-256ANDMGF1PADDING"); // Compliant
+Cipher.getInstance("RSA/None/OAEPWITHSHA-256ANDMGF1PADDING");
// or the ECB mode can be used for RSA when "None" is not available with the security provider used - in that case, ECB will be treated as "None" for RSA.
-Cipher c3 = Cipher.getInstance("RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING"); // Compliant
+Cipher.getInstance("RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING");
assertThat(x.hashCode()).isEqualTo(y.hashCode())
assertThat(x).hasSameHashCodeAs(y));
assertThat(x).hasSameHashCodeAs(y)
assertThat(getObject() instanceof MyClass).isTrue()
assertThat(x).isEqualByComparingTo(y)
assertThat(x >= y).isGreaterThanOrEqualTo(0)
assertThat(x >= y).isTrue()
assertThat(x).isGreaterThanOrEqualTo(y)
assertThat(x > y).isPositive()
assertThat(x > y).isTrue()
assertThat(x).isGreaterThan(y)
assertThat(x <= y).isNotPositive()
assertThat(x <= y).isTrue()
assertThat(x).isLessThanOrEqualTo(y)
assertThat(getString()).isEmpty()
assertThat(getString()).hasSize(0)
assertThat(getString()).isEmpty()
assertThat(getString()).hasSize(0)
assertThat(getString()).isEmpty()
assertThat(getString().equals(expected)).isTrue()
assertThat(getArray().length).isEqualTo(anotherArray.length)
assertThat(getArray()).hasSameSizeAs(getAnotherArray())
assertThat(getArray()).hasSameSizeAs(anotherArray)
assertThat(getArray().length).isLessThanOrEqualTo(expression)
assertThat(getMap().values()).contains(value)
assertThat(getMap()).containsValue(value)
assertThat(getMap()).containsValue(value)
assertThat(getMap().get(key)).isEqualTo(value)
assertThat(getObject()).isNull(); +assertThat(getObject()).isNotNull(); assertThat(getString()).isBlank(); assertThat(getFile()).canRead(); diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5838_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5838.json similarity index 100% rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5838_java.json rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5838.json diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5841_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5841.html similarity index 100% rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5841_java.html rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5841.html diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5841_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5841.json similarity index 100% rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5841_java.json rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5841.json diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5842_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5842.html similarity index 100% rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5842_java.html rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5842.html diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5842_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5842.json similarity index 100% rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5842_java.json rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5842.json diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5843_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5843.html similarity index 100% rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5843_java.html rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5843.html diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5843_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5843.json similarity index 100% rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5843_java.json rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5843.json diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5845_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5845.html similarity index 100% rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5845_java.html rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5845.html diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5845_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5845.json similarity index 100% rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5845_java.json rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5845.json diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5846_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5846.html similarity index 100% rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5846_java.html rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5846.html diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5846_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5846.json similarity index 100% rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5846_java.json rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5846.json diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5850_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5850.html similarity index 100% rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5850_java.html rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5850.html diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5850_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5850.json similarity index 100% rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5850_java.json rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5850.json diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5852_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5852.html similarity index 96% rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5852_java.html rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5852.html index 636231741ba..d5cdd31d3fc 100644 --- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5852_java.html +++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5852.html @@ -102,13 +102,13 @@Compliant Solution
Some API, like the AWS SDK, heavily rely on the builder pattern to create different data structures. Despite all the benefits, this pattern can -become really verbose,
--especially when dealing with nested structures. In order to reach a more concise code, "Consumer Builders", also called "Consumer Interface" are often introduced. --
-The idea is to overload the methods taking others structures in a Builder with a Consumer of Builder instead. This enables to use a --
-lambda instead of nesting another Builder, resulting in more concise and readable code. -+become really verbose, especially when dealing with nested structures. In order to reach a more concise code, "Consumer Builders", also called +"Consumer Interface" are often introduced. +
The idea is to overload the methods taking others structures in a Builder with a Consumer of Builder instead. This enables to use a lambda instead +of nesting another Builder, resulting in more concise and readable code.
This rule reports an issue when the Consumer Builder methods could be used instead of the classical ones.
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6244_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6244.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6244_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6244.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6246_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6246.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6246_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6246.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6246_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6246.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6246_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6246.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6262_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6262.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6262_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6262.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6262_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6262.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6262_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6262.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6263_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6263.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6263_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6263.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6263_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6263.json
similarity index 87%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6263_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6263.json
index 7d85fe2d3ab..2fb090b3d0f 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6263_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6263.json
@@ -12,5 +12,6 @@
"defaultSeverity": "Major",
"ruleSpecification": "RSPEC-6263",
"sqKey": "S6263",
- "scope": "Main"
+ "scope": "Main",
+ "quickfix": "unknown"
}
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288.json
similarity index 79%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288.json
index 7d891572863..6becf9999b3 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6288.json
@@ -27,6 +27,16 @@
],
"OWASP Top 10 2021": [
"A4"
+ ],
+ "PCI DSS 3.2": [
+ "6.5.8"
+ ],
+ "PCI DSS 4.0": [
+ "6.2.4"
+ ],
+ "ASVS 4.0": [
+ "2.10.3"
]
- }
+ },
+ "quickfix": "unknown"
}
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291.json
similarity index 76%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291.json
index db85861f4ef..8f15a2b2f97 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6291.json
@@ -35,6 +35,20 @@
"A2",
"A4",
"A5"
+ ],
+ "PCI DSS 3.2": [
+ "2.2",
+ "6.5.3"
+ ],
+ "PCI DSS 4.0": [
+ "2.2",
+ "6.2.4"
+ ],
+ "ASVS 4.0": [
+ "6.1.1",
+ "6.1.2",
+ "6.1.3"
]
- }
+ },
+ "quickfix": "unknown"
}
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293.json
similarity index 80%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293.json
index 1cec66bc478..3251cb59de8 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6293.json
@@ -26,6 +26,14 @@
],
"OWASP Top 10 2021": [
"A7"
- ]
- }
+ ],
+ "PCI DSS 3.2": [
+ "6.5.10"
+ ],
+ "PCI DSS 4.0": [
+ "6.2.4"
+ ],
+ "ASVS 4.0": []
+ },
+ "quickfix": "unknown"
}
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300.json
similarity index 78%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300.json
index f407d37af3c..c2cd9a37028 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6300.json
@@ -33,6 +33,18 @@
],
"OWASP Top 10 2021": [
"A4"
+ ],
+ "PCI DSS 3.2": [
+ "6.5.3"
+ ],
+ "PCI DSS 4.0": [
+ "6.2.4"
+ ],
+ "ASVS 4.0": [
+ "6.1.1",
+ "6.1.2",
+ "6.1.3"
]
- }
+ },
+ "quickfix": "unknown"
}
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301.json
similarity index 81%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301.json
index 1ba43c0d9bd..6eab52a7a8a 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6301.json
@@ -35,6 +35,17 @@
"OWASP Top 10 2021": [
"A2",
"A4"
+ ],
+ "PCI DSS 3.2": [
+ "6.5.10"
+ ],
+ "PCI DSS 4.0": [
+ "6.2.4"
+ ],
+ "ASVS 4.0": [
+ "6.1.1",
+ "6.1.2",
+ "6.1.3"
]
},
"quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6326_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6326.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6326_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6326.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6326_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6326.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6326_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6326.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6331_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6331.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6331_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6331.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6331_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6331.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6331_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6331.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6353_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6353.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6353_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6353.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6353_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6353.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6353_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6353.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6355_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6355.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6355_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6355.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6355_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6355.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6355_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6355.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362.json
similarity index 77%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362.json
index 01cdab5b20e..b17ef6b4e45 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6362.json
@@ -29,6 +29,17 @@
],
"OWASP Top 10 2021": [
"A3"
+ ],
+ "PCI DSS 3.2": [
+ "6.5.1",
+ "6.5.7"
+ ],
+ "PCI DSS 4.0": [
+ "6.2.4"
+ ],
+ "ASVS 4.0": [
+ "5.3.3"
]
- }
+ },
+ "quickfix": "unknown"
}
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363.json
similarity index 81%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363.json
index 2fb0d35824b..bc37ec3d679 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6363.json
@@ -29,6 +29,16 @@
],
"OWASP Top 10 2021": [
"A3"
+ ],
+ "PCI DSS 3.2": [
+ "6.5.1",
+ "6.5.7"
+ ],
+ "PCI DSS 4.0": [
+ "6.2.4"
+ ],
+ "ASVS 4.0": [
+ "5.3.3"
]
},
"quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6373_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6373.html
similarity index 93%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6373_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6373.html
index 6610e0c0418..7a176301552 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6373_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6373.html
@@ -1,7 +1,7 @@
XML standard allows the inclusion of xml files with the xinclude element.
XML processors will replace an xinclude element with the content of the file located at the URI defined in the href attribute, potentially from an
external storage such as file system or network, which may lead, if no restrictions are put in place, to arbitrary file disclosures or server-side request forgery (SSRF) vulnerabilities.
+href="https://owasp.org/www-community/attacks/Server_Side_Request_Forgery">server-side request forgery (SSRF) vulnerabilities.
Noncompliant Code Example
For DocumentBuilder, SAXParser, See
- Oracle Java Documentation - XML External Entity Injection Attack
- - OWASP Top 10 2017 Category A4 - XML External Entities
- (XXE)
+ - OWASP Top 10 2017 Category A4 - XML External
+ Entities (XXE)
- OWASP XXE Prevention Cheat
Sheet
- MITRE, CWE-611 - Information Exposure Through XML External Entity Reference
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6373_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6373.json
similarity index 80%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6373_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6373.json
index 77a890a001d..038238bcbca 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6373_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6373.json
@@ -21,6 +21,15 @@
],
"OWASP Top 10 2021": [
"A5"
+ ],
+ "PCI DSS 3.2": [
+ "6.5.1"
+ ],
+ "PCI DSS 4.0": [
+ "6.2.4"
+ ],
+ "ASVS 4.0": [
+ "5.5.2"
]
},
"quickfix": "infeasible"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6374_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6374.html
similarity index 93%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6374_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6374.html
index 9bc32cd2d71..c3e1491acf1 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6374_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6374.html
@@ -1,6 +1,6 @@
By default XML processors attempt to load all XML schemas and DTD (their locations are defined with xsi:schemaLocation attributes and
DOCTYPE declarations), potentially from an external storage such as file system or network, which may lead, if no restrictions are put in
-place, to server-side request forgery (SSRF) vulnerabilities.
+place, to server-side request forgery (SSRF) vulnerabilities.
Noncompliant Code Example
For DocumentBuilder, SAXParser and See
- Oracle Java Documentation - XML External Entity Injection Attack
- - OWASP Top 10 2017 Category A4 - XML External Entities
- (XXE)
+ - OWASP Top 10 2017 Category A4 - XML External
+ Entities (XXE)
- OWASP XXE Prevention Cheat
Sheet
- MITRE, CWE-611 - Information Exposure Through XML External Entity Reference
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6374_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6374.json
similarity index 79%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6374_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6374.json
index b22b9fc7324..a213742e464 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6374_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6374.json
@@ -21,6 +21,15 @@
],
"OWASP Top 10 2021": [
"A5"
+ ],
+ "PCI DSS 3.2": [
+ "6.5.1"
+ ],
+ "PCI DSS 4.0": [
+ "6.2.4"
+ ],
+ "ASVS 4.0": [
+ "5.5.2"
]
},
"quickfix": "infeasible"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6376_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6376.html
similarity index 95%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6376_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6376.html
index ece6ab415c1..bf903609b39 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6376_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6376.html
@@ -61,8 +61,8 @@ See
- Oracle Java Documentation - XML External Entity Injection Attack
- - OWASP Top 10 2017 Category A4 - XML External Entities
- (XXE)
+ - OWASP Top 10 2017 Category A4 - XML External
+ Entities (XXE)
- OWASP XXE Prevention Cheat
Sheet
- MITRE, CWE-776 - Improper Restriction of Recursive Entity References in DTDs ('XML
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6376_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6376.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6376_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6376.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6377_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6377.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6377_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6377.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6377_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6377.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6377_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6377.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6395_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6395.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6395_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6395.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6395_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6395.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6395_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6395.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6396_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6396.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6396_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6396.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6396_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6396.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6396_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6396.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6397_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6397.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6397_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6397.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6397_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6397.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6397_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6397.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6411_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6411.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6411_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6411.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6411_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6411.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6411_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6411.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6418_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6418.html
similarity index 94%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6418_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6418.html
index efed7c32dc9..32360ef0271 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6418_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6418.html
@@ -24,7 +24,7 @@
Recommended Secure Coding Practices
Sensitive Code Example
-private static final MY_SECRET = "47828a8dd77ee1eb9dde2d5e93cb221ce8c32b37";
+private static final String MY_SECRET = "47828a8dd77ee1eb9dde2d5e93cb221ce8c32b37";
public static void main(String[] args) {
MyClass.callMyService(MY_SECRET);
@@ -84,7 +84,8 @@ See
- OWASP Top 10 2021 Category A7 - Identification and
Authentication Failures
- - OWASP Top 10 2017 Category A2 - Broken Authentication
+ - OWASP Top 10 2017 Category A2 - Broken Authentication
+
- MITRE, CWE-798 - Use of Hard-coded Credentials
- CERT, MSC03-J. - Never hard code sensitive information
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6418_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6418.json
similarity index 73%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6418_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6418.json
index 58a199bf64c..e373eea94bf 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6418_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6418.json
@@ -26,6 +26,18 @@
],
"OWASP Top 10 2021": [
"A7"
+ ],
+ "PCI DSS 3.2": [
+ "6.5.10"
+ ],
+ "PCI DSS 4.0": [
+ "6.2.4"
+ ],
+ "ASVS 4.0": [
+ "2.10.4",
+ "3.5.2",
+ "6.4.1"
]
- }
+ },
+ "quickfix": "unknown"
}
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6432.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6432.html
new file mode 100644
index 00000000000..5efe3a3697a
--- /dev/null
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6432.html
@@ -0,0 +1,54 @@
+When encrypting data with Counter (CTR) derived block cipher modes of operation, it is essential not to reuse the same initialization vector (IV)
+with a given key, such IV is called a "nonce" (number used only once). Galois/Counter (GCM) and Counter with Cipher Block Chaining-Message
+Authentication Code (CCM) are both CTR-based modes of operation.
+An attacker, who has knowledge of one plaintext (original content) and ciphertext (encrypted content) pair, is able to retrieve the corresponding
+plaintext of any other ciphertext generated with the same IV and key. It also drastically decreases the key recovery computational complexity by
+downgrading it to a simpler polynomial root-finding problem.
+When using GCM, NIST recommends a 96 bit length nonce using a 'Deterministic' approach or at least 96 bits using a 'Random Bit Generator (RBG)'.
+The 'Deterministic' construction involves a counter, which increments per encryption process. The 'RBG' construction, as the name suggests, generates
+the nonce using a random bit generator. Collision probabilities (nonce-key pair reuse) using the 'RBG-based' approach require a shorter key rotation
+period, 2^32 maximum invocations per key.
+Noncompliant Code Example
+
+public void encrypt(byte[] key, byte[] ptxt) {
+ byte[] bytesIV = "7cVgr5cbdCZV".getBytes("UTF-8"); // The initialization vector is a static value
+
+ GCMParameterSpec gcmSpec = new GCMParameterSpec(128, nonce); // The initialization vector is configured here
+ SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
+
+ Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+ cipher.init(Cipher.ENCRYPT_MODE, keySpec, iv); // Noncompliant
+}
+
+Compliant Solution
+
+public void encrypt(byte[] key, byte[] ptxt) {
+ SecureRandom random = new SecureRandom();
+ byte[] bytesIV = new byte[12];
+ random.nextBytes(bytesIV); // Random 96 bit IV
+
+ GCMParameterSpec gcmSpec = new GCMParameterSpec(128, nonce);
+ SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
+
+ Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+ cipher.init(Cipher.ENCRYPT_MODE, keySpec, iv);
+}
+
+See
+
+ - OWASP Top 10 2021 Category A2 - Cryptographic Failures
+ - OWASP Top 10 2017 Category A3 - Sensitive Data Exposure
+
+ - Mobile AppSec
+ Verification Standard - Cryptography Requirements
+ - OWASP Mobile Top 10 2016 Category M5 -
+ Insufficient Cryptography
+ - MITRE, CWE-323 - Reusing a Nonce, Key Pair in Encryption
+ - NIST, SP-800-38A - Recommendation for Block Cipher
+ Modes of Operation
+ - NIST, SP-800-38C - Recommendation for Block Cipher
+ Modes of Operation: The CCM Mode for Authentication and Confidentiality
+ - NIST, SP-800-38D - Recommendation for Block Cipher
+ Modes of Operation: Galois/Counter Mode (GCM) and GMAC
+
+
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6432.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6432.json
new file mode 100644
index 00000000000..216384ffb46
--- /dev/null
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6432.json
@@ -0,0 +1,35 @@
+{
+ "title": "Counter Mode initialization vectors should not be reused",
+ "type": "VULNERABILITY",
+ "status": "ready",
+ "remediation": {
+ "func": "Constant\/Issue",
+ "constantCost": "15min"
+ },
+ "tags": [
+ "cwe",
+ "owasp-a3"
+ ],
+ "defaultSeverity": "Critical",
+ "ruleSpecification": "RSPEC-6432",
+ "sqKey": "S6432",
+ "scope": "Main",
+ "securityStandards": {
+ "CWE": [
+ 323
+ ],
+ "OWASP": [
+ "A3"
+ ],
+ "OWASP Mobile": [
+ "M5"
+ ],
+ "MASVS": [
+ "MSTG-CRYPTO-6"
+ ],
+ "OWASP Top 10 2021": [
+ "A2"
+ ]
+ },
+ "quickfix": "unknown"
+}
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6437.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6437.html
new file mode 100644
index 00000000000..eb654d36cb8
--- /dev/null
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6437.html
@@ -0,0 +1,80 @@
+A hard-coded secret has been found in your code. You should quickly list where this secret is used, revoke it, and then change it in every system
+that uses it.
+Passwords, secrets, and any type of credentials should only be used to authenticate a single entity (a person or a system).
+If you allow third parties to authenticate as another system or person, they can impersonate legitimate identities and undermine trust within the
+organization.
It does not matter if the impersonation is malicious: In either case, it is a clear breach of trust in the system, as the systems
+involved falsely assume that the authenticated entity is who it claims to be.
The consequences can be catastrophic.
+Keeping credentials in plain text in a code base is tantamount to sharing that password with anyone who has access to the source code and runtime
+servers.
Thus, it is a breach of trust, as these individuals have the ability to impersonate others.
+Secret management services are the most efficient tools to store credentials and protect the identities associated with them.
Cloud providers
+and on-premise services can be used for this purpose.
+If storing credentials in a secret data management service is not possible, follow these guidelines:
+
+ - Do not store credentials in a file that an excessive number of people can access.
+
+ - For example, not in code, not in a spreadsheet, not on a sticky note, and not on a shared drive.
+
+ - Use the production operating system to protect password access control.
+
+ - For example, in a file whose permissions are restricted and protected with chmod and chown.
+
+
+Noncompliant Code Example
+
+import org.h2.security.SHA256;
+
+String inputString = "s3cr37";
+byte[] key = inputString.getBytes();
+
+SHA256.getHMAC(key, message); // Noncompliant
+
+Compliant Solution
+Using AWS Secrets Manager:
+
+import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
+import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueRequest;
+import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueResponse;
+import org.h2.security.SHA256;
+
+public static void doSomething(SecretsManagerClient secretsClient, String secretName) {
+ GetSecretValueRequest valueRequest = GetSecretValueRequest.builder()
+ .secretId(secretName)
+ .build();
+
+ GetSecretValueResponse valueResponse = secretsClient.getSecretValue(valueRequest);
+ String secret = valueResponse.secretString();
+
+ byte[] key = secret.getBytes();
+ SHA256.getHMAC(key, message);
+}
+
+Using Azure Key Vault Secret:
+
+import com.azure.identity.DefaultAzureCredentialBuilder;
+import com.azure.security.keyvault.secrets.SecretClient;
+import com.azure.security.keyvault.secrets.SecretClientBuilder;
+import com.azure.security.keyvault.secrets.models.KeyVaultSecret;
+import org.h2.security.SHA256;
+
+public static void doSomething(SecretClient secretClient, String secretName) {
+ KeyVaultSecret retrievedSecret = secretClient.getSecret(secretName);
+ String secret = retrievedSecret.getValue();
+
+ byte[] key = secret.getBytes();
+ SHA256.getHMAC(key, message);
+}
+
+See
+
+ - AWS - Secret Manager
+ - Azure - Key Vault
+ - GCP - Secret Manager
+ - Hashicorp Vault - Secret Management
+ - OWASP Top 10 2021 Category A7 - Identification and
+ Authentication Failures
+ - OWASP Top 10 2017 Category A2 - Broken Authentication
+ - MITRE, CWE-798 - Use of Hard-coded Credentials
+ - MITRE, CWE-259 - Use of Hard-coded Password
+ - CERT, MSC03-J. - Never hard code sensitive information
+
+
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6437.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6437.json
new file mode 100644
index 00000000000..de68d694819
--- /dev/null
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S6437.json
@@ -0,0 +1,30 @@
+{
+ "title": "Credentials should not be hard-coded",
+ "type": "VULNERABILITY",
+ "status": "ready",
+ "remediation": {
+ "func": "Constant\/Issue",
+ "constantCost": "60min"
+ },
+ "tags": [
+ "cwe",
+ "owasp-a2"
+ ],
+ "defaultSeverity": "Blocker",
+ "ruleSpecification": "RSPEC-6437",
+ "sqKey": "S6437",
+ "scope": "Main",
+ "securityStandards": {
+ "CWE": [
+ 798,
+ 259
+ ],
+ "OWASP": [
+ "A2"
+ ],
+ "OWASP Top 10 2021": [
+ "A7"
+ ]
+ },
+ "quickfix": "infeasible"
+}
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S818_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S818.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S818_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S818.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S818_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S818.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S818_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S818.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S864_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S864.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S864_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S864.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S864_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S864.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S864_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S864.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S881_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S881.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S881_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S881.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S881_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S881.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S881_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S881.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S888_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S888.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S888_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S888.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S888_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S888.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S888_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S888.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899.json
similarity index 93%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899.json
index 210f8103935..7935355fb04 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S899.json
@@ -25,6 +25,9 @@
],
"CWE": [
754
+ ],
+ "ASVS 4.0": [
+ "11.1.7"
]
},
"quickfix": "unknown"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S923_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S923.html
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S923_java.html
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S923.html
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S923_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S923.json
similarity index 100%
rename from java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S923_java.json
rename to java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S923.json
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/Sonar_way_profile.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/Sonar_way_profile.json
index dbad2bb44f5..b0ccfcc7da5 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/Sonar_way_profile.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/Sonar_way_profile.json
@@ -477,6 +477,8 @@
"S6395",
"S6396",
"S6397",
- "S6418"
+ "S6418",
+ "S6432",
+ "S6437"
]
}
diff --git a/java-checks/src/test/files/checks/CognitiveComplexityMethodCheckMax0.java b/java-checks/src/test/files/checks/CognitiveComplexityMethodCheckMax0.java
index ef6980d9cc4..fba3215e9da 100644
--- a/java-checks/src/test/files/checks/CognitiveComplexityMethodCheckMax0.java
+++ b/java-checks/src/test/files/checks/CognitiveComplexityMethodCheckMax0.java
@@ -310,6 +310,25 @@ void noNestingForIfElseIf() { // Noncompliant {{Refactor this method to reduce i
}
}
+ public boolean equals(Object o) {
+ while (false) {
+ }
+ return
+ a
+ || b
+ && c;
+ }
+ public int hashCode() {
+ while (false) {
+ }
+ if (
+ a
+ || b
+ && c) {
+ return 100;
+ }
+ return 42;
+ }
}
diff --git a/java-checks/src/test/files/checks/ForLoopFalseConditionCheck.java b/java-checks/src/test/files/checks/ForLoopFalseConditionCheck.java
deleted file mode 100644
index c10ee275440..00000000000
--- a/java-checks/src/test/files/checks/ForLoopFalseConditionCheck.java
+++ /dev/null
@@ -1,29 +0,0 @@
-class A {
- void myMethod(int x, int y, int z) {
- int j = 0, k = 0;
- for (int i = x; true; ) {}
- for (int i = x; false; ) {} // Noncompliant [[sc=21;ec=26]] {{This loop will never execute.}}
- for (int i = x; true; ) {}
- for (int i = x; !true; ) {} // Noncompliant
- for (int i = x; !(y=1); ) {}
- for (int i = 1; i < 5; ) {}
- for (int i = 9; i < 5; ) {} // Noncompliant
- for (int i = 9; i > 5; ) {}
- for (int i = 1; i > 5; ) {} // Noncompliant
- for (int i = 1; i <=5; ) {}
- for (int i = 9; i <=5; ) {} // Noncompliant
- for (int i = 9; i >=5; ) {}
- for (int i = 1; i >=5; ) {} // Noncompliant
- for (int i = x; i < 5; ) {}
- for (int i = 1; i < x; ) {}
- for (int i = 1; i <-x; ) {}
- for ( ; j < 5; ) {}
- for ( j = 9; j < 5; ) {} // Noncompliant
- for ( x += 1; j < 5; ) {}
- for (int i ; i < 5; ) {}
- for (int i = 1; ; ) {}
- for (int i = 0; i < 0x10; ) {}
- for (int i = 0; i < 0b10; ) {}
- for (int i = 1; i <= 0Xffff; i++) {}
- }
-}
diff --git a/java-checks/src/test/java/org/sonar/java/checks/ArrayForVarArgCheckTest.java b/java-checks/src/test/java/org/sonar/java/checks/ArrayForVarArgCheckTest.java
index 6f787d6c6e9..87fbc059274 100644
--- a/java-checks/src/test/java/org/sonar/java/checks/ArrayForVarArgCheckTest.java
+++ b/java-checks/src/test/java/org/sonar/java/checks/ArrayForVarArgCheckTest.java
@@ -23,14 +23,14 @@
import org.sonar.java.checks.verifier.CheckVerifier;
import static org.sonar.java.checks.verifier.TestUtils.nonCompilingTestSourcesPath;
-import static org.sonar.java.checks.verifier.TestUtils.testSourcesPath;
+import static org.sonar.java.checks.verifier.TestUtils.mainCodeSourcesPath;
class ArrayForVarArgCheckTest {
@Test
void test() {
CheckVerifier.newVerifier()
- .onFile(testSourcesPath("checks/ArrayForVarArgCheck.java"))
+ .onFile(mainCodeSourcesPath("checks/ArrayForVarArgCheck.java"))
.withCheck(new ArrayForVarArgCheck())
.verifyIssues();
}
diff --git a/java-checks/src/test/java/org/sonar/java/checks/BooleanLiteralCheckTest.java b/java-checks/src/test/java/org/sonar/java/checks/BooleanLiteralCheckTest.java
index d4cda3706a4..dff3533c121 100644
--- a/java-checks/src/test/java/org/sonar/java/checks/BooleanLiteralCheckTest.java
+++ b/java-checks/src/test/java/org/sonar/java/checks/BooleanLiteralCheckTest.java
@@ -22,17 +22,16 @@
import org.junit.jupiter.api.Test;
import org.sonar.java.checks.verifier.internal.InternalCheckVerifier;
-import static org.sonar.java.checks.verifier.TestUtils.testSourcesPath;
+import static org.sonar.java.checks.verifier.TestUtils.mainCodeSourcesPath;
class BooleanLiteralCheckTest {
@Test
void detected() {
InternalCheckVerifier.newInstance()
- .onFile(testSourcesPath("checks/BooleanLiteralCheck.java"))
+ .onFile(mainCodeSourcesPath("checks/BooleanLiteralCheck.java"))
.withCheck(new BooleanLiteralCheck())
.withQuickFixes()
.verifyIssues();
}
-
}
diff --git a/java-checks/src/test/java/org/sonar/java/checks/CheckListTest.java b/java-checks/src/test/java/org/sonar/java/checks/CheckListTest.java
index 7466443b393..763c0ed8565 100644
--- a/java-checks/src/test/java/org/sonar/java/checks/CheckListTest.java
+++ b/java-checks/src/test/java/org/sonar/java/checks/CheckListTest.java
@@ -38,10 +38,9 @@
import org.sonar.api.server.rule.RulesDefinitionAnnotationLoader;
import org.sonar.api.utils.AnnotationUtils;
import org.sonar.check.Rule;
-import org.sonar.java.RspecKey;
-import org.sonarsource.analyzer.commons.collections.SetUtils;
import org.sonar.java.se.checks.SECheck;
import org.sonar.plugins.java.api.JavaCheck;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Fail.fail;
@@ -127,8 +126,7 @@ void test() {
String simpleName = cls.getSimpleName();
// Handle legacy keys.
Rule ruleAnnotation = AnnotationUtils.getAnnotation(cls, Rule.class);
- String key = getKey(cls, ruleAnnotation);
- keyMap.put(ruleAnnotation.key(), key);
+ keyMap.put(ruleAnnotation.key(), ruleAnnotation.key());
if (SE_CHEKS.contains(simpleName)) {
continue;
}
@@ -147,10 +145,10 @@ void test() {
assertThat(keys).as("Duplicate key " + rule.key()).doesNotContain(rule.key());
keys.add(rule.key());
names.add(rule.name());
- assertThat(getClass().getResource("/org/sonar/l10n/java/rules/" + CheckList.REPOSITORY_KEY + "/" + keyMap.get(rule.key()) + "_java.html"))
+ assertThat(getClass().getResource("/org/sonar/l10n/java/rules/" + CheckList.REPOSITORY_KEY + "/" + keyMap.get(rule.key()) + ".html"))
.overridingErrorMessage("No description for " + rule.key() + " " + keyMap.get(rule.key()))
.isNotNull();
- assertThat(getClass().getResource("/org/sonar/l10n/java/rules/" + CheckList.REPOSITORY_KEY + "/" + keyMap.get(rule.key()) + "_java.json"))
+ assertThat(getClass().getResource("/org/sonar/l10n/java/rules/" + CheckList.REPOSITORY_KEY + "/" + keyMap.get(rule.key()) + ".json"))
.overridingErrorMessage("No json metadata file for " + rule.key() + " " + keyMap.get(rule.key()))
.isNotNull();
@@ -163,15 +161,6 @@ void test() {
}
}
- private static String getKey(Class cls, Rule ruleAnnotation) {
- String key = ruleAnnotation.key();
- RspecKey rspecKeyAnnotation = AnnotationUtils.getAnnotation(cls, RspecKey.class);
- if (rspecKeyAnnotation != null) {
- return rspecKeyAnnotation.value();
- }
- return key;
- }
-
@Test
void enforce_CheckList_registration() {
List files = (List) FileUtils.listFiles(new File("src/main/java/org/sonar/java/checks/"), new String[] {"java"}, false);
@@ -195,8 +184,8 @@ void rules_targeting_tests_should_have_tests_tag() throws Exception {
Set> testChecks = new HashSet<>(CheckList.getJavaTestChecks());
for (Class cls : CheckList.getChecks()) {
- String key = getKey(cls, AnnotationUtils.getAnnotation(cls, Rule.class));
- URL metadataURL = getClass().getResource("/org/sonar/l10n/java/rules/" + CheckList.REPOSITORY_KEY + "/" + key + "_java.json");
+ String key = AnnotationUtils.getAnnotation(cls, Rule.class).key();
+ URL metadataURL = getClass().getResource("/org/sonar/l10n/java/rules/" + CheckList.REPOSITORY_KEY + "/" + key + ".json");
File metadataFile = new File(metadataURL.toURI());
assertThat(metadataFile).exists();
try (FileReader jsonReader = new FileReader(metadataFile)) {
diff --git a/java-frontend/src/main/java/org/sonar/java/RspecKey.java b/java-checks/src/test/java/org/sonar/java/checks/CounterModeIVShouldNotBeReusedCheckTest.java
similarity index 64%
rename from java-frontend/src/main/java/org/sonar/java/RspecKey.java
rename to java-checks/src/test/java/org/sonar/java/checks/CounterModeIVShouldNotBeReusedCheckTest.java
index 9efc4d3ef34..72c799294a1 100644
--- a/java-frontend/src/main/java/org/sonar/java/RspecKey.java
+++ b/java-checks/src/test/java/org/sonar/java/checks/CounterModeIVShouldNotBeReusedCheckTest.java
@@ -17,18 +17,21 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-package org.sonar.java;
+package org.sonar.java.checks;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import org.junit.jupiter.api.Test;
+import org.sonar.java.checks.verifier.CheckVerifier;
+
+import static org.sonar.java.checks.verifier.TestUtils.mainCodeSourcesPath;
+
+class CounterModeIVShouldNotBeReusedCheckTest {
+
+ @Test
+ void test() {
+ CheckVerifier.newVerifier()
+ .onFile(mainCodeSourcesPath("checks/CounterModeIVShouldNotBeReusedCheck.java"))
+ .withCheck(new CounterModeIVShouldNotBeReusedCheck())
+ .verifyIssues();
+ }
-/**
- * This annotation is used for rules with a legacy key to refer to the correct RSPEC.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface RspecKey {
- String value();
}
diff --git a/java-checks/src/test/java/org/sonar/java/checks/EmptyMethodsCheckTest.java b/java-checks/src/test/java/org/sonar/java/checks/EmptyMethodsCheckTest.java
index f68a9e5f192..e4de74ca767 100644
--- a/java-checks/src/test/java/org/sonar/java/checks/EmptyMethodsCheckTest.java
+++ b/java-checks/src/test/java/org/sonar/java/checks/EmptyMethodsCheckTest.java
@@ -22,16 +22,26 @@
import org.junit.jupiter.api.Test;
import org.sonar.java.checks.verifier.internal.InternalCheckVerifier;
-import static org.sonar.java.checks.verifier.TestUtils.testSourcesPath;
+import static org.sonar.java.checks.verifier.TestUtils.mainCodeSourcesPath;
class EmptyMethodsCheckTest {
@Test
void test() {
InternalCheckVerifier.newInstance()
- .onFile(testSourcesPath("checks/EmptyMethodsCheck.java"))
+ .onFile(mainCodeSourcesPath("checks/EmptyMethodsCheck.java"))
.withCheck(new EmptyMethodsCheck())
.withQuickFixes()
.verifyIssues();
}
+
+ @Test
+ void test_no_semantics() {
+ InternalCheckVerifier.newInstance()
+ .onFile(mainCodeSourcesPath("checks/EmptyMethodsCheckNoSemantics.java"))
+ .withCheck(new EmptyMethodsCheck())
+ .withQuickFixes()
+ .withoutSemantic()
+ .verifyIssues();
+ }
}
diff --git a/java-checks/src/test/java/org/sonar/java/checks/ForLoopFalseConditionCheckTest.java b/java-checks/src/test/java/org/sonar/java/checks/ForLoopFalseConditionCheckTest.java
index 2264abc11d8..55bb9873e7d 100644
--- a/java-checks/src/test/java/org/sonar/java/checks/ForLoopFalseConditionCheckTest.java
+++ b/java-checks/src/test/java/org/sonar/java/checks/ForLoopFalseConditionCheckTest.java
@@ -22,12 +22,23 @@
import org.junit.jupiter.api.Test;
import org.sonar.java.checks.verifier.CheckVerifier;
+import static org.sonar.java.checks.verifier.TestUtils.mainCodeSourcesPath;
+import static org.sonar.java.checks.verifier.TestUtils.nonCompilingTestSourcesPath;
+
class ForLoopFalseConditionCheckTest {
@Test
void test() {
CheckVerifier.newVerifier()
- .onFile("src/test/files/checks/ForLoopFalseConditionCheck.java")
+ .onFile(mainCodeSourcesPath("checks/ForLoopFalseConditionCheck.java"))
+ .withCheck(new ForLoopFalseConditionCheck())
+ .verifyIssues();
+ }
+
+ @Test
+ void test_non_compiling() {
+ CheckVerifier.newVerifier()
+ .onFile(nonCompilingTestSourcesPath("checks/ForLoopFalseConditionCheck.java"))
.withCheck(new ForLoopFalseConditionCheck())
.verifyIssues();
}
diff --git a/java-checks/src/test/java/org/sonar/java/checks/LeastSpecificTypeCheckTest.java b/java-checks/src/test/java/org/sonar/java/checks/LeastSpecificTypeCheckTest.java
index 6abd11f4032..493406c6346 100644
--- a/java-checks/src/test/java/org/sonar/java/checks/LeastSpecificTypeCheckTest.java
+++ b/java-checks/src/test/java/org/sonar/java/checks/LeastSpecificTypeCheckTest.java
@@ -22,6 +22,7 @@
import org.junit.jupiter.api.Test;
import org.sonar.java.checks.verifier.CheckVerifier;
+import static org.sonar.java.checks.verifier.TestUtils.mainCodeSourcesPath;
import static org.sonar.java.checks.verifier.TestUtils.nonCompilingTestSourcesPath;
class LeastSpecificTypeCheckTest {
@@ -29,7 +30,7 @@ class LeastSpecificTypeCheckTest {
@Test
void test() {
CheckVerifier.newVerifier()
- .onFile("src/test/files/checks/LeastSpecificTypeCheck.java")
+ .onFile(mainCodeSourcesPath("checks/LeastSpecificTypeCheck.java"))
.withCheck(new LeastSpecificTypeCheck())
.verifyIssues();
}
@@ -39,7 +40,7 @@ void test_non_compiling() {
CheckVerifier.newVerifier()
.onFile(nonCompilingTestSourcesPath("checks/LeastSpecificTypeCheck.java"))
.withCheck(new LeastSpecificTypeCheck())
- .verifyNoIssues();
+ .verifyIssues();
}
}
diff --git a/java-checks/src/test/java/org/sonar/java/checks/MutableMembersUsageCheckTest.java b/java-checks/src/test/java/org/sonar/java/checks/MutableMembersUsageCheckTest.java
index 7b68126aeaf..2a3e4a0f7a4 100644
--- a/java-checks/src/test/java/org/sonar/java/checks/MutableMembersUsageCheckTest.java
+++ b/java-checks/src/test/java/org/sonar/java/checks/MutableMembersUsageCheckTest.java
@@ -22,25 +22,25 @@
import org.junit.jupiter.api.Test;
import org.sonar.java.checks.verifier.CheckVerifier;
+import static org.sonar.java.checks.verifier.TestUtils.mainCodeSourcesPath;
import static org.sonar.java.checks.verifier.TestUtils.nonCompilingTestSourcesPath;
-import static org.sonar.java.checks.verifier.TestUtils.testSourcesPath;
class MutableMembersUsageCheckTest {
@Test
void test() {
CheckVerifier.newVerifier()
- .onFile(testSourcesPath("checks/MutableMembersUsageCheck.java"))
+ .onFile(mainCodeSourcesPath("checks/MutableMembersUsageCheck.java"))
.withCheck(new MutableMembersUsageCheck())
.verifyIssues();
}
@Test
- void test_java_9() {
+ void test_non_compiling() {
CheckVerifier.newVerifier()
.onFile(nonCompilingTestSourcesPath("checks/MutableMembersUsageCheck.java"))
.withCheck(new MutableMembersUsageCheck())
- .verifyIssues();
+ .verifyNoIssues();
}
}
diff --git a/java-checks/src/test/java/org/sonar/java/checks/PublicStaticMutableMembersCheckTest.java b/java-checks/src/test/java/org/sonar/java/checks/PublicStaticMutableMembersCheckTest.java
index edb7bf06963..2e7ccae5abf 100644
--- a/java-checks/src/test/java/org/sonar/java/checks/PublicStaticMutableMembersCheckTest.java
+++ b/java-checks/src/test/java/org/sonar/java/checks/PublicStaticMutableMembersCheckTest.java
@@ -23,15 +23,15 @@
import org.junit.jupiter.api.Test;
import org.sonar.java.checks.verifier.CheckVerifier;
+import static org.sonar.java.checks.verifier.TestUtils.mainCodeSourcesPath;
import static org.sonar.java.checks.verifier.TestUtils.nonCompilingTestSourcesPath;
-import static org.sonar.java.checks.verifier.TestUtils.testSourcesPath;
class PublicStaticMutableMembersCheckTest {
@Test
void test() {
CheckVerifier.newVerifier()
- .onFile(testSourcesPath("checks/PublicStaticMutableMembersCheck.java"))
+ .onFile(mainCodeSourcesPath("checks/PublicStaticMutableMembersCheck.java"))
.withCheck(new PublicStaticMutableMembersCheck())
.verifyIssues();
}
@@ -41,13 +41,13 @@ void test_non_compiling() {
CheckVerifier.newVerifier()
.onFile(nonCompilingTestSourcesPath("checks/PublicStaticMutableMembersCheck.java"))
.withCheck(new PublicStaticMutableMembersCheck())
- .verifyIssues();
+ .verifyNoIssues();
}
@Test
void test_without_semantic() {
CheckVerifier.newVerifier()
- .onFile(testSourcesPath("checks/PublicStaticMutableMembersCheck.java"))
+ .onFile(mainCodeSourcesPath("checks/PublicStaticMutableMembersCheck.java"))
.withCheck(new PublicStaticMutableMembersCheck())
.withClassPath(Collections.emptyList())
.verifyIssues();
@@ -59,7 +59,7 @@ void test_non_compiling_without_semantic() {
.onFile(nonCompilingTestSourcesPath("checks/PublicStaticMutableMembersCheck.java"))
.withCheck(new PublicStaticMutableMembersCheck())
.withClassPath(Collections.emptyList())
- .verifyIssues();
+ .verifyNoIssues();
}
}
diff --git a/java-checks/src/test/java/org/sonar/java/checks/SanityTest.java b/java-checks/src/test/java/org/sonar/java/checks/SanityTest.java
index 90d82c0c9d1..95cc19cb715 100644
--- a/java-checks/src/test/java/org/sonar/java/checks/SanityTest.java
+++ b/java-checks/src/test/java/org/sonar/java/checks/SanityTest.java
@@ -31,7 +31,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Nullable;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/java-checks/src/test/java/org/sonar/java/checks/TooManyParametersCheckTest.java b/java-checks/src/test/java/org/sonar/java/checks/TooManyParametersCheckTest.java
index b11effa7844..a9fb6e8f470 100644
--- a/java-checks/src/test/java/org/sonar/java/checks/TooManyParametersCheckTest.java
+++ b/java-checks/src/test/java/org/sonar/java/checks/TooManyParametersCheckTest.java
@@ -23,14 +23,14 @@
import org.sonar.java.checks.verifier.CheckVerifier;
import static org.sonar.java.checks.verifier.TestUtils.nonCompilingTestSourcesPath;
-import static org.sonar.java.checks.verifier.TestUtils.testSourcesPath;
+import static org.sonar.java.checks.verifier.TestUtils.mainCodeSourcesPath;
class TooManyParametersCheckTest {
@Test
void test() {
CheckVerifier.newVerifier()
- .onFile(testSourcesPath("checks/TooManyParametersCheck.java"))
+ .onFile(mainCodeSourcesPath("checks/TooManyParametersCheck.java"))
.withCheck(new TooManyParametersCheck())
.verifyIssues();
}
@@ -49,7 +49,7 @@ void custom() {
check.maximum = 8;
check.constructorMax = 5;
CheckVerifier.newVerifier()
- .onFile(testSourcesPath("checks/TooManyParametersCustom.java"))
+ .onFile(mainCodeSourcesPath("checks/TooManyParametersCustom.java"))
.withCheck(check)
.verifyIssues();
}
diff --git a/java-checks/src/test/java/org/sonar/java/checks/helpers/CredentialMethodTest.java b/java-checks/src/test/java/org/sonar/java/checks/helpers/CredentialMethodTest.java
new file mode 100644
index 00000000000..3e3e33b4caf
--- /dev/null
+++ b/java-checks/src/test/java/org/sonar/java/checks/helpers/CredentialMethodTest.java
@@ -0,0 +1,53 @@
+/*
+ * SonarQube Java
+ * Copyright (C) 2012-2022 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.sonar.java.checks.helpers;
+
+import java.util.Collections;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.sonar.plugins.java.api.semantic.MethodMatchers;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class CredentialMethodTest {
+ @Test
+ void isConstructor() {
+ var constructor = new CredentialMethod("Object", "Object", Collections.emptyList(), Collections.emptyList());
+ assertThat(constructor.isConstructor()).isTrue();
+ var nonConstructor = new CredentialMethod("Object", "equals", Collections.emptyList(), Collections.emptyList());
+ assertThat(nonConstructor.isConstructor()).isFalse();
+ var stringConstructor = new CredentialMethod("java.lang.String", "String", Collections.emptyList(), Collections.emptyList());
+ assertThat(stringConstructor.isConstructor()).isTrue();
+ var stringCompareTo = new CredentialMethod("java.lang.String", "compareTo", List.of("java.lang.String"), Collections.emptyList());
+ assertThat(stringCompareTo.isConstructor()).isFalse();
+ var innerClassConstructor = new CredentialMethod("org.sonar.Outer$Inner", "Inner", Collections.emptyList(), Collections.emptyList());
+ assertThat(innerClassConstructor.isConstructor()).isTrue();
+ }
+
+ @Test
+ void methodMatcher_is_recycled() {
+ var constructor = new CredentialMethod("Object", "Object", Collections.emptyList(), Collections.emptyList());
+ MethodMatchers constructorMatcher = constructor.methodMatcher();
+ assertThat(constructor.methodMatcher()).isSameAs(constructorMatcher);
+ var equalsMatcher = new CredentialMethod("Object", "equals", Collections.emptyList(), Collections.emptyList());
+ MethodMatchers methodMatcher = equalsMatcher.methodMatcher();
+ assertThat(equalsMatcher.methodMatcher()).isSameAs(methodMatcher);
+ }
+}
diff --git a/java-checks/src/test/java/org/sonar/java/checks/security/HardCodedCredentialsShouldNotBeUsedCheckTest.java b/java-checks/src/test/java/org/sonar/java/checks/security/HardCodedCredentialsShouldNotBeUsedCheckTest.java
new file mode 100644
index 00000000000..47da3741dc1
--- /dev/null
+++ b/java-checks/src/test/java/org/sonar/java/checks/security/HardCodedCredentialsShouldNotBeUsedCheckTest.java
@@ -0,0 +1,67 @@
+/*
+ * SonarQube Java
+ * Copyright (C) 2012-2022 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.sonar.java.checks.security;
+
+
+import java.util.List;
+import java.util.stream.Collectors;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.sonar.api.utils.log.LogAndArguments;
+import org.sonar.api.utils.log.LogTesterJUnit5;
+import org.sonar.api.utils.log.LoggerLevel;
+import org.sonar.java.checks.verifier.CheckVerifier;
+import org.sonar.java.checks.verifier.TestUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class HardCodedCredentialsShouldNotBeUsedCheckTest {
+ @RegisterExtension
+ final LogTesterJUnit5 logTester = new LogTesterJUnit5();
+
+ @Test
+ void uses_empty_collection_when_methods_cannot_be_loaded() {
+ var check = new HardCodedCredentialsShouldNotBeUsedCheck("non-existing-file.json");
+ assertThat(check.getMethods()).isEmpty();
+ List logs = logTester.getLogs(LoggerLevel.ERROR).stream()
+ .map(LogAndArguments::getFormattedMsg)
+ .collect(Collectors.toList());
+ assertThat(logs)
+ .containsOnly("Could not load methods from \"non-existing-file.json\".");
+ }
+
+
+ @Test
+ void test() {
+ CheckVerifier.newVerifier()
+ .onFile(TestUtils.mainCodeSourcesPath("checks/security/HardCodedCredentialsShouldNotBeUsedCheck.java"))
+ .withCheck(new HardCodedCredentialsShouldNotBeUsedCheck())
+ .verifyIssues();
+ }
+
+ @Test
+ void test_non_compiling_code() {
+ CheckVerifier.newVerifier()
+ .onFile(TestUtils.nonCompilingTestSourcesPath("checks/security/HardCodedCredentialsShouldNotBeUsedCheck.java"))
+ .withCheck(new HardCodedCredentialsShouldNotBeUsedCheck())
+ .verifyIssues();
+ }
+
+}
diff --git a/java-frontend/pom.xml b/java-frontend/pom.xml
index 3685d775e6d..11674b50bf4 100644
--- a/java-frontend/pom.xml
+++ b/java-frontend/pom.xml
@@ -5,7 +5,7 @@
org.sonarsource.java
java
- 7.13.0-SNAPSHOT
+ 7.16.0-SNAPSHOT
java-frontend
@@ -21,7 +21,7 @@
- org.sonarsource.sonarqube
+ org.sonarsource.api.plugin
sonar-plugin-api
diff --git a/java-frontend/src/main/java/org/sonar/java/DefaultJavaResourceLocator.java b/java-frontend/src/main/java/org/sonar/java/DefaultJavaResourceLocator.java
index 019fb03ddf9..46d9f62a51e 100644
--- a/java-frontend/src/main/java/org/sonar/java/DefaultJavaResourceLocator.java
+++ b/java-frontend/src/main/java/org/sonar/java/DefaultJavaResourceLocator.java
@@ -31,6 +31,7 @@
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
import org.sonar.java.classpath.ClasspathForMain;
+import org.sonar.java.classpath.ClasspathForTest;
import org.sonar.java.annotations.VisibleForTesting;
import org.sonar.plugins.java.api.JavaFileScannerContext;
import org.sonar.plugins.java.api.JavaResourceLocator;
@@ -40,11 +41,13 @@ public class DefaultJavaResourceLocator implements JavaResourceLocator {
private static final Logger LOG = Loggers.get(DefaultJavaResourceLocator.class);
private final ClasspathForMain javaClasspath;
+ private final ClasspathForTest javaTestClasspath;
@VisibleForTesting
Map resourcesByClass;
- public DefaultJavaResourceLocator(ClasspathForMain javaClasspath) {
+ public DefaultJavaResourceLocator(ClasspathForMain javaClasspath, ClasspathForTest javaTestClasspath) {
this.javaClasspath = javaClasspath;
+ this.javaTestClasspath = javaTestClasspath;
resourcesByClass = new HashMap<>();
}
@@ -80,7 +83,22 @@ public Collection classFilesToAnalyze() {
@Override
public Collection classpath() {
- return javaClasspath.getElements();
+ return Collections.unmodifiableList(javaClasspath.getElements());
+ }
+
+ @Override
+ public Collection testClasspath() {
+ return Collections.unmodifiableList(javaTestClasspath.getElements());
+ }
+
+ @Override
+ public Collection binaryDirs() {
+ return Collections.unmodifiableList(javaClasspath.getBinaryDirs());
+ }
+
+ @Override
+ public Collection testBinaryDirs() {
+ return Collections.unmodifiableList(javaTestClasspath.getBinaryDirs());
}
@Override
diff --git a/java-frontend/src/main/java/org/sonar/java/JavaFrontend.java b/java-frontend/src/main/java/org/sonar/java/JavaFrontend.java
index 5063ef5c138..5d031f6ab00 100644
--- a/java-frontend/src/main/java/org/sonar/java/JavaFrontend.java
+++ b/java-frontend/src/main/java/org/sonar/java/JavaFrontend.java
@@ -44,6 +44,7 @@
import org.sonar.java.ast.visitors.SyntaxHighlighterVisitor;
import org.sonar.java.caching.CacheContextImpl;
import org.sonar.java.collections.CollectionUtils;
+import org.sonar.java.exceptions.ApiMismatchException;
import org.sonar.java.filters.SonarJavaIssueFilter;
import org.sonar.java.model.JParserConfig;
import org.sonar.java.model.VisitorsBridge;
@@ -129,7 +130,7 @@ boolean analysisCancelled() {
}
public void scan(Iterable sourceFiles, Iterable testFiles, Iterable generatedFiles) {
- if (isCacheEnabled()) {
+ if (canOptimizeScanning()) {
long successfullyScanned = 0L;
long total = 0L;
@@ -150,6 +151,8 @@ public void scan(Iterable sourceFiles, Iterable testFiles,
successfullyScanned,
total
);
+ } else if (isCacheEnabled()) {
+ LOG.info("Server-side caching is enabled. The Java analyzer will not try to leverage data from a previous analysis.");
} else {
LOG.info("Server-side caching is not enabled. The Java analyzer will not try to leverage data from a previous analysis.");
}
@@ -393,6 +396,14 @@ private boolean isCacheEnabled() {
return sonarComponents != null && CacheContextImpl.of(sonarComponents.context()).isCacheEnabled();
}
+ private boolean canOptimizeScanning() {
+ try {
+ return sonarComponents != null && sonarComponents.canSkipUnchangedFiles() && isCacheEnabled();
+ } catch (ApiMismatchException e) {
+ return false;
+ }
+ }
+
private static void scanAndMeasureTask(Iterable files, Consumer> action, String descriptor) {
if (CollectionUtils.size(files) > 0) {
Duration mainDuration = PerformanceMeasure.start(descriptor);
diff --git a/java-frontend/src/main/java/org/sonar/java/classpath/JavaSdkUtil.java b/java-frontend/src/main/java/org/sonar/java/classpath/JavaSdkUtil.java
index bdaf9966152..9880ebbe833 100644
--- a/java-frontend/src/main/java/org/sonar/java/classpath/JavaSdkUtil.java
+++ b/java-frontend/src/main/java/org/sonar/java/classpath/JavaSdkUtil.java
@@ -93,7 +93,7 @@ private static boolean isJarFile(Path path) {
private static boolean isNotAlternativeImplementation(Path jarPath) {
String jarFileName = jarPath.getFileName().toString();
- return !jarFileName.equals("alt-rt.jar") && !jarFileName.equals("alt-string.jar");
+ return !"alt-rt.jar".equals(jarFileName) && !"alt-string.jar".equals(jarFileName);
}
private static Path[] collectJarDirs(Path home, boolean isMac) {
diff --git a/java-frontend/src/main/java/org/sonar/java/model/ExpressionUtils.java b/java-frontend/src/main/java/org/sonar/java/model/ExpressionUtils.java
index 67e4146d000..4f0d5de4479 100644
--- a/java-frontend/src/main/java/org/sonar/java/model/ExpressionUtils.java
+++ b/java-frontend/src/main/java/org/sonar/java/model/ExpressionUtils.java
@@ -20,6 +20,7 @@
package org.sonar.java.model;
import java.util.Optional;
+import java.util.function.BiFunction;
import javax.annotation.CheckForNull;
import javax.annotation.Nullable;
import org.sonar.plugins.java.api.semantic.Symbol;
@@ -238,6 +239,18 @@ public static Object resolveAsConstant(ExpressionTree tree) {
if (expression.is(Tree.Kind.OR)) {
return resolveOr((BinaryExpressionTree) expression);
}
+ if (expression.is(Tree.Kind.MINUS)) {
+ return resolveArithmeticOperation((BinaryExpressionTree) expression, (a, b) -> a - b, (a, b) -> a - b);
+ }
+ if (expression.is(Tree.Kind.MULTIPLY)) {
+ return resolveArithmeticOperation((BinaryExpressionTree) expression, (a, b) -> a * b, (a, b) -> a * b);
+ }
+ if (expression.is(Tree.Kind.DIVIDE)) {
+ return resolveArithmeticOperation((BinaryExpressionTree) expression, (a, b) -> a / b, (a, b) -> a / b);
+ }
+ if (expression.is(Tree.Kind.REMAINDER)) {
+ return resolveArithmeticOperation((BinaryExpressionTree) expression, (a, b) -> a % b, (a, b) -> a % b);
+ }
return null;
}
@@ -291,14 +304,28 @@ private static Object resolvePlus(BinaryExpressionTree binaryExpression) {
return ((String) left) + right;
} else if (right instanceof String) {
return left + ((String) right);
- } else if (left instanceof Long && right instanceof Long) {
- return ((Long) left) + ((Long) right);
- } else if (left instanceof Long && right instanceof Integer) {
- return ((Long) left) + ((Integer) right);
- } else if (left instanceof Integer && right instanceof Long) {
- return ((Integer) left) + ((Long) right);
- } else if (left instanceof Integer && right instanceof Integer) {
- return ((Integer) left) + ((Integer) right);
+ }
+ return resolveArithmeticOperation(left, right, Long::sum, Integer::sum);
+ }
+
+ @CheckForNull
+ private static Object resolveArithmeticOperation(BinaryExpressionTree binaryExpression,
+ BiFunction longOperation,
+ BiFunction intOperation) {
+ Object left = resolveAsConstant(binaryExpression.leftOperand());
+ Object right = resolveAsConstant(binaryExpression.rightOperand());
+ if (left == null || right == null) {
+ return null;
+ }
+ return resolveArithmeticOperation(left, right, longOperation, intOperation);
+ }
+
+ @CheckForNull
+ private static Object resolveArithmeticOperation(Object left, Object right, BiFunction longOperation, BiFunction intOperation) {
+ if (left instanceof Integer && right instanceof Integer) {
+ return intOperation.apply(((Number) left).intValue(), ((Number) right).intValue());
+ } else if ((left instanceof Long || right instanceof Long) && (left instanceof Integer || right instanceof Integer)) {
+ return longOperation.apply(((Number) left).longValue(), ((Number) right).longValue());
}
return null;
}
diff --git a/java-frontend/src/main/java/org/sonar/java/model/JMethodSymbol.java b/java-frontend/src/main/java/org/sonar/java/model/JMethodSymbol.java
index 69f5fad8d73..f944e2cd8c2 100644
--- a/java-frontend/src/main/java/org/sonar/java/model/JMethodSymbol.java
+++ b/java-frontend/src/main/java/org/sonar/java/model/JMethodSymbol.java
@@ -86,7 +86,7 @@ public List parameterTypes() {
public List declarationParameters() {
if (parameters == null) {
MethodTree declaration = declaration();
- if (declaration != null) {
+ if (declaration != null && !isCompactConstructor(declaration)) {
parameters = declaration.parameters().stream().map(VariableTree::symbol).collect(Collectors.toList());
} else {
parameters = new ArrayList<>();
@@ -100,6 +100,10 @@ public List declarationParameters() {
return parameters;
}
+ private static boolean isCompactConstructor(MethodTree methodTree) {
+ return methodTree.closeParenToken() == null;
+ }
+
/**
* @since 6.0 returns void type for constructors instead of {@code null}
*/
diff --git a/java-frontend/src/main/java/org/sonar/java/model/JParser.java b/java-frontend/src/main/java/org/sonar/java/model/JParser.java
index b85a257b491..834750c3408 100644
--- a/java-frontend/src/main/java/org/sonar/java/model/JParser.java
+++ b/java-frontend/src/main/java/org/sonar/java/model/JParser.java
@@ -1648,9 +1648,17 @@ private ExpressionStatementTreeImpl convertSuperConstructorInvocation(SuperConst
}
private YieldStatementTreeImpl convertYield(YieldStatement e) {
+ InternalSyntaxToken yieldKeyword = null;
+ if (!e.isImplicit()) {
+ try {
+ yieldKeyword = firstTokenIn(e, TerminalTokens.TokenNameRestrictedIdentifierYield);
+ } catch (AssertionError | IndexOutOfBoundsException error) {
+ // TODO ECJ bug? should be "TerminalTokens.TokenNameRestrictedIdentifierYield" in all cases
+ yieldKeyword = firstTokenIn(e, TerminalTokens.TokenNameIdentifier);
+ }
+ }
return new YieldStatementTreeImpl(
- // TODO ECJ bug? should be "TerminalTokens.TokenNameRestrictedIdentifierYield" instead
- e.isImplicit() ? null : firstTokenIn(e, TerminalTokens.TokenNameIdentifier),
+ yieldKeyword,
convertExpression(e.getExpression()),
lastTokenIn(e, TerminalTokens.TokenNameSEMICOLON)
);
diff --git a/java-frontend/src/main/java/org/sonar/java/model/JSema.java b/java-frontend/src/main/java/org/sonar/java/model/JSema.java
index 16d49b52a5f..0829b23d6ce 100644
--- a/java-frontend/src/main/java/org/sonar/java/model/JSema.java
+++ b/java-frontend/src/main/java/org/sonar/java/model/JSema.java
@@ -72,8 +72,11 @@ List types(ITypeBinding[] typeBindings) {
return Arrays.asList(result);
}
- public JPackageSymbol packageSymbol(IPackageBinding packageBinding) {
- return (JPackageSymbol) symbols.computeIfAbsent(packageBinding, k -> new JPackageSymbol(this, (IPackageBinding) k));
+ public Symbol packageSymbol(@Nullable IPackageBinding packageBinding) {
+ if (packageBinding == null) {
+ return Symbols.rootPackage;
+ }
+ return symbols.computeIfAbsent(packageBinding, k -> new JPackageSymbol(this, (IPackageBinding) k));
}
public JTypeSymbol typeSymbol(ITypeBinding typeBinding) {
diff --git a/java-frontend/src/main/java/org/sonar/java/model/JSymbolMetadata.java b/java-frontend/src/main/java/org/sonar/java/model/JSymbolMetadata.java
index 1a44e9adb97..e9720e8bc5e 100644
--- a/java-frontend/src/main/java/org/sonar/java/model/JSymbolMetadata.java
+++ b/java-frontend/src/main/java/org/sonar/java/model/JSymbolMetadata.java
@@ -159,7 +159,15 @@ private NullabilityData resolveNullability(NullabilityTarget target) {
return nullabilityDataAtLevel;
}
- // Not annotated or meta annotated, check upper level...
+ // Check nullability from the inheritance hierarchy
+ if (symbol.isMethodSymbol()) {
+ NullabilityData nullabilityDataFromInheritance = getNullabilityDataFromInheritance((Symbol.MethodSymbol) symbol, target);
+ if (nullabilityDataFromInheritance.type() != NullabilityType.NO_ANNOTATION) {
+ return nullabilityDataFromInheritance;
+ }
+ }
+
+ // Not annotated or meta annotated, check upper level in the ownership hierarchy...
if (symbol.isPackageSymbol()) {
return NO_ANNOTATION_NULLABILITY[currentLevel.ordinal()];
}
@@ -167,6 +175,19 @@ private NullabilityData resolveNullability(NullabilityTarget target) {
return owner == null ? unknownNullabilityAt(currentLevel) : owner.metadata().nullabilityData(target);
}
+ private static NullabilityData getNullabilityDataFromInheritance(Symbol.MethodSymbol methodSymbol, NullabilityTarget target) {
+ List overridenSymbols = methodSymbol.overriddenSymbols();
+ NullabilityLevel level = NullabilityLevel.METHOD;
+ for (Symbol.MethodSymbol overridenSymbol: overridenSymbols) {
+ SymbolMetadata metadata = overridenSymbol.metadata();
+ NullabilityData nullabilityData = getNullabilityDataAtLevel(metadata, target, level);
+ if (nullabilityData.type() != NullabilityType.NO_ANNOTATION && !nullabilityData.equals(unknownNullabilityAt(level))) {
+ return nullabilityData;
+ }
+ }
+ return NO_ANNOTATION_NULLABILITY[level.ordinal()];
+ }
+
@CheckForNull
private static Symbol getEffectiveOwner(Symbol symbol, NullabilityLevel currentLevel) {
Symbol owner = symbol.owner();
diff --git a/java-frontend/src/main/java/org/sonar/java/model/JavaVersionImpl.java b/java-frontend/src/main/java/org/sonar/java/model/JavaVersionImpl.java
index 65df2df8c52..3aabcdce006 100644
--- a/java-frontend/src/main/java/org/sonar/java/model/JavaVersionImpl.java
+++ b/java-frontend/src/main/java/org/sonar/java/model/JavaVersionImpl.java
@@ -37,7 +37,8 @@ public class JavaVersionImpl implements JavaVersion {
private static final int JAVA_15 = 15;
private static final int JAVA_16 = 16;
private static final int JAVA_17 = 17;
- public static final int MAX_SUPPORTED = JAVA_17;
+ private static final int JAVA_18 = 18;
+ public static final int MAX_SUPPORTED = JAVA_18;
private final int javaVersion;
@@ -107,6 +108,16 @@ public boolean isJava16Compatible() {
return JAVA_16 <= javaVersion;
}
+ @Override
+ public boolean isJava17Compatible() {
+ return JAVA_17 <= javaVersion;
+ }
+
+ @Override
+ public boolean isJava18Compatible() {
+ return JAVA_18 <= javaVersion;
+ }
+
private boolean notSetOrAtLeast(int requiredJavaVersion) {
return isNotSet() || requiredJavaVersion <= javaVersion;
}
diff --git a/java-frontend/src/main/java/org/sonar/plugins/java/api/JavaResourceLocator.java b/java-frontend/src/main/java/org/sonar/plugins/java/api/JavaResourceLocator.java
index 9f031714e88..bf7c9d70e4a 100644
--- a/java-frontend/src/main/java/org/sonar/plugins/java/api/JavaResourceLocator.java
+++ b/java-frontend/src/main/java/org/sonar/plugins/java/api/JavaResourceLocator.java
@@ -50,11 +50,29 @@ public interface JavaResourceLocator extends JavaFileScanner {
*/
Collection classFilesToAnalyze();
+ /**
+ * The folders containing the binary .class files.
+ * @return a list of folders.
+ */
+ Collection binaryDirs();
+
+ /**
+ * The folders containing the binary .class files corresponding to the tests.
+ * @return a list of folders.
+ * @since SonarJava 7.15
+ */
+ Collection testBinaryDirs();
+
/**
* Classpath configured for the project.
- * This classpath method is used by the findbugs plugin to configure the analysis.
* @return the list of jar and class files constituting the classpath of the analyzed project.
*/
Collection classpath();
+ /**
+ * Classpath configured for the project tests.
+ * @return the list of jar and class files constituting the classpath of the analyzed project.
+ * @since SonarJava 7.15
+ */
+ Collection testClasspath();
}
diff --git a/java-frontend/src/main/java/org/sonar/plugins/java/api/JavaVersion.java b/java-frontend/src/main/java/org/sonar/plugins/java/api/JavaVersion.java
index fad9e875a43..1212bf0e609 100644
--- a/java-frontend/src/main/java/org/sonar/plugins/java/api/JavaVersion.java
+++ b/java-frontend/src/main/java/org/sonar/plugins/java/api/JavaVersion.java
@@ -99,6 +99,22 @@ public interface JavaVersion {
*/
boolean isJava16Compatible();
+ /**
+ * Test if java version of the project is greater than or equal to 17.
+ * Remark - Contrary to other isJava*Compatible methods, this one will NOT return true if version is not set
+ * @return true if java version used is >= 17
+ * @since SonarJava 7.14: Support of Java 18
+ */
+ boolean isJava17Compatible();
+
+ /**
+ * Test if java version of the project is greater than or equal to 18.
+ * Remark - Contrary to other isJava*Compatible methods, this one will NOT return true if version is not set
+ * @return true if java version used is >= 18
+ * @since SonarJava 7.14: Support of Java 18
+ */
+ boolean isJava18Compatible();
+
/**
* get java version as integer
* @return an int representing the java version
diff --git a/java-frontend/src/test/java/org/sonar/java/DefaultJavaResourceLocatorTest.java b/java-frontend/src/test/java/org/sonar/java/DefaultJavaResourceLocatorTest.java
index b1813409bed..80ca854efda 100644
--- a/java-frontend/src/test/java/org/sonar/java/DefaultJavaResourceLocatorTest.java
+++ b/java-frontend/src/test/java/org/sonar/java/DefaultJavaResourceLocatorTest.java
@@ -27,9 +27,11 @@
import org.sonar.api.batch.fs.InputFile;
import org.sonar.java.ast.JavaAstScanner;
import org.sonar.java.classpath.ClasspathForMain;
+import org.sonar.java.classpath.ClasspathForTest;
import org.sonar.java.model.VisitorsBridge;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -37,13 +39,21 @@ class DefaultJavaResourceLocatorTest {
private static DefaultJavaResourceLocator javaResourceLocator;
+ private static final String BINARY_DIRS = "target/test-classes";
+ private static final String TEST_BINARY_DIRS = "target/test/test-classes";
+
@BeforeAll
public static void setup() {
ClasspathForMain javaClasspath = mock(ClasspathForMain.class);
- when(javaClasspath.getBinaryDirs()).thenReturn(Collections.singletonList(new File("target/test-classes")));
- when(javaClasspath.getElements()).thenReturn(Collections.singletonList(new File("target/test-classes")));
+ when(javaClasspath.getBinaryDirs()).thenReturn(Collections.singletonList(new File(BINARY_DIRS)));
+ when(javaClasspath.getElements()).thenReturn(Collections.singletonList(new File(BINARY_DIRS)));
+
+ ClasspathForTest javaTestClasspath = mock(ClasspathForTest.class);
+ when(javaTestClasspath.getBinaryDirs()).thenReturn(Collections.singletonList(new File(TEST_BINARY_DIRS)));
+ when(javaTestClasspath.getElements()).thenReturn(Collections.singletonList(new File(TEST_BINARY_DIRS)));
+
InputFile inputFile = TestUtils.inputFile("src/test/java/org/sonar/java/DefaultJavaResourceLocatorTest.java");
- DefaultJavaResourceLocator jrl = new DefaultJavaResourceLocator(javaClasspath);
+ DefaultJavaResourceLocator jrl = new DefaultJavaResourceLocator(javaClasspath, javaTestClasspath);
JavaAstScanner.scanSingleFileForTests(inputFile, new VisitorsBridge(jrl));
javaResourceLocator = jrl;
}
@@ -69,7 +79,42 @@ void resource_by_class_name() throws Exception {
@Test
void classpath() throws Exception {
- assertThat(javaResourceLocator.classpath()).hasSize(1);
+ var classpath = javaResourceLocator.classpath();
+ assertThat(classpath).hasSize(1);
+
+ var file = new File("");
+ assertThatThrownBy(() -> classpath.add(file))
+ .isInstanceOf(UnsupportedOperationException.class);
+ }
+
+ @Test
+ void testClasspath() throws Exception {
+ var classpath = javaResourceLocator.testClasspath();
+ assertThat(classpath).containsExactly(new File(TEST_BINARY_DIRS));
+
+ var file = new File("");
+ assertThatThrownBy(() -> classpath.add(file))
+ .isInstanceOf(UnsupportedOperationException.class);
+ }
+
+ @Test
+ void binaryDirs() {
+ var binaryDirs = javaResourceLocator.binaryDirs();
+ assertThat(binaryDirs).containsExactly(new File(BINARY_DIRS));
+
+ var file = new File("");
+ assertThatThrownBy(() -> binaryDirs.add(file))
+ .isInstanceOf(UnsupportedOperationException.class);
+ }
+
+ @Test
+ void testBinaryDirs() {
+ var binaryDirs = javaResourceLocator.testBinaryDirs();
+ assertThat(binaryDirs).containsExactly(new File(TEST_BINARY_DIRS));
+
+ var file = new File("");
+ assertThatThrownBy(() -> binaryDirs.add(file))
+ .isInstanceOf(UnsupportedOperationException.class);
}
@Test
diff --git a/java-frontend/src/test/java/org/sonar/java/JavaFrontendTest.java b/java-frontend/src/test/java/org/sonar/java/JavaFrontendTest.java
index e2c4f4a4d1f..b3461836bfd 100644
--- a/java-frontend/src/test/java/org/sonar/java/JavaFrontendTest.java
+++ b/java-frontend/src/test/java/org/sonar/java/JavaFrontendTest.java
@@ -60,6 +60,7 @@
import org.sonar.api.utils.log.LoggerLevel;
import org.sonar.java.classpath.ClasspathForMain;
import org.sonar.java.classpath.ClasspathForTest;
+import org.sonar.java.exceptions.ApiMismatchException;
import org.sonar.java.filters.SonarJavaIssueFilter;
import org.sonar.java.model.JavaVersionImpl;
import org.sonar.plugins.java.api.JavaFileScanner;
@@ -75,6 +76,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -199,7 +201,7 @@ void scanning_empty_project_should_be_logged_in_autoscan() throws Exception {
}
@Test
- void test_scan_logs_when_caching_is_enabled() {
+ void test_scan_logs_when_caching_is_enabled_and_can_skip_unchanged_files() throws ApiMismatchException {
File baseDir = temp.getRoot().getAbsoluteFile();
SensorContextTester sensorContextTester = SensorContextTester.create(baseDir);
sensorContextTester.setSettings(new MapSettings());
@@ -210,6 +212,7 @@ void test_scan_logs_when_caching_is_enabled() {
doReturn(mock(WriteCache.class)).when(spy).nextCache();
var sonarComponents = mock(SonarComponents.class);
doReturn(spy).when(sonarComponents).context();
+ doReturn(true).when(sonarComponents).canSkipUnchangedFiles();
JavaFrontend frontend = new JavaFrontend(
new JavaVersionImpl(),
@@ -234,7 +237,114 @@ void test_scan_logs_when_caching_is_enabled() {
}
@Test
- void test_scan_logs_when_caching_is_disabled() {
+ void test_scan_logs_when_caching_is_enabled_and_cannot_skip_unchanged_files() throws ApiMismatchException {
+ File baseDir = temp.getRoot().getAbsoluteFile();
+ SensorContextTester sensorContextTester = SensorContextTester.create(baseDir);
+ sensorContextTester.setSettings(new MapSettings());
+
+ SensorContext spy = spy(sensorContextTester);
+ doReturn(true).when(spy).isCacheEnabled();
+ doReturn(mock(ReadCache.class)).when(spy).previousCache();
+ doReturn(mock(WriteCache.class)).when(spy).nextCache();
+ var sonarComponents = mock(SonarComponents.class);
+ doReturn(spy).when(sonarComponents).context();
+ doReturn(false).when(sonarComponents).canSkipUnchangedFiles();
+
+ JavaFrontend frontend = new JavaFrontend(
+ new JavaVersionImpl(),
+ sonarComponents,
+ null,
+ mock(JavaResourceLocator.class),
+ mainCodeIssueScannerAndFilter
+ );
+
+ frontend.scan(Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
+ List logs = logTester.getLogs(LoggerLevel.INFO).stream()
+ .map(LogAndArguments::getFormattedMsg)
+ .collect(Collectors.toList());
+ assertThat(logs)
+ .isNotEmpty()
+ .containsExactly(
+ "Server-side caching is enabled. The Java analyzer will not try to leverage data from a previous analysis.",
+ "No \"Main\" source files to scan.",
+ "No \"Test\" source files to scan.",
+ "No \"Generated\" source files to scan."
+ );
+ }
+
+ @Test
+ void test_scan_logs_when_caching_is_enabled_and_cannot_determine_if_unchanged_files_can_be_skipped() throws ApiMismatchException {
+ File baseDir = temp.getRoot().getAbsoluteFile();
+ SensorContextTester sensorContextTester = SensorContextTester.create(baseDir);
+ sensorContextTester.setSettings(new MapSettings());
+
+ SensorContext spy = spy(sensorContextTester);
+ doReturn(true).when(spy).isCacheEnabled();
+ doReturn(mock(ReadCache.class)).when(spy).previousCache();
+ doReturn(mock(WriteCache.class)).when(spy).nextCache();
+ var sonarComponents = mock(SonarComponents.class);
+ doReturn(spy).when(sonarComponents).context();
+ doThrow(new ApiMismatchException(new NoSuchMethodError("BOOM!"))).when(sonarComponents).canSkipUnchangedFiles();
+
+ JavaFrontend frontend = new JavaFrontend(
+ new JavaVersionImpl(),
+ sonarComponents,
+ null,
+ mock(JavaResourceLocator.class),
+ mainCodeIssueScannerAndFilter
+ );
+
+ frontend.scan(Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
+ List logs = logTester.getLogs(LoggerLevel.INFO).stream()
+ .map(LogAndArguments::getFormattedMsg)
+ .collect(Collectors.toList());
+ assertThat(logs)
+ .isNotEmpty()
+ .containsExactly(
+ "Server-side caching is enabled. The Java analyzer will not try to leverage data from a previous analysis.",
+ "No \"Main\" source files to scan.",
+ "No \"Test\" source files to scan.",
+ "No \"Generated\" source files to scan."
+ );
+ }
+
+ @Test
+ void test_scan_logs_when_caching_is_disabled_and_can_skip_unchanged_files() throws ApiMismatchException {
+ File baseDir = temp.getRoot().getAbsoluteFile();
+ SensorContextTester sensorContextTester = SensorContextTester.create(baseDir);
+ sensorContextTester.setSettings(new MapSettings());
+
+ SensorContext spy = spy(sensorContextTester);
+ doReturn(false).when(spy).isCacheEnabled();
+
+ var sonarComponents = mock(SonarComponents.class);
+ doReturn(spy).when(sonarComponents).context();
+ doReturn(true).when(sonarComponents).canSkipUnchangedFiles();
+
+ JavaFrontend frontend = new JavaFrontend(
+ new JavaVersionImpl(),
+ sonarComponents,
+ null,
+ mock(JavaResourceLocator.class),
+ mainCodeIssueScannerAndFilter
+ );
+
+ frontend.scan(Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
+ List logs = logTester.getLogs(LoggerLevel.INFO).stream()
+ .map(LogAndArguments::getFormattedMsg)
+ .collect(Collectors.toList());
+ assertThat(logs)
+ .isNotEmpty()
+ .containsExactly(
+ "Server-side caching is not enabled. The Java analyzer will not try to leverage data from a previous analysis.",
+ "No \"Main\" source files to scan.",
+ "No \"Test\" source files to scan.",
+ "No \"Generated\" source files to scan."
+ );
+ }
+
+ @Test
+ void test_scan_logs_when_caching_is_disabled_and_cannot_skip_unchanged_files() throws ApiMismatchException {
File baseDir = temp.getRoot().getAbsoluteFile();
SensorContextTester sensorContextTester = SensorContextTester.create(baseDir);
sensorContextTester.setSettings(new MapSettings());
@@ -244,6 +354,7 @@ void test_scan_logs_when_caching_is_disabled() {
var sonarComponents = mock(SonarComponents.class);
doReturn(spy).when(sonarComponents).context();
+ doReturn(false).when(sonarComponents).canSkipUnchangedFiles();
JavaFrontend frontend = new JavaFrontend(
new JavaVersionImpl(),
@@ -485,10 +596,10 @@ void exceptions_outside_rules_as_batch_should_interrupt_analysis_if_fail_fast(St
@Test
void test_preview_feature_in_max_supported_version_do_not_log_message() throws IOException {
- // When the actual version match the maximum supported version (currently 17), the preview features flag is
+ // When the actual version match the maximum supported version (currently 18), the preview features flag is
// enabled in the parser config and we made sure to be able to parse preview features, no need to log anything.
logTester.setLevel(LoggerLevel.DEBUG);
- scan(new MapSettings().setProperty(JavaVersion.SOURCE_VERSION, "17"),
+ scan(new MapSettings().setProperty(JavaVersion.SOURCE_VERSION, "18"),
SONARLINT_RUNTIME, "class A { void m(String s) { switch(s) { case null: default: } } }");
assertThat(sensorContext.allAnalysisErrors()).isEmpty();
String allLogs = String.join("\n", logTester.logs());
@@ -509,7 +620,7 @@ void test_preview_feature_in_version_greater_than_maximum_do_not_log_message() t
@Test
void test_sealed_classes_in_java_16_log_message() throws IOException {
- // When the actual version is lower than the maximum supported version (currently 17),
+ // When the actual version is lower than the maximum supported version (currently 18),
// we can not guarantee that we are still parsing preview features the same way (it may have evolved) and log a message.
logTester.setLevel(LoggerLevel.DEBUG);
scan(new MapSettings().setProperty(JavaVersion.SOURCE_VERSION, "16"),
diff --git a/java-frontend/src/test/java/org/sonar/java/model/ExpressionUtilsTest.java b/java-frontend/src/test/java/org/sonar/java/model/ExpressionUtilsTest.java
index 206d528f525..40cf11b1d75 100644
--- a/java-frontend/src/test/java/org/sonar/java/model/ExpressionUtilsTest.java
+++ b/java-frontend/src/test/java/org/sonar/java/model/ExpressionUtilsTest.java
@@ -337,7 +337,18 @@ void resolve_as_string_constant() {
@Test
void resolve_as_constant_not_yet_supported() {
assertResolveAsConstant("true || true", null);
- assertResolveAsConstant("2 * 2", null);
+ }
+
+ @Test
+ void resolve_as_constant_arithmetic_operations() {
+ assertResolveAsConstant("1 + 1 - 1", 1);
+ assertResolveAsConstant("8 - 3 + 2 * 2", 9);
+ assertResolveAsConstant("8 - (3 + 2) * 2", -2);
+ assertResolveAsConstant("8 - (3 + 2) / 5 * 2", 6);
+ assertResolveAsConstant("8 - (3 + 2) % 5 * 2", 8);
+ assertResolveAsConstant("8 - (x + 2) % 5 * 2", null);
+ assertResolveAsConstant("8 - (3 + x) % 5 * 2", null);
+ assertResolveAsConstant("8 - (x + x) % 5 * 2", null);
}
@Test
diff --git a/java-frontend/src/test/java/org/sonar/java/model/JMethodSymbolTest.java b/java-frontend/src/test/java/org/sonar/java/model/JMethodSymbolTest.java
index 8f4309c908b..368e8ed3828 100644
--- a/java-frontend/src/test/java/org/sonar/java/model/JMethodSymbolTest.java
+++ b/java-frontend/src/test/java/org/sonar/java/model/JMethodSymbolTest.java
@@ -34,6 +34,8 @@
import org.sonar.java.model.declaration.ClassTreeImpl;
import org.sonar.java.model.declaration.MethodTreeImpl;
import org.sonar.java.model.expression.MethodInvocationTreeImpl;
+import org.sonar.java.model.expression.NewClassTreeImpl;
+import org.sonar.java.model.statement.ExpressionStatementTreeImpl;
import org.sonar.java.model.statement.ReturnStatementTreeImpl;
import org.sonar.plugins.java.api.semantic.MethodMatchers;
import org.sonar.plugins.java.api.semantic.Symbol;
@@ -364,6 +366,25 @@ void support_unexpected_IMethodBinding_null_return_type() {
assertThat(methodSymbol.metadata()).isSameAs(Symbols.EMPTY_METADATA);
}
+ @Test
+ void testParameterDeclarationsOfCompactConstructor() {
+ JavaTree.CompilationUnitTreeImpl cu = test(""
+ + "record TestSonar(String arg1, String arg2, String arg3, String arg4, long arg5, String arg6) {\n"
+ + " public TestSonar {}\n"
+ + " public static void f() {\n"
+ + " new TestSonar(null, null, null, null, 0L, null);\n"
+ + " }\n"
+ + "}");
+
+ ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0);
+ MethodTreeImpl m = (MethodTreeImpl) c.members().get(1);
+ ExpressionStatementTree statementTree = ((ExpressionStatementTreeImpl) m.block().body().get(0));
+ NewClassTreeImpl newClassExpression = ((NewClassTreeImpl) statementTree.expression());
+ JMethodSymbol symbol = ((JMethodSymbol) newClassExpression.constructorSymbol());
+
+ assertThat(symbol.declarationParameters()).hasSize(6);
+ }
+
private static CompilationUnitTreeImpl test(String source) {
return (CompilationUnitTreeImpl) JParserTestUtils.parse(source);
}
diff --git a/java-frontend/src/test/java/org/sonar/java/model/JParserConfigTest.java b/java-frontend/src/test/java/org/sonar/java/model/JParserConfigTest.java
index a551190c57d..6d8db5006af 100644
--- a/java-frontend/src/test/java/org/sonar/java/model/JParserConfigTest.java
+++ b/java-frontend/src/test/java/org/sonar/java/model/JParserConfigTest.java
@@ -31,8 +31,9 @@ void should_enable_preview() {
assertThat(shouldEnablePreviewFlag(new JavaVersionImpl(8))).isFalse();
assertThat(shouldEnablePreviewFlag(new JavaVersionImpl(11))).isFalse();
assertThat(shouldEnablePreviewFlag(new JavaVersionImpl(16))).isFalse();
- assertThat(shouldEnablePreviewFlag(new JavaVersionImpl(17))).isTrue();
+ assertThat(shouldEnablePreviewFlag(new JavaVersionImpl(17))).isFalse();
assertThat(shouldEnablePreviewFlag(new JavaVersionImpl(18))).isTrue();
+ assertThat(shouldEnablePreviewFlag(new JavaVersionImpl(19))).isTrue();
assertThat(shouldEnablePreviewFlag(new JavaVersionImpl(42))).isTrue();
assertThat(shouldEnablePreviewFlag(JavaVersionImpl.fromString("1.8"))).isFalse();
diff --git a/java-frontend/src/test/java/org/sonar/java/model/JSymbolTest.java b/java-frontend/src/test/java/org/sonar/java/model/JSymbolTest.java
index f84ef48cd06..10a407b0445 100644
--- a/java-frontend/src/test/java/org/sonar/java/model/JSymbolTest.java
+++ b/java-frontend/src/test/java/org/sonar/java/model/JSymbolTest.java
@@ -28,6 +28,7 @@
import org.sonar.java.model.declaration.VariableTreeImpl;
import org.sonar.java.model.statement.BlockTreeImpl;
import org.sonar.plugins.java.api.semantic.Symbol;
+import org.sonar.plugins.java.api.semantic.Type;
import org.sonar.plugins.java.api.tree.ClassTree;
import org.sonar.plugins.java.api.tree.IdentifierTree;
import org.sonar.plugins.java.api.tree.LambdaExpressionTree;
@@ -97,6 +98,9 @@ void owner() {
.hasOwner(Symbols.rootPackage)
.hasSameHashCodeAs(p.type().symbolType().symbol().hashCode());
+ assertThat(cu.sema.packageSymbol(null))
+ .isEqualTo(Symbols.rootPackage);
+
JType uType = cu.sema.type(u.variableBinding.getType());
Symbol.TypeSymbol uTypeSymbol = uType.symbol();
assertThat(uType.isUnknown()).isTrue();
@@ -104,6 +108,36 @@ void owner() {
assertThat(uTypeSymbol.owner().isUnknown()).isTrue();
}
+ @Test
+ void owner_of_types_without_package_default_to_root_package_instead_of_null() {
+ JavaTree.CompilationUnitTreeImpl cu = test("class C {\n" +
+ " Object objectField;\n" + // 'Object' is a regular type from 'java.lang' package
+ " int intField;\n" + // 'int' is a primitive type without package
+ " Object[] objectArrayField;\n" + // 'Object[]' is an array type without package
+ " java.util.List listField;\n" + // '?' is a wildcard type without package
+ "}\n"
+ );
+ ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0);
+
+ Symbol objectFieldType = ((VariableTree) c.members().get(0)).type().symbolType().symbol();
+ assertThat(objectFieldType.owner().name()).isEqualTo("java.lang");
+
+ Symbol intFieldType = ((VariableTree) c.members().get(1)).type().symbolType().symbol();
+ assertThat(intFieldType.owner().name()).isEmpty();
+ assertThat(intFieldType.owner()).isEqualTo(Symbols.rootPackage);
+
+ Symbol objectArrayFieldType = ((VariableTree) c.members().get(2)).type().symbolType().symbol();
+ assertThat(objectArrayFieldType.owner()).isEqualTo(Symbols.rootPackage);
+
+ Type listFieldTypeTree = ((VariableTree) c.members().get(3)).type().symbolType();
+ Symbol.TypeSymbol listType = listFieldTypeTree.symbol();
+ assertThat(listType.owner().name()).isEqualTo("java.util");
+ assertThat(listFieldTypeTree.typeArguments()).hasSize(1);
+ Type wildcardType = listFieldTypeTree.typeArguments().get(0);
+ assertThat(wildcardType.name()).isEqualTo("?");
+ assertThat(wildcardType.symbol().owner()).isEqualTo(Symbols.rootPackage);
+ }
+
@Test
void owner_local_record() {
JavaTree.CompilationUnitTreeImpl cu = test("class C1 { void m() { record r(Object p) { } } }");
diff --git a/java-frontend/src/test/java/org/sonar/java/model/JavaVersionImplTest.java b/java-frontend/src/test/java/org/sonar/java/model/JavaVersionImplTest.java
index 7f0350c7df7..5dc8dca8f46 100644
--- a/java-frontend/src/test/java/org/sonar/java/model/JavaVersionImplTest.java
+++ b/java-frontend/src/test/java/org/sonar/java/model/JavaVersionImplTest.java
@@ -20,6 +20,8 @@
package org.sonar.java.model;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
import org.sonar.plugins.java.api.JavaVersion;
import static org.assertj.core.api.Assertions.assertThat;
@@ -27,175 +29,48 @@
class JavaVersionImplTest {
@Test
- void no_version_set() throws Exception {
+ void no_version_set() {
JavaVersion version = new JavaVersionImpl();
assertThat(version.isSet()).isFalse();
assertThat(version.isNotSet()).isTrue();
+ // not set is considered compatible with everything <= 8
+ assertThat(version.isJava6Compatible()).isTrue();
assertThat(version.isJava7Compatible()).isTrue();
assertThat(version.isJava8Compatible()).isTrue();
+ // all the rest are incompatible
assertThat(version.isJava9Compatible()).isFalse();
assertThat(version.isJava10Compatible()).isFalse();
assertThat(version.isJava12Compatible()).isFalse();
assertThat(version.isJava14Compatible()).isFalse();
assertThat(version.isJava15Compatible()).isFalse();
assertThat(version.isJava16Compatible()).isFalse();
+ assertThat(version.isJava17Compatible()).isFalse();
+ assertThat(version.isJava18Compatible()).isFalse();
assertThat(version.asInt()).isEqualTo(-1);
}
- @Test
- void java_5() throws Exception {
- JavaVersion version = new JavaVersionImpl(5);
+ @ParameterizedTest(name = "JavaVersion: \"{0}\"")
+ @ValueSource(ints = {5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 42})
+ void java_versions(int javaVersionAsInt) {
+ JavaVersion version = new JavaVersionImpl(javaVersionAsInt);
assertThat(version.isSet()).isTrue();
assertThat(version.isNotSet()).isFalse();
- assertThat(version.isJava6Compatible()).isFalse();
- assertThat(version.isJava7Compatible()).isFalse();
- assertThat(version.isJava8Compatible()).isFalse();
- assertThat(version.isJava9Compatible()).isFalse();
- assertThat(version.isJava10Compatible()).isFalse();
- assertThat(version.isJava12Compatible()).isFalse();
- assertThat(version.isJava14Compatible()).isFalse();
- assertThat(version.isJava15Compatible()).isFalse();
- assertThat(version.isJava16Compatible()).isFalse();
- assertThat(version.asInt()).isEqualTo(5);
- }
-
- @Test
- void java_6() throws Exception {
- JavaVersion version = new JavaVersionImpl(6);
- assertThat(version.isJava6Compatible()).isTrue();
- assertThat(version.isJava7Compatible()).isFalse();
- assertThat(version.isJava8Compatible()).isFalse();
- assertThat(version.isJava9Compatible()).isFalse();
- assertThat(version.isJava10Compatible()).isFalse();
- assertThat(version.isJava12Compatible()).isFalse();
- assertThat(version.isJava14Compatible()).isFalse();
- assertThat(version.isJava15Compatible()).isFalse();
- assertThat(version.isJava16Compatible()).isFalse();
- assertThat(version.asInt()).isEqualTo(6);
- }
-
- @Test
- void java_7() throws Exception {
- JavaVersion version = new JavaVersionImpl(7);
- assertThat(version.isJava6Compatible()).isTrue();
- assertThat(version.isJava7Compatible()).isTrue();
- assertThat(version.isJava8Compatible()).isFalse();
- assertThat(version.isJava9Compatible()).isFalse();
- assertThat(version.isJava10Compatible()).isFalse();
- assertThat(version.isJava12Compatible()).isFalse();
- assertThat(version.isJava14Compatible()).isFalse();
- assertThat(version.isJava15Compatible()).isFalse();
- assertThat(version.isJava16Compatible()).isFalse();
- assertThat(version.asInt()).isEqualTo(7);
- }
-
- @Test
- void java_8() throws Exception {
- JavaVersion version = new JavaVersionImpl(8);
- assertThat(version.isJava6Compatible()).isTrue();
- assertThat(version.isJava7Compatible()).isTrue();
- assertThat(version.isJava8Compatible()).isTrue();
- assertThat(version.isJava9Compatible()).isFalse();
- assertThat(version.isJava10Compatible()).isFalse();
- assertThat(version.isJava12Compatible()).isFalse();
- assertThat(version.isJava14Compatible()).isFalse();
- assertThat(version.isJava15Compatible()).isFalse();
- assertThat(version.isJava16Compatible()).isFalse();
- assertThat(version.asInt()).isEqualTo(8);
- }
-
- @Test
- void java_9() throws Exception {
- JavaVersion version = new JavaVersionImpl(9);
- assertThat(version.isJava6Compatible()).isTrue();
- assertThat(version.isJava7Compatible()).isTrue();
- assertThat(version.isJava8Compatible()).isTrue();
- assertThat(version.isJava9Compatible()).isTrue();
- assertThat(version.isJava10Compatible()).isFalse();
- assertThat(version.isJava12Compatible()).isFalse();
- assertThat(version.isJava14Compatible()).isFalse();
- assertThat(version.isJava15Compatible()).isFalse();
- assertThat(version.isJava16Compatible()).isFalse();
- assertThat(version.asInt()).isEqualTo(9);
- }
-
- @Test
- void java_10() throws Exception {
- JavaVersion version = new JavaVersionImpl(10);
- assertThat(version.isJava6Compatible()).isTrue();
- assertThat(version.isJava7Compatible()).isTrue();
- assertThat(version.isJava8Compatible()).isTrue();
- assertThat(version.isJava9Compatible()).isTrue();
- assertThat(version.isJava10Compatible()).isTrue();
- assertThat(version.isJava12Compatible()).isFalse();
- assertThat(version.isJava14Compatible()).isFalse();
- assertThat(version.isJava15Compatible()).isFalse();
- assertThat(version.isJava16Compatible()).isFalse();
- assertThat(version.asInt()).isEqualTo(10);
- }
-
- @Test
- void java_12() {
- JavaVersion version = new JavaVersionImpl(12);
- assertThat(version.isJava6Compatible()).isTrue();
- assertThat(version.isJava7Compatible()).isTrue();
- assertThat(version.isJava8Compatible()).isTrue();
- assertThat(version.isJava9Compatible()).isTrue();
- assertThat(version.isJava10Compatible()).isTrue();
- assertThat(version.isJava12Compatible()).isTrue();
- assertThat(version.isJava14Compatible()).isFalse();
- assertThat(version.isJava15Compatible()).isFalse();
- assertThat(version.isJava16Compatible()).isFalse();
- assertThat(version.asInt()).isEqualTo(12);
- }
-
- @Test
- void java_14() {
- JavaVersion version = new JavaVersionImpl(14);
- assertThat(version.isJava6Compatible()).isTrue();
- assertThat(version.isJava7Compatible()).isTrue();
- assertThat(version.isJava8Compatible()).isTrue();
- assertThat(version.isJava9Compatible()).isTrue();
- assertThat(version.isJava10Compatible()).isTrue();
- assertThat(version.isJava12Compatible()).isTrue();
- assertThat(version.isJava14Compatible()).isTrue();
- assertThat(version.isJava15Compatible()).isFalse();
- assertThat(version.isJava16Compatible()).isFalse();
- assertThat(version.asInt()).isEqualTo(14);
- }
-
- @Test
- void java_15() {
- JavaVersion version = new JavaVersionImpl(15);
- assertThat(version.isJava6Compatible()).isTrue();
- assertThat(version.isJava7Compatible()).isTrue();
- assertThat(version.isJava8Compatible()).isTrue();
- assertThat(version.isJava9Compatible()).isTrue();
- assertThat(version.isJava10Compatible()).isTrue();
- assertThat(version.isJava12Compatible()).isTrue();
- assertThat(version.isJava14Compatible()).isTrue();
- assertThat(version.isJava15Compatible()).isTrue();
- assertThat(version.isJava16Compatible()).isFalse();
- assertThat(version.asInt()).isEqualTo(15);
- }
-
- @Test
- void java_16() {
- JavaVersion version = new JavaVersionImpl(16);
- assertThat(version.isJava6Compatible()).isTrue();
- assertThat(version.isJava7Compatible()).isTrue();
- assertThat(version.isJava8Compatible()).isTrue();
- assertThat(version.isJava9Compatible()).isTrue();
- assertThat(version.isJava10Compatible()).isTrue();
- assertThat(version.isJava12Compatible()).isTrue();
- assertThat(version.isJava14Compatible()).isTrue();
- assertThat(version.isJava15Compatible()).isTrue();
- assertThat(version.isJava16Compatible()).isTrue();
- assertThat(version.asInt()).isEqualTo(16);
+ assertThat(version.isJava6Compatible()).isEqualTo(javaVersionAsInt >= 6);
+ assertThat(version.isJava7Compatible()).isEqualTo(javaVersionAsInt >= 7);
+ assertThat(version.isJava8Compatible()).isEqualTo(javaVersionAsInt >= 8);
+ assertThat(version.isJava9Compatible()).isEqualTo(javaVersionAsInt >= 9);
+ assertThat(version.isJava10Compatible()).isEqualTo(javaVersionAsInt >= 10);
+ assertThat(version.isJava12Compatible()).isEqualTo(javaVersionAsInt >= 12);
+ assertThat(version.isJava14Compatible()).isEqualTo(javaVersionAsInt >= 14);
+ assertThat(version.isJava15Compatible()).isEqualTo(javaVersionAsInt >= 15);
+ assertThat(version.isJava16Compatible()).isEqualTo(javaVersionAsInt >= 16);
+ assertThat(version.isJava17Compatible()).isEqualTo(javaVersionAsInt >= 17);
+ assertThat(version.isJava18Compatible()).isEqualTo(javaVersionAsInt >= 18);
+ assertThat(version.asInt()).isEqualTo(javaVersionAsInt);
}
@Test
- void compatibilityMesssages() throws Exception {
+ void compatibilityMesssages() {
JavaVersion version;
version = new JavaVersionImpl();
assertThat(version.java6CompatibilityMessage()).isEqualTo(" (sonar.java.source not set. Assuming 6 or greater.)");
@@ -210,13 +85,13 @@ void compatibilityMesssages() throws Exception {
@Test
void test_effective_java_version() {
- assertThat(new JavaVersionImpl().effectiveJavaVersionAsString()).isEqualTo("17");
+ assertThat(new JavaVersionImpl().effectiveJavaVersionAsString()).isEqualTo("18");
assertThat(new JavaVersionImpl(10).effectiveJavaVersionAsString()).isEqualTo("10");
- assertThat(new JavaVersionImpl(-1).effectiveJavaVersionAsString()).isEqualTo("17");
+ assertThat(new JavaVersionImpl(-1).effectiveJavaVersionAsString()).isEqualTo("18");
}
@Test
- void test_toString() throws Exception {
+ void test_toString() {
JavaVersion version;
version = new JavaVersionImpl();
assertThat(version).hasToString("none");
@@ -226,7 +101,7 @@ void test_toString() throws Exception {
}
@Test
- void test_fromString() throws Exception {
+ void test_fromString() {
JavaVersion version;
version = JavaVersionImpl.fromString("-1");
assertThat(version.isSet()).isFalse();
diff --git a/java-frontend/src/test/java/org/sonar/java/model/expression/InstanceOfTreeImplTest.java b/java-frontend/src/test/java/org/sonar/java/model/expression/InstanceOfTreeImplTest.java
index c56258ecacc..fb78d230bb8 100644
--- a/java-frontend/src/test/java/org/sonar/java/model/expression/InstanceOfTreeImplTest.java
+++ b/java-frontend/src/test/java/org/sonar/java/model/expression/InstanceOfTreeImplTest.java
@@ -61,18 +61,21 @@ void test_PatternInstanceOfTree() {
@Test
void test_GuardedPatternInstanceOfTree() {
- InstanceOfTreeImpl ioti = instanceOf("o instanceof (String s && s.length() > 10)");
- assertThat(ioti.is(Tree.Kind.PATTERN_INSTANCE_OF)).isTrue();
-
- PatternInstanceOfTree piot = ioti;
+ ExpressionTree condition = ifCondition("o instanceof (String s && s.length() > 10)");
+ // ECJ drop the parenthesis and consider it as the two operands of a &&, while this compiles
+ assertThat(condition.is(Tree.Kind.CONDITIONAL_AND)).isTrue();
+ BinaryExpressionTree binaryExpression = (BinaryExpressionTree) condition;
+ assertThat(binaryExpression.rightOperand().is(Tree.Kind.GREATER_THAN)).isTrue();
+ ExpressionTree leftOp = binaryExpression.leftOperand();
+ assertThat(leftOp.is(Tree.Kind.PATTERN_INSTANCE_OF)).isTrue();
+ PatternInstanceOfTree piot = (PatternInstanceOfTree) leftOp;
assertThat(piot.expression()).isNotNull();
assertThat(piot.instanceofKeyword()).isNotNull();
VariableTree variable = piot.variable();
assertThat(variable).isNotNull();
assertThat(variable.simpleName().name()).isEqualTo("s");
assertThat(variable.type().symbolType().is("java.lang.String")).isTrue();
- // instanceof with guarded pattern is not fully parsed by ECJ in this version.
- // It does not crash though, and as it is a preview feature anyway, it is fine to not support it completely.
+
}
@Test
@@ -80,8 +83,16 @@ void test_PatternInstanceOfAsBinary() {
ExpressionTree condition = ifCondition("o instanceof String s && s.length() > 10");
assertThat(condition.is(Tree.Kind.CONDITIONAL_AND)).isTrue();
BinaryExpressionTree binaryExpression = (BinaryExpressionTree) condition;
- assertThat(binaryExpression.leftOperand().is(Tree.Kind.PATTERN_INSTANCE_OF)).isTrue();
assertThat(binaryExpression.rightOperand().is(Tree.Kind.GREATER_THAN)).isTrue();
+ ExpressionTree leftOp = binaryExpression.leftOperand();
+ assertThat(leftOp.is(Tree.Kind.PATTERN_INSTANCE_OF)).isTrue();
+ PatternInstanceOfTree piot = (PatternInstanceOfTree) leftOp;
+ assertThat(piot.expression()).isNotNull();
+ assertThat(piot.instanceofKeyword()).isNotNull();
+ VariableTree variable = piot.variable();
+ assertThat(variable).isNotNull();
+ assertThat(variable.simpleName().name()).isEqualTo("s");
+ assertThat(variable.type().symbolType().is("java.lang.String")).isTrue();
}
@Test
diff --git a/java-frontend/src/test/java/org/sonar/java/model/pattern/AbstractPatternTreeTest.java b/java-frontend/src/test/java/org/sonar/java/model/pattern/AbstractPatternTreeTest.java
index 6644bb0ae6c..4b6c8d67280 100644
--- a/java-frontend/src/test/java/org/sonar/java/model/pattern/AbstractPatternTreeTest.java
+++ b/java-frontend/src/test/java/org/sonar/java/model/pattern/AbstractPatternTreeTest.java
@@ -24,6 +24,7 @@
import org.junit.jupiter.api.Test;
import org.sonar.java.model.JParserTestUtils;
import org.sonar.plugins.java.api.tree.BaseTreeVisitor;
+import org.sonar.plugins.java.api.tree.BinaryExpressionTree;
import org.sonar.plugins.java.api.tree.CaseGroupTree;
import org.sonar.plugins.java.api.tree.CaseLabelTree;
import org.sonar.plugins.java.api.tree.ClassTree;
@@ -34,7 +35,6 @@
import org.sonar.plugins.java.api.tree.MethodTree;
import org.sonar.plugins.java.api.tree.NullPatternTree;
import org.sonar.plugins.java.api.tree.ParenthesizedTree;
-import org.sonar.plugins.java.api.tree.PatternTree;
import org.sonar.plugins.java.api.tree.ReturnStatementTree;
import org.sonar.plugins.java.api.tree.SwitchExpressionTree;
import org.sonar.plugins.java.api.tree.Tree;
@@ -217,12 +217,12 @@ void test_guarded_pattern_parenthesized_nested() {
ExpressionTree expression = expressions.get(0);
assertThat(expression).is(Tree.Kind.GUARDED_PATTERN);
GuardedPatternTree guardedPattern = (GuardedPatternTree) expression;
- PatternTree nestedPattern = guardedPattern.pattern();
- assertThat(nestedPattern).is(Tree.Kind.GUARDED_PATTERN);
- GuardedPatternTree nestedGuardedPattern = (GuardedPatternTree) nestedPattern;
- assertThat(nestedGuardedPattern.pattern()).is(Tree.Kind.TYPE_PATTERN);
- assertThat(nestedGuardedPattern.expression()).is(Tree.Kind.GREATER_THAN);
- assertThat(guardedPattern.expression()).is(Tree.Kind.BOOLEAN_LITERAL);
+ assertThat(guardedPattern.pattern()).is(Tree.Kind.TYPE_PATTERN);
+ // ECJ transform the guarded pattern in and drop the parenthesis
+ assertThat(guardedPattern.expression()).is(Tree.Kind.CONDITIONAL_AND);
+ BinaryExpressionTree and = (BinaryExpressionTree) guardedPattern.expression();
+ assertThat(and.leftOperand()).is(Tree.Kind.GREATER_THAN);
+ assertThat(and.rightOperand()).is(Tree.Kind.BOOLEAN_LITERAL);
}
@Test
diff --git a/java-frontend/src/test/java/org/sonar/java/reporting/InternalJavaIssueBuilderTest.java b/java-frontend/src/test/java/org/sonar/java/reporting/InternalJavaIssueBuilderTest.java
index 05f2be7c182..355769ebb0e 100644
--- a/java-frontend/src/test/java/org/sonar/java/reporting/InternalJavaIssueBuilderTest.java
+++ b/java-frontend/src/test/java/org/sonar/java/reporting/InternalJavaIssueBuilderTest.java
@@ -21,7 +21,6 @@
import java.io.File;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -36,8 +35,6 @@
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import org.sonar.api.SonarEdition;
-import org.sonar.api.SonarQubeSide;
import org.sonar.api.batch.fs.InputFile;
import org.sonar.api.batch.fs.TextPointer;
import org.sonar.api.batch.fs.TextRange;
@@ -50,9 +47,7 @@
import org.sonar.api.batch.sensor.issue.NewIssue;
import org.sonar.api.batch.sensor.issue.NewIssueLocation;
import org.sonar.api.batch.sensor.issue.internal.DefaultIssue;
-import org.sonar.api.internal.SonarRuntimeImpl;
import org.sonar.api.rule.RuleKey;
-import org.sonar.api.utils.Version;
import org.sonar.api.utils.log.LogTesterJUnit5;
import org.sonar.api.utils.log.LoggerLevel;
import org.sonar.java.SonarComponents;
@@ -569,7 +564,7 @@ public NewIssue addLocation(NewIssueLocation secondaryLocation) {
throw new IllegalStateException("Not supposed to be tested");
}
- // @Override in SonarQube 9.2
+ @Override
public NewIssue setQuickFixAvailable(boolean b) {
isQuickFixAvailable = b;
return this;
@@ -617,10 +612,20 @@ public List flows() {
throw new IllegalStateException("Not supposed to be tested");
}
- // @Override in SonarQube 9.2
+ @Override
public boolean isQuickFixAvailable() {
return isQuickFixAvailable;
}
+
+ @Override
+ public Optional ruleDescriptionContextKey() {
+ return Optional.empty();
+ }
+
+ @Override
+ public NewIssue setRuleDescriptionContextKey(String ruleDescriptionContextKey) {
+ return this;
+ }
}
}
diff --git a/java-jsp/pom.xml b/java-jsp/pom.xml
index 355e60ef3bd..3a83dd6ab1a 100644
--- a/java-jsp/pom.xml
+++ b/java-jsp/pom.xml
@@ -6,7 +6,7 @@
org.sonarsource.java
java
- 7.13.0-SNAPSHOT
+ 7.16.0-SNAPSHOT
java-jsp
@@ -15,7 +15,7 @@
- org.sonarsource.sonarqube
+ org.sonarsource.api.plugin
sonar-plugin-api
@@ -26,7 +26,7 @@
org.apache.tomcat.embed
tomcat-embed-jasper
- 9.0.33
+ 9.0.68
org.eclipse.jdt
diff --git a/java-surefire/pom.xml b/java-surefire/pom.xml
index 207337d4e3d..53a68c50139 100644
--- a/java-surefire/pom.xml
+++ b/java-surefire/pom.xml
@@ -5,7 +5,7 @@
org.sonarsource.java
java
- 7.13.0-SNAPSHOT
+ 7.16.0-SNAPSHOT
java-surefire
@@ -14,7 +14,7 @@
- org.sonarsource.sonarqube
+ org.sonarsource.api.plugin
sonar-plugin-api
provided
diff --git a/java-symbolic-execution/pom.xml b/java-symbolic-execution/pom.xml
index 3257a3c53bb..18770789286 100644
--- a/java-symbolic-execution/pom.xml
+++ b/java-symbolic-execution/pom.xml
@@ -5,7 +5,7 @@
org.sonarsource.java
java
- 7.13.0-SNAPSHOT
+ 7.16.0-SNAPSHOT
java-symbolic-execution
@@ -19,7 +19,7 @@
${project.version}
- org.sonarsource.sonarqube
+ org.sonarsource.api.plugin
sonar-plugin-api
provided
@@ -63,17 +63,17 @@
mockito-junit-jupiter
test
-
+
commons-io
commons-io
test
-
+
com.google.guava
guava
test
-
+
diff --git a/java-symbolic-execution/src/main/java/org/sonar/java/se/ExplodedGraphWalker.java b/java-symbolic-execution/src/main/java/org/sonar/java/se/ExplodedGraphWalker.java
index e02326284ef..5f9f3c58918 100644
--- a/java-symbolic-execution/src/main/java/org/sonar/java/se/ExplodedGraphWalker.java
+++ b/java-symbolic-execution/src/main/java/org/sonar/java/se/ExplodedGraphWalker.java
@@ -126,6 +126,8 @@ public class ExplodedGraphWalker {
public static final MethodMatchers EQUALS_METHODS = MethodMatchers.or(
EQUALS,
MethodMatchers.create().ofTypes("java.util.Objects").names("equals").withAnyParameters().build());
+ public static final MethodMatchers BOOLEAN_VALUE_MATCHER = MethodMatchers.create().ofTypes("java.lang.Boolean")
+ .names("booleanValue").addWithoutParametersMatcher().build();
private final AlwaysTrueOrFalseExpressionCollector alwaysTrueOrFalseExpressionCollector;
private MethodTree methodTree;
diff --git a/java-symbolic-execution/src/main/java/org/sonar/java/se/NullabilityDataUtils.java b/java-symbolic-execution/src/main/java/org/sonar/java/se/NullabilityDataUtils.java
index fa1db1f58e4..97022989da7 100644
--- a/java-symbolic-execution/src/main/java/org/sonar/java/se/NullabilityDataUtils.java
+++ b/java-symbolic-execution/src/main/java/org/sonar/java/se/NullabilityDataUtils.java
@@ -45,7 +45,7 @@ public static Optional nullabilityAsString(SymbolMetadata.NullabilityDat
private static String getAnnotationName(SymbolMetadata.AnnotationInstance annotation) {
String name = annotation.symbol().name();
- if (name.equals("Nonnull")) {
+ if ("Nonnull".equals(name)) {
return name + annotationArguments(annotation.values());
}
return name;
diff --git a/java-symbolic-execution/src/main/java/org/sonar/java/se/checks/DivisionByZeroCheck.java b/java-symbolic-execution/src/main/java/org/sonar/java/se/checks/DivisionByZeroCheck.java
index 3d1b59e717a..cfcc66b8875 100644
--- a/java-symbolic-execution/src/main/java/org/sonar/java/se/checks/DivisionByZeroCheck.java
+++ b/java-symbolic-execution/src/main/java/org/sonar/java/se/checks/DivisionByZeroCheck.java
@@ -441,7 +441,7 @@ private boolean checkZeroLiteral(LiteralTree literalTree) {
**/
private static boolean isZeroLiteral(LiteralTree literalTree, String value) {
if (value.length() == 1) {
- return value.equals("0");
+ return "0".equals(value);
}
int startIndex = 0;
int endIndex = value.length() - 1;
diff --git a/java-symbolic-execution/src/main/java/org/sonar/java/se/checks/OptionalGetBeforeIsPresentCheck.java b/java-symbolic-execution/src/main/java/org/sonar/java/se/checks/OptionalGetBeforeIsPresentCheck.java
index 12dfcdede29..b20d5159b92 100644
--- a/java-symbolic-execution/src/main/java/org/sonar/java/se/checks/OptionalGetBeforeIsPresentCheck.java
+++ b/java-symbolic-execution/src/main/java/org/sonar/java/se/checks/OptionalGetBeforeIsPresentCheck.java
@@ -19,12 +19,13 @@
*/
package org.sonar.java.se.checks;
-import org.sonar.java.Preconditions;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
+import java.util.Optional;
import javax.annotation.Nullable;
import org.sonar.check.Rule;
+import org.sonar.java.Preconditions;
import org.sonar.java.se.CheckerContext;
import org.sonar.java.se.ProgramState;
import org.sonar.java.se.constraint.BooleanConstraint;
@@ -191,16 +192,17 @@ public boolean references(SymbolicValue other) {
}
private static class PreStatementVisitor extends CheckerTreeNodeVisitor {
-
private final CheckerContext context;
private final ConstraintManager constraintManager;
private final SECheck check;
+ private final boolean java11;
private PreStatementVisitor(SECheck check, CheckerContext context) {
super(context.getState());
this.context = context;
this.constraintManager = context.getConstraintManager();
this.check = check;
+ this.java11 = context.getScannerContext().getJavaVersion().asInt() >= 11;
}
@Override
@@ -209,52 +211,97 @@ public void visitMethodInvocation(MethodInvocationTree tree) {
return;
}
- SymbolicValue peek = programState.peekValue();
- if (OPTIONAL_TEST_METHODS.matches(tree)) {
- constraintManager.setValueFactory(() -> new OptionalTestMethodSymbolicValue(peek, tree.symbol()));
- } else if (OPTIONAL_GET.matches(tree) && presenceHasNotBeenChecked(programState.peekValueSymbol())) {
- context.addExceptionalYield(peek, programState, "java.util.NoSuchElementException", check);
- reportIssue(tree);
- // continue exploration after reporting, assuming the optional is now present (killing any noise after the initial issue)
- programState = programState.addConstraint(peek, OptionalConstraint.PRESENT);
+ if (OPTIONAL_GET.matches(tree)) {
+ handleOptionalGetMethod(tree);
+ } else if (OPTIONAL_TEST_METHODS.matches(tree)) {
+ handleOptionalTestMethods(tree);
} else if (OPTIONAL_FILTER.matches(tree)) {
- // filter has one parameter, so optional is next item on stack
- SymbolicValue optionalSV = programState.peekValue(1);
-
- if (programState.getConstraint(optionalSV, OptionalConstraint.class) == OptionalConstraint.NOT_PRESENT) {
- // reuse the same optional - filtering a non-present optional is a no-op
- constraintManager.setValueFactory(() -> optionalSV);
- } else {
- constraintManager.setValueFactory(() -> new FilteredOptionalSymbolicValue(optionalSV));
- }
+ handleOptionalFilterMethod();
} else if (OPTIONAL_ORELSE.matches(tree)) {
- ProgramState.Pop pop = programState.unstackValue(2);
- SymbolicValue orElseValue = pop.values.get(0);
- SymbolicValue optional = pop.values.get(1);
- List psEmpty = optional.setConstraint(pop.state.stackValue(orElseValue), OptionalConstraint.NOT_PRESENT);
- SymbolicValue symbolicValue;
- if(optional instanceof OptionalSymbolicValue) {
- symbolicValue = ((OptionalSymbolicValue) optional).wrappedValue;
- } else {
- symbolicValue = constraintManager.createSymbolicValue(tree);
- }
- List psPresent = optional.setConstraint(pop.state.stackValue(symbolicValue), OptionalConstraint.PRESENT);
- psEmpty.forEach(context::addTransition);
- psPresent.forEach(context::addTransition);
+ handleOptionalOrElseMethod(tree);
+ } else if (OPTIONAL_OF.matches(tree)) {
+ handleOptionalOfMethod();
+ } else if (OPTIONAL_OF_NULLABLE.matches(tree)) {
+ handleOptionalOfNullableMethod();
+ }
+ }
+
+ private void handleOptionalOfMethod() {
+ constraintManager.setValueFactory(() -> new OptionalSymbolicValue(programState.peekValue()));
+ }
+
+ private void handleOptionalTestMethods(MethodInvocationTree tree) {
+ constraintManager.setValueFactory(() -> new OptionalTestMethodSymbolicValue(programState.peekValue(), tree.symbol()));
+ }
+
+ private void handleOptionalGetMethod(MethodInvocationTree tree) {
+ if (presenceHasNotBeenChecked(programState.peekValueSymbol())) {
+ SymbolicValue optionalSV = Objects.requireNonNull(programState.peekValue());
+ context.addExceptionalYield(optionalSV, programState, "java.util.NoSuchElementException", check);
+ reportIssue(tree);
+ // continue exploration after reporting, assuming the optional is now present (killing any noise after the initial issue)
+ programState = programState.addConstraint(optionalSV, OptionalConstraint.PRESENT);
+ }
+ }
+
+ private void handleOptionalFilterMethod() {
+ // filter has one parameter, so optional is next item on stack
+ SymbolicValue optionalSV = programState.peekValue(1);
+
+ if (programState.getConstraint(optionalSV, OptionalConstraint.class) == OptionalConstraint.NOT_PRESENT) {
+ // reuse the same optional - filtering a non-present optional is a no-op
+ constraintManager.setValueFactory(() -> optionalSV);
+ } else {
+ constraintManager.setValueFactory(() -> new FilteredOptionalSymbolicValue(optionalSV));
+ }
+ }
+
+ private void handleOptionalOrElseMethod(MethodInvocationTree tree) {
+ ProgramState.Pop pop = programState.unstackValue(2);
+ SymbolicValue orElseValue = pop.values.get(0);
+ SymbolicValue optional = pop.values.get(1);
+ List psEmpty = optional.setConstraint(pop.state.stackValue(orElseValue), OptionalConstraint.NOT_PRESENT);
+ SymbolicValue symbolicValue;
+ if(optional instanceof OptionalSymbolicValue) {
+ symbolicValue = ((OptionalSymbolicValue) optional).wrappedValue;
+ } else {
+ symbolicValue = constraintManager.createSymbolicValue(tree);
+ }
+ List psPresent = optional.setConstraint(pop.state.stackValue(symbolicValue), OptionalConstraint.PRESENT);
+ psEmpty.forEach(context::addTransition);
+ psPresent.forEach(context::addTransition);
+ // interrupt current path to only use transitions
+ programState = null;
+ }
+
+ private void handleOptionalOfNullableMethod() {
+ SymbolicValue ofNullableParameter = Objects.requireNonNull(programState.peekValue());
+ ObjectConstraint nullability = programState.getConstraint(ofNullableParameter, ObjectConstraint.class);
+ if (nullability != null) {
+ constraintManager.setValueFactory(() -> new OptionalSymbolicValue(ofNullableParameter));
+ } else {
+ SymbolicValue optionalSV = new OptionalSymbolicValue(ofNullableParameter);
+ ProgramState newState = programState.unstackValue(2).state.stackValue(optionalSV);
+ // if NULL -> OptionalSV = NOT_PRESENT
+ ofNullableParameter.setConstraint(newState, ObjectConstraint.NULL).stream()
+ .map(ps -> optionalSV.setConstraint(ps, OptionalConstraint.NOT_PRESENT))
+ .flatMap(List::stream)
+ .forEach(context::addTransition);
+ // if NOT_NULL -> OptionalSV = PRESENT
+ ofNullableParameter.setConstraint(newState, ObjectConstraint.NOT_NULL).stream()
+ .map(ps -> optionalSV.setConstraint(ps, OptionalConstraint.PRESENT))
+ .flatMap(List::stream)
+ .forEach(context::addTransition);
+ // interrupt current path to only use transitions
programState = null;
- } else if (OPTIONAL_OF.matches(tree) || OPTIONAL_OF_NULLABLE.matches(tree)) {
- constraintManager.setValueFactory(() -> new OptionalSymbolicValue(peek));
}
}
private void reportIssue(MethodInvocationTree mit) {
- String identifier = getIdentifierPart(mit.methodSelect());
- String issueMsg = identifier.isEmpty() ? "Optional#" : (identifier + ".");
Tree reportTree = mit.methodSelect().is(Tree.Kind.MEMBER_SELECT) ? ((MemberSelectExpressionTree) mit.methodSelect()).expression() : mit;
- String isEmptySuggestion = context.getScannerContext().getJavaVersion().asInt() >= 11 ?
- String.format(" or \"!%sisEmpty()\"", issueMsg) : "";
- context.reportIssue(reportTree, check,
- String.format("Call \"%sisPresent()\"%s before accessing the value.", issueMsg, isEmptySuggestion));
+ String owner = getIdentifierPart(mit.methodSelect()).map(name -> name + ".").orElse("Optional#");
+ String alternative = java11 ? String.format(" or \"!%sisEmpty()\"", owner) : "";
+ context.reportIssue(reportTree, check, String.format("Call \"%sisPresent()\"%s before accessing the value.", owner, alternative));
}
private boolean presenceHasNotBeenChecked(ProgramState.SymbolicValueSymbol symbolicValueSymbol) {
@@ -269,14 +316,14 @@ private boolean presenceHasNotBeenChecked(ProgramState.SymbolicValueSymbol symbo
return optionalConstraint != OptionalConstraint.PRESENT;
}
- private static String getIdentifierPart(ExpressionTree methodSelect) {
+ private static Optional getIdentifierPart(ExpressionTree methodSelect) {
if (methodSelect.is(Tree.Kind.MEMBER_SELECT)) {
ExpressionTree expression = ((MemberSelectExpressionTree) methodSelect).expression();
if (expression.is(Tree.Kind.IDENTIFIER)) {
- return ((IdentifierTree) expression).name();
+ return Optional.of(((IdentifierTree) expression).name());
}
}
- return "";
+ return Optional.empty();
}
private static boolean isInvocationOnClassInstanceField(MethodInvocationTree mit) {
diff --git a/java-symbolic-execution/src/main/java/org/sonar/java/se/checks/StreamNotConsumedCheck.java b/java-symbolic-execution/src/main/java/org/sonar/java/se/checks/StreamNotConsumedCheck.java
index 61d9585cbaa..e8deb33fdc9 100644
--- a/java-symbolic-execution/src/main/java/org/sonar/java/se/checks/StreamNotConsumedCheck.java
+++ b/java-symbolic-execution/src/main/java/org/sonar/java/se/checks/StreamNotConsumedCheck.java
@@ -54,7 +54,8 @@ public void checkEndOfExecutionPath(CheckerContext context, ConstraintManager co
Collections.singletonList(StreamConsumedCheck.StreamPipelineConstraint.class),
Collections.emptySet(), FlowComputation.FIRST_FLOW);
Flow flow = flows.iterator().next();
- JavaFileScannerContext.Location location = flow.elements().get(0);
+ var elements = flow.elements();
+ JavaFileScannerContext.Location location = elements.get(elements.size() - 1);
reportIssue(location.syntaxNode, "Refactor the code so this stream pipeline is used.");
});
}
diff --git a/java-symbolic-execution/src/main/java/org/sonar/java/se/checks/UnclosedResourcesCheck.java b/java-symbolic-execution/src/main/java/org/sonar/java/se/checks/UnclosedResourcesCheck.java
index d189259508c..55e1984e49c 100644
--- a/java-symbolic-execution/src/main/java/org/sonar/java/se/checks/UnclosedResourcesCheck.java
+++ b/java-symbolic-execution/src/main/java/org/sonar/java/se/checks/UnclosedResourcesCheck.java
@@ -126,7 +126,7 @@ public String valueAsString() {
MethodMatchers.create()
.ofTypes("org.apache.commons.io.IOUtils")
.name(name -> name.startsWith("read") || name.startsWith("copy") || name.startsWith("contentEquals")
- || name.startsWith("skip") || name.equals("consume"))
+ || name.startsWith("skip") || "consume".equals(name))
.withAnyParameters()
.build()
);
diff --git a/java-symbolic-execution/src/main/java/org/sonar/java/se/constraint/ConstraintManager.java b/java-symbolic-execution/src/main/java/org/sonar/java/se/constraint/ConstraintManager.java
index 2a09089879f..fe622847fda 100644
--- a/java-symbolic-execution/src/main/java/org/sonar/java/se/constraint/ConstraintManager.java
+++ b/java-symbolic-execution/src/main/java/org/sonar/java/se/constraint/ConstraintManager.java
@@ -145,6 +145,8 @@ public SymbolicValue createMethodSymbolicValue(MethodInvocationTree syntaxNode,
ProgramState.SymbolicValueSymbol leftOp = values.get(1);
ProgramState.SymbolicValueSymbol rightOp = values.get(0);
result.computedFrom(Arrays.asList(rightOp, leftOp));
+ } else if (ExplodedGraphWalker.BOOLEAN_VALUE_MATCHER.matches(syntaxNode)) {
+ result = values.get(0).symbolicValue();
} else {
result = createDefaultSymbolicValue();
}
diff --git a/java-symbolic-execution/src/main/resources/org/sonar/java/se/xproc/org.apache.commons.lang.json b/java-symbolic-execution/src/main/resources/org/sonar/java/se/xproc/org.apache.commons.lang.json
index 50b5cf26eb8..f12ee0bb6b2 100644
--- a/java-symbolic-execution/src/main/resources/org/sonar/java/se/xproc/org.apache.commons.lang.json
+++ b/java-symbolic-execution/src/main/resources/org/sonar/java/se/xproc/org.apache.commons.lang.json
@@ -203,5 +203,545 @@
]
}
]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isEmpty([Z)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isEmpty([B)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isEmpty([C)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isEmpty([D)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isEmpty([F)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isEmpty([I)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isEmpty([J)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isEmpty([S)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isEmpty([Ljava/lang/Object;)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isNotEmpty([Z)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isNotEmpty([B)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isNotEmpty([C)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isNotEmpty([D)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isNotEmpty([F)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isNotEmpty([I)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isNotEmpty([J)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isNotEmpty([S)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang.ArrayUtils#isNotEmpty([Ljava/lang/Object;)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
}
]
diff --git a/java-symbolic-execution/src/main/resources/org/sonar/java/se/xproc/org.apache.commons.lang3.json b/java-symbolic-execution/src/main/resources/org/sonar/java/se/xproc/org.apache.commons.lang3.json
index 9dd755d0c6a..cbb6e3f4a4a 100644
--- a/java-symbolic-execution/src/main/resources/org/sonar/java/se/xproc/org.apache.commons.lang3.json
+++ b/java-symbolic-execution/src/main/resources/org/sonar/java/se/xproc/org.apache.commons.lang3.json
@@ -216,5 +216,545 @@
"exception": "java.lang.NullPointerException"
}
]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isEmpty([Z)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isEmpty([B)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isEmpty([C)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isEmpty([D)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isEmpty([F)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isEmpty([I)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isEmpty([J)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isEmpty([Ljava/lang/Object;)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isEmpty([S)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isNotEmpty([Z)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isNotEmpty([B)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isNotEmpty([C)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isNotEmpty([D)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isNotEmpty([F)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isNotEmpty([I)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isNotEmpty([J)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isNotEmpty([S)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
+ },
+ {
+ "signature": "org.apache.commons.lang3.ArrayUtils#isNotEmpty([Ljava/lang/Object;)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL"
+ ]
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "FALSE"
+ ]
+ }
+ ]
}
]
diff --git a/java-symbolic-execution/src/main/resources/org/sonar/java/se/xproc/org.springframework.util.json b/java-symbolic-execution/src/main/resources/org/sonar/java/se/xproc/org.springframework.util.json
index 8e7c3ab8df2..16a563ee698 100644
--- a/java-symbolic-execution/src/main/resources/org/sonar/java/se/xproc/org.springframework.util.json
+++ b/java-symbolic-execution/src/main/resources/org/sonar/java/se/xproc/org.springframework.util.json
@@ -688,5 +688,33 @@
]
}
]
+ },
+ {
+ "signature": "org.springframework.util.StringUtils#isEmpty(Ljava/lang/Object;)Z",
+ "varArgs": false,
+ "declaredExceptions": [],
+ "yields": [
+ {
+ "parametersConstraints": [
+ [
+ "NOT_NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": null
+ },
+ {
+ "parametersConstraints": [
+ [
+ "NULL"
+ ]
+ ],
+ "resultIndex": -1,
+ "resultConstraint": [
+ "NOT_NULL",
+ "TRUE"
+ ]
+ }
+ ]
}
]
diff --git a/java-symbolic-execution/src/test/java/org/sonar/java/se/ExplodedGraphWalkerTest.java b/java-symbolic-execution/src/test/java/org/sonar/java/se/ExplodedGraphWalkerTest.java
index 363988c2dfb..eac788e61b6 100644
--- a/java-symbolic-execution/src/test/java/org/sonar/java/se/ExplodedGraphWalkerTest.java
+++ b/java-symbolic-execution/src/test/java/org/sonar/java/se/ExplodedGraphWalkerTest.java
@@ -165,7 +165,7 @@ void switchExpression() {
}
/**
- * Checking that Java 17 patterns do not fail SE engine
+ * Checking that Java 18 patterns do not fail SE engine
* TODO once feature is final: make sure learned constraints propagate in branches
*/
@Test
@@ -174,7 +174,7 @@ void switchWithPatterns() {
.onFile(TestUtils.nonCompilingTestSourcesPath("symbolicexecution/engine/SwitchWithPatterns.java"))
.withChecks(seChecks())
.withClassPath(SETestUtils.CLASS_PATH)
- .withJavaVersion(17)
+ .withJavaVersion(18)
.verifyNoIssues();
}
diff --git a/java-symbolic-execution/src/test/java/org/sonar/java/se/checks/ConditionAlwaysTrueOrFalseCheckTest.java b/java-symbolic-execution/src/test/java/org/sonar/java/se/checks/ConditionAlwaysTrueOrFalseCheckTest.java
index b40e4198e80..2af5d5c178f 100644
--- a/java-symbolic-execution/src/test/java/org/sonar/java/se/checks/ConditionAlwaysTrueOrFalseCheckTest.java
+++ b/java-symbolic-execution/src/test/java/org/sonar/java/se/checks/ConditionAlwaysTrueOrFalseCheckTest.java
@@ -26,6 +26,7 @@
import org.sonar.java.se.utils.SETestUtils;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.java.checks.verifier.TestUtils.mainCodeSourcesPath;
import static org.sonar.java.checks.verifier.TestUtils.nonCompilingTestSourcesPath;
import static org.sonar.java.checks.verifier.TestUtils.testSourcesPath;
@@ -161,4 +162,14 @@ void test_binary_expressions_always_not_null() {
.withClassPath(SETestUtils.CLASS_PATH)
.verifyIssues();
}
+
+ @Test
+ void test_nullable_inheritance() {
+ SECheckVerifier.newVerifier()
+ .onFile(mainCodeSourcesPath("symbolicexecution/checks/NullableInheritance.java"))
+ .withChecks(new ConditionalUnreachableCodeCheck())
+ .withClassPath(SETestUtils.CLASS_PATH)
+ .verifyIssues();
+ }
+
}
diff --git a/java-symbolic-execution/src/test/java/org/sonar/java/se/checks/NullDereferenceCheckTest.java b/java-symbolic-execution/src/test/java/org/sonar/java/se/checks/NullDereferenceCheckTest.java
index c75028f15e2..7052894b539 100644
--- a/java-symbolic-execution/src/test/java/org/sonar/java/se/checks/NullDereferenceCheckTest.java
+++ b/java-symbolic-execution/src/test/java/org/sonar/java/se/checks/NullDereferenceCheckTest.java
@@ -21,6 +21,9 @@
import org.junit.jupiter.api.Test;
import org.sonar.java.se.SECheckVerifier;
+import org.sonar.java.se.utils.SETestUtils;
+
+import static org.sonar.java.checks.verifier.TestUtils.mainCodeSourcesPath;
class NullDereferenceCheckTest {
@@ -95,4 +98,13 @@ void test_npe_transitive() throws Exception {
.withCheck(new NullDereferenceCheck())
.verifyIssues();
}
+
+ @Test
+ void test_booleanValue_method() throws Exception {
+ SECheckVerifier.newVerifier()
+ .onFile(mainCodeSourcesPath("symbolicexecution/checks/NullFromBooleanValueCall.java"))
+ .withChecks(new NullDereferenceCheck())
+ .withClassPath(SETestUtils.CLASS_PATH)
+ .verifyNoIssues();
+ }
}
diff --git a/java-symbolic-execution/src/test/java/org/sonar/java/se/checks/OptionalGetBeforeIsPresentCheckTest.java b/java-symbolic-execution/src/test/java/org/sonar/java/se/checks/OptionalGetBeforeIsPresentCheckTest.java
index e636ee2c1d0..bac682543df 100644
--- a/java-symbolic-execution/src/test/java/org/sonar/java/se/checks/OptionalGetBeforeIsPresentCheckTest.java
+++ b/java-symbolic-execution/src/test/java/org/sonar/java/se/checks/OptionalGetBeforeIsPresentCheckTest.java
@@ -47,6 +47,16 @@ void test_with_jdk_11() {
.verifyIssues();
}
+ @Test
+ void test_ofNullable() {
+ SECheckVerifier.newVerifier()
+ .onFile(mainCodeSourcesPath("symbolicexecution/checks/OptionalGetBeforeIsPresentCheck_ofNullable.java"))
+ .withChecks(new OptionalGetBeforeIsPresentCheck(), new NullDereferenceCheck())
+ .withClassPath(SETestUtils.CLASS_PATH)
+ .withJavaVersion(11)
+ .verifyNoIssues();
+ }
+
@Test
void invocation_leading_to_NoSuchElementException() {
SECheckVerifier.newVerifier()
diff --git a/java-symbolic-execution/src/test/java/org/sonar/java/se/xproc/BehaviorCacheTest.java b/java-symbolic-execution/src/test/java/org/sonar/java/se/xproc/BehaviorCacheTest.java
index 40548d2457c..a258805f6ce 100644
--- a/java-symbolic-execution/src/test/java/org/sonar/java/se/xproc/BehaviorCacheTest.java
+++ b/java-symbolic-execution/src/test/java/org/sonar/java/se/xproc/BehaviorCacheTest.java
@@ -33,20 +33,21 @@
import org.sonar.api.batch.fs.InputFile;
import org.sonar.api.utils.log.LogTesterJUnit5;
import org.sonar.api.utils.log.LoggerLevel;
+import org.sonar.java.checks.verifier.TestUtils;
import org.sonar.java.model.DefaultJavaFileScannerContext;
import org.sonar.java.model.JavaTree.CompilationUnitTreeImpl;
import org.sonar.java.model.JavaVersionImpl;
import org.sonar.java.model.Sema;
import org.sonar.java.se.CheckerContext;
import org.sonar.java.se.CheckerDispatcher;
-import org.sonar.java.se.utils.JParserTestUtils;
import org.sonar.java.se.Pair;
import org.sonar.java.se.ProgramState;
-import org.sonar.java.se.utils.SETestUtils;
import org.sonar.java.se.SymbolicExecutionVisitor;
-import org.sonar.java.checks.verifier.TestUtils;
+import org.sonar.java.se.checks.DivisionByZeroCheck;
import org.sonar.java.se.checks.NullDereferenceCheck;
import org.sonar.java.se.checks.SECheck;
+import org.sonar.java.se.utils.JParserTestUtils;
+import org.sonar.java.se.utils.SETestUtils;
import org.sonar.plugins.java.api.JavaFileScannerContext;
import org.sonar.plugins.java.api.semantic.Symbol;
import org.sonar.plugins.java.api.tree.MethodInvocationTree;
@@ -104,7 +105,7 @@ void compute_behavior_only_once() throws Exception {
@Test
void explore_method_with_recursive_call() throws Exception {
- SymbolicExecutionVisitor sev = createSymbolicExecutionVisitor("src/test/resources/se/RecursiveCall.java",
+ SymbolicExecutionVisitor sev = createSymbolicExecutionVisitor("src/test/resources/se/RecursiveCall.java",
new NullDereferenceCheck());
assertThat(sev.behaviorCache.behaviors).hasSize(1);
assertThat(sev.behaviorCache.behaviors.keySet().iterator().next()).contains("#foo");
@@ -112,7 +113,7 @@ void explore_method_with_recursive_call() throws Exception {
@Test
void interrupted_exploration_does_not_create_method_yields() throws Exception {
- SymbolicExecutionVisitor sev =
+ SymbolicExecutionVisitor sev =
createSymbolicExecutionVisitor("src/test/files/se/PartialMethodYieldMaxStep.java", new NullDereferenceCheck());
assertThat(sev.behaviorCache.behaviors.entrySet()).hasSize(2);
@@ -127,7 +128,7 @@ void interrupted_exploration_does_not_create_method_yields() throws Exception {
@Test
void clear_stack_when_taking_exceptional_path_from_method_invocation() throws Exception {
- Pair sevAndSemantic =
+ Pair sevAndSemantic =
createSymbolicExecutionVisitorAndSemantic("src/test/files/se/CleanStackWhenRaisingException.java", new NullDereferenceCheck());
SymbolicExecutionVisitor sev = sevAndSemantic.a;
Sema semanticModel = sevAndSemantic.b;
@@ -149,17 +150,17 @@ void hardcoded_behaviors() throws Exception {
List inputFiles = Arrays.asList(
"src/test/files/se/Log4jAssert.java",
- TestUtils.testSourcesPath("symbolicexecution/behaviorcache/JavaLangMathMethods.java"),
- TestUtils.testSourcesPath("symbolicexecution/behaviorcache/CommonsLangValidate.java"),
- TestUtils.testSourcesPath("symbolicexecution/behaviorcache/CommonsLang3StringUtilsMethods.java"),
- TestUtils.testSourcesPath("symbolicexecution/behaviorcache/CommonsLang2StringUtilsMethods.java"),
- TestUtils.testSourcesPath("symbolicexecution/behaviorcache/ObjectsMethodsMethodBehaviors.java"),
- TestUtils.testSourcesPath("symbolicexecution/behaviorcache/GuavaPreconditionsMethods.java"),
- TestUtils.testSourcesPath("symbolicexecution/behaviorcache/GuavaCommonStrings.java"),
- TestUtils.testSourcesPath("symbolicexecution/behaviorcache/GuavaVerifyMethods.java"),
- TestUtils.testSourcesPath("symbolicexecution/behaviorcache/CollectionUtilsIsEmpty.java"),
- TestUtils.testSourcesPath("symbolicexecution/behaviorcache/SpringAssert.java"),
- TestUtils.testSourcesPath("symbolicexecution/behaviorcache/EclipseAssert.java"))
+ TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/JavaLangMathMethods.java"),
+ TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/CommonsLangValidate.java"),
+ TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/CommonsLang3StringUtilsMethods.java"),
+ TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/CommonsLang2StringUtilsMethods.java"),
+ TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/ObjectsMethodsMethodBehaviors.java"),
+ TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/GuavaPreconditionsMethods.java"),
+ TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/GuavaCommonStrings.java"),
+ TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/GuavaVerifyMethods.java"),
+ TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/CollectionUtilsIsEmpty.java"),
+ TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/SpringAssert.java"),
+ TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/EclipseAssert.java"))
.stream()
.map(File::new)
.map(SETestUtils::inputFile)
@@ -172,53 +173,64 @@ void hardcoded_behaviors() throws Exception {
}
assertThat(behaviorCache.behaviors).isEmpty();
- assertThat(behaviorCache.hardcodedBehaviors()).hasSize(179);
- assertThat(logTester.logs(LoggerLevel.DEBUG)).containsOnly("[SE] Loaded 179 hardcoded method behaviors.");
+ assertThat(behaviorCache.hardcodedBehaviors()).hasSize(216);
+ assertThat(logTester.logs(LoggerLevel.DEBUG)).containsOnly("[SE] Loaded 216 hardcoded method behaviors.");
}
@Test
void java_lang_math_methods_should_be_handled() throws Exception {
- verifyNoIssueOnFile(TestUtils.testSourcesPath("symbolicexecution/behaviorcache/JavaLangMathMethods.java"));
+ verifyNoIssueOnFile(TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/JavaLangMathMethods.java"));
}
@Test
void commons_lang3_string_utils_method_should_be_handled() throws Exception {
- verifyNoIssueOnFile(TestUtils.testSourcesPath("symbolicexecution/behaviorcache/CommonsLang3StringUtilsMethods.java"));
+ verifyNoIssueOnFile(TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/CommonsLang3StringUtilsMethods.java"));
+ }
+
+ @Test
+ void commons_lang3_array_utils_method_should_be_handled() throws Exception {
+ verifyNoIssueOnFile(TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/CommonsLang3ArrayUtilsMethods.java"));
}
@Test
void commons_lang2_string_utils_method_should_be_handled() throws Exception {
- verifyNoIssueOnFile(TestUtils.testSourcesPath("symbolicexecution/behaviorcache/CommonsLang2StringUtilsMethods.java"));
+ verifyNoIssueOnFile(TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/CommonsLang2StringUtilsMethods.java"));
+ }
+
+
+ @Test
+ void commons_lang2_array_utils_method_should_be_handled() throws Exception {
+ verifyNoIssueOnFile(TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/CommonsLang2ArrayUtilsMethods.java"));
}
@Test
void guava_preconditions_methods_should_be_handled() throws Exception {
- verifyNoIssueOnFile(TestUtils.testSourcesPath("symbolicexecution/behaviorcache/GuavaPreconditionsMethods.java"));
+ verifyNoIssueOnFile(TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/GuavaPreconditionsMethods.java"));
}
@Test
void objects_methods() {
- verifyNoIssueOnFile(TestUtils.testSourcesPath("symbolicexecution/behaviorcache/ObjectsMethodsMethodBehaviors.java"));
+ verifyNoIssueOnFile(TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/ObjectsMethodsMethodBehaviors.java"));
}
@Test
void guava_common_Strings() throws Exception {
- verifyNoIssueOnFile(TestUtils.testSourcesPath("symbolicexecution/behaviorcache/GuavaCommonStrings.java"));
+ verifyNoIssueOnFile(TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/GuavaCommonStrings.java"));
}
@Test
void guava_verify() throws Exception {
- verifyNoIssueOnFile(TestUtils.testSourcesPath("symbolicexecution/behaviorcache/GuavaVerifyMethods.java"));
+ verifyNoIssueOnFile(TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/GuavaVerifyMethods.java"));
}
@Test
void collections_utils_is_empty_method() throws Exception {
- verifyNoIssueOnFile(TestUtils.testSourcesPath("symbolicexecution/behaviorcache/CollectionUtilsIsEmpty.java"));
+ verifyNoIssueOnFile(TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/CollectionUtilsIsEmpty.java"));
}
@Test
void apache_lang_validate() throws Exception {
- verifyNoIssueOnFile(TestUtils.testSourcesPath("symbolicexecution/behaviorcache/CommonsLangValidate.java"));
+ verifyNoIssueOnFile(TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/CommonsLangValidate.java"));
}
@Test
@@ -230,12 +242,17 @@ void log4j_assert() throws Exception {
@Test
void spring_assert() throws Exception {
- verifyNoIssueOnFile(TestUtils.testSourcesPath("symbolicexecution/behaviorcache/SpringAssert.java"));
+ verifyNoIssueOnFile(TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/SpringAssert.java"));
+ }
+
+ @Test
+ void spring_string_utils_should_be_handled() throws Exception {
+ verifyNoIssueOnFile(TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/SpringStringUtilsMethods.java"));
}
@Test
void eclipse_aspectj_assert() throws Exception {
- verifyNoIssueOnFile(TestUtils.testSourcesPath("symbolicexecution/behaviorcache/EclipseAssert.java"));
+ verifyNoIssueOnFile(TestUtils.mainCodeSourcesPath("symbolicexecution/behaviorcache/EclipseAssert.java"));
}
@Test
@@ -316,7 +333,8 @@ void log_when_unable_to_load_resources_with_invalid_method_behaviors() throws Ex
private static void verifyNoIssueOnFile(String fileName) {
SECheck nullDereferenceCheck = new NullDereferenceCheck();
- createSymbolicExecutionVisitorAndSemantic(fileName, nullDereferenceCheck);
+ SECheck divByZeroCheck = new DivisionByZeroCheck();
+ createSymbolicExecutionVisitorAndSemantic(fileName, nullDereferenceCheck, divByZeroCheck);
// verify we did not raise any issue, if we did, the context will get them reported.
JavaFileScannerContext context = mock(JavaFileScannerContext.class);
nullDereferenceCheck.scanFile(context);
diff --git a/java-symbolic-execution/src/test/java/org/sonar/java/se/xproc/MethodYieldTest.java b/java-symbolic-execution/src/test/java/org/sonar/java/se/xproc/MethodYieldTest.java
index f6202414177..2f11dada5ac 100644
--- a/java-symbolic-execution/src/test/java/org/sonar/java/se/xproc/MethodYieldTest.java
+++ b/java-symbolic-execution/src/test/java/org/sonar/java/se/xproc/MethodYieldTest.java
@@ -32,11 +32,8 @@
import java.util.stream.Stream;
import javax.annotation.Nullable;
import org.junit.jupiter.api.Test;
-import org.sonarsource.analyzer.commons.collections.PCollections;
-import org.sonarsource.analyzer.commons.collections.PMap;
-import org.sonar.java.se.checks.NullDereferenceCheck;
-import org.sonar.java.se.utils.JParserTestUtils;
import org.sonar.java.model.JavaTree;
+import org.sonar.java.model.JavaVersionImpl;
import org.sonar.java.model.Sema;
import org.sonar.java.se.ExplodedGraph;
import org.sonar.java.se.Flow;
@@ -44,12 +41,14 @@
import org.sonar.java.se.ProgramPoint;
import org.sonar.java.se.ProgramState;
import org.sonar.java.se.SymbolicExecutionVisitor;
+import org.sonar.java.se.checks.NullDereferenceCheck;
import org.sonar.java.se.checks.SECheck;
import org.sonar.java.se.constraint.BooleanConstraint;
import org.sonar.java.se.constraint.Constraint;
import org.sonar.java.se.constraint.ConstraintsByDomain;
import org.sonar.java.se.constraint.ObjectConstraint;
import org.sonar.java.se.symbolicvalues.SymbolicValue;
+import org.sonar.java.se.utils.JParserTestUtils;
import org.sonar.plugins.java.api.JavaFileScannerContext;
import org.sonar.plugins.java.api.semantic.Symbol;
import org.sonar.plugins.java.api.semantic.Symbol.MethodSymbol;
@@ -60,6 +59,8 @@
import org.sonar.plugins.java.api.tree.MethodInvocationTree;
import org.sonar.plugins.java.api.tree.MethodTree;
import org.sonar.plugins.java.api.tree.Tree;
+import org.sonarsource.analyzer.commons.collections.PCollections;
+import org.sonarsource.analyzer.commons.collections.PMap;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
@@ -226,6 +227,7 @@ void constraints_on_varargs() throws Exception {
JavaFileScannerContext context = mock(JavaFileScannerContext.class);
when(context.getTree()).thenReturn(cut);
when(context.getSemanticModel()).thenReturn(semanticModel);
+ when(context.getJavaVersion()).thenReturn(new JavaVersionImpl(11));
sev.scanFile(context);
MethodSymbol methodSymbol = ((MethodTree) ((ClassTree) cut.types().get(0)).members().get(0)).symbol();
@@ -310,7 +312,7 @@ void native_methods_behavior_should_not_be_used() throws Exception {
@Test
void catch_class_cast_exception() throws Exception {
- Map behaviorCache =
+ Map behaviorCache =
createSymbolicExecutionVisitor("src/test/files/se/XProcCatchClassCastException.java", new NullDereferenceCheck())
.behaviorCache.behaviors;
assertThat(behaviorCache.values()).hasSize(1);
diff --git a/jdt/pom.xml b/jdt/pom.xml
index 892b1596cdd..c18881ff684 100644
--- a/jdt/pom.xml
+++ b/jdt/pom.xml
@@ -6,7 +6,7 @@
org.sonarsource.java
java
- 7.13.0-SNAPSHOT
+ 7.16.0-SNAPSHOT
jdt
@@ -16,7 +16,7 @@
org.eclipse.jdt
org.eclipse.jdt.core
- 3.29.0
+ 3.30.0
org.eclipse.platform
@@ -39,32 +39,32 @@
org.eclipse.platform
org.eclipse.core.resources
- 3.16.100
+ 3.17.0
org.eclipse.platform
org.eclipse.core.runtime
- 3.24.100
+ 3.25.0
org.eclipse.platform
org.eclipse.osgi
- 3.17.200
+ 3.18.0
org.eclipse.platform
org.eclipse.equinox.common
- 3.16.0
+ 3.16.100
org.eclipse.platform
org.eclipse.core.jobs
- 3.12.100
+ 3.13.0
org.eclipse.platform
org.eclipse.equinox.preferences
- 3.9.100
+ 3.10.1
org.eclipse.platform
@@ -74,7 +74,7 @@
org.eclipse.platform
org.eclipse.text
- 3.12.0
+ 3.12.100
org.eclipse.platform
diff --git a/pom.xml b/pom.xml
index 9e85af0f813..0d76a4bca69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
org.sonarsource.parent
parent
- 61.0.147
+ 64.0.211
org.sonarsource.java
java
- 7.13.0-SNAPSHOT
+ 7.16.0-SNAPSHOT
pom
SonarJava
Code Analyzer for Java
@@ -81,10 +81,11 @@
true
- 9.4.0.54424
+ 9.5.0.56709
+ 9.8.0.203
6.3.0.36253
- 1.25.0.1003
- 3.35.1.2719
+ 2.1.0.1111
+ 3.40.0.183
1.24.0.633
-Xmx512m
sonar-java
@@ -104,9 +105,9 @@
- org.sonarsource.sonarqube
+ org.sonarsource.api.plugin
sonar-plugin-api
- ${sonar.version}
+ ${sonar.plugin.api.version}
provided
@@ -269,12 +270,7 @@
2.8.9
compile
-
-
- com.fasterxml.woodstox
- woodstox-core
- 6.2.6
-
+
com.fasterxml.staxmate
staxmate
diff --git a/sonar-java-plugin/pom.xml b/sonar-java-plugin/pom.xml
index e0eef7a31dd..909b974993c 100644
--- a/sonar-java-plugin/pom.xml
+++ b/sonar-java-plugin/pom.xml
@@ -6,7 +6,7 @@
org.sonarsource.java
java
- 7.13.0-SNAPSHOT
+ 7.16.0-SNAPSHOT
sonar-java-plugin
@@ -68,7 +68,7 @@
- org.sonarsource.sonarqube
+ org.sonarsource.api.plugin
sonar-plugin-api
provided
diff --git a/sonar-java-plugin/src/main/java/org/sonar/plugins/java/JavaRulesDefinition.java b/sonar-java-plugin/src/main/java/org/sonar/plugins/java/JavaRulesDefinition.java
index e207324224d..6ca3bc8da15 100644
--- a/sonar-java-plugin/src/main/java/org/sonar/plugins/java/JavaRulesDefinition.java
+++ b/sonar-java-plugin/src/main/java/org/sonar/plugins/java/JavaRulesDefinition.java
@@ -19,31 +19,18 @@
*/
package org.sonar.plugins.java;
-import com.google.gson.Gson;
-import com.google.gson.annotations.SerializedName;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Locale;
+import java.util.Collections;
+import java.util.Map;
import java.util.Set;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-import org.apache.commons.lang.StringUtils;
import org.sonar.api.SonarRuntime;
-import org.sonar.api.rule.RuleStatus;
-import org.sonar.api.rules.RuleType;
-import org.sonar.api.server.debt.DebtRemediationFunction;
import org.sonar.api.server.rule.RulesDefinition;
-import org.sonar.api.server.rule.RulesDefinitionAnnotationLoader;
import org.sonar.api.utils.AnnotationUtils;
-import org.sonar.api.utils.Version;
import org.sonar.java.annotations.VisibleForTesting;
import org.sonar.java.checks.CheckList;
-import org.sonarsource.analyzer.commons.collections.SetUtils;
+import org.sonarsource.analyzer.commons.RuleMetadataLoader;
import org.sonarsource.analyzer.commons.annotations.DeprecatedRuleKey;
+import org.sonarsource.analyzer.commons.annotations.DeprecatedRuleKeys;
+import org.sonarsource.analyzer.commons.collections.SetUtils;
/**
* Definition of rules.
@@ -51,7 +38,6 @@
public class JavaRulesDefinition implements RulesDefinition {
private static final String RESOURCE_BASE_PATH = "/org/sonar/l10n/java/rules/java";
- private static final Gson GSON = new Gson();
/**
* Rule templates have to be manually defined
@@ -63,167 +49,48 @@ public class JavaRulesDefinition implements RulesDefinition {
"S3546",
"S4011");
- private final boolean isOwaspByVersionSupported;
+ private static final Map INTERNAL_KEYS = Collections.singletonMap("NoSonar", "S1291");
+
+ private final SonarRuntime sonarRuntime;
public JavaRulesDefinition(SonarRuntime sonarRuntime) {
- isOwaspByVersionSupported = sonarRuntime.getApiVersion().isGreaterThanOrEqual(Version.create(9, 3));
+ this.sonarRuntime = sonarRuntime;
}
- @SuppressWarnings("rawtypes")
@Override
public void define(Context context) {
NewRepository repository = context
.createRepository(CheckList.REPOSITORY_KEY, Java.KEY)
.setName("SonarAnalyzer");
- List> checks = CheckList.getChecks();
- new RulesDefinitionAnnotationLoader().load(repository, checks.toArray(new Class[]{}));
- JavaSonarWayProfile.Profile profile = JavaSonarWayProfile.readProfile();
- for (Class ruleClass : checks) {
- newRule(ruleClass, repository, profile);
- }
- repository.done();
- }
-
- @VisibleForTesting
- protected void newRule(Class ruleClass, NewRepository repository, JavaSonarWayProfile.Profile profile) {
- org.sonar.check.Rule ruleAnnotation = AnnotationUtils.getAnnotation(ruleClass, org.sonar.check.Rule.class);
- if (ruleAnnotation == null) {
- throw new IllegalArgumentException("No Rule annotation was found on " + ruleClass);
- }
- String ruleKey = ruleAnnotation.key();
- if (StringUtils.isEmpty(ruleKey)) {
- throw new IllegalArgumentException("No key is defined in Rule annotation of " + ruleClass);
- }
- NewRule rule = repository.rule(ruleKey);
- if (rule == null) {
- throw new IllegalStateException("No rule was created for " + ruleClass + " in " + repository.key());
- }
- DeprecatedRuleKey deprecatedRuleKeyAnnotation = AnnotationUtils.getAnnotation(ruleClass, DeprecatedRuleKey.class);
- if (deprecatedRuleKeyAnnotation != null) {
- rule.addDeprecatedRuleKey(deprecatedRuleKeyAnnotation.repositoryKey(), deprecatedRuleKeyAnnotation.ruleKey());
- } else {
- // Keep link with legacy "squid" repository key
- rule.addDeprecatedRuleKey("squid", ruleKey);
- }
- String rspecKey = rspecKey(ruleClass, rule);
- RuleMetadata ruleMetadata = readRuleMetadata(rspecKey);
- addMetadata(rule, ruleMetadata);
- String ruleHtmlDescription = readRuleHtmlDescription(rspecKey);
- if (ruleHtmlDescription != null) {
- rule.setHtmlDescription(ruleHtmlDescription);
- }
- // 'setActivatedByDefault' is used by SonarLint standalone, to define which rules will be active
- boolean activatedInProfile = profile.ruleKeys.contains(ruleKey) || profile.ruleKeys.contains(rspecKey);
- boolean isSecurityHotspot = ruleMetadata != null && ruleMetadata.isSecurityHotspot();
- rule.setActivatedByDefault(activatedInProfile && !isSecurityHotspot);
- rule.setTemplate(TEMPLATE_RULE_KEY.contains(ruleKey));
- }
-
- private static String rspecKey(Class ruleClass, NewRule rule) {
- org.sonar.java.RspecKey rspecKeyAnnotation = AnnotationUtils.getAnnotation(ruleClass, org.sonar.java.RspecKey.class);
- if (rspecKeyAnnotation != null) {
- String rspecKey = rspecKeyAnnotation.value();
- rule.setInternalKey(rspecKey);
- return rspecKey;
- }
- return rule.key();
- }
-
- @Nullable
- static RuleMetadata readRuleMetadata(String metadataKey) {
- URL resource = JavaRulesDefinition.class.getResource(RESOURCE_BASE_PATH + "/" + metadataKey + "_java.json");
- return resource != null ? GSON.fromJson(readResource(resource), RuleMetadata.class) : null;
- }
-
- private static String readRuleHtmlDescription(String metadataKey) {
- URL resource = JavaRulesDefinition.class.getResource(RESOURCE_BASE_PATH + "/" + metadataKey + "_java.html");
- if (resource != null) {
- return readResource(resource);
- }
- return null;
- }
-
- private void addMetadata(NewRule rule, @Nullable RuleMetadata metadata) {
- if (metadata == null) {
- return;
- }
- rule.setSeverity(metadata.defaultSeverity.toUpperCase(Locale.US));
- rule.setName(metadata.title);
- rule.addTags(metadata.tags);
- rule.setType(RuleType.valueOf(metadata.type));
-
- rule.setStatus(RuleStatus.valueOf(metadata.status.toUpperCase(Locale.US)));
- if (metadata.remediation != null) {
- rule.setDebtRemediationFunction(metadata.remediation.remediationFunction(rule.debtRemediationFunctions()));
- rule.setGapDescription(metadata.remediation.linearDesc);
- }
- addSecurityStandards(rule, metadata.securityStandards);
- }
- private void addSecurityStandards(NewRule rule, SecurityStandards securityStandards) {
- for (String s : securityStandards.OWASP_2017) {
- rule.addOwaspTop10(RulesDefinition.OwaspTop10.valueOf(s));
- }
- if (isOwaspByVersionSupported) {
- for (String s : securityStandards.OWASP_2021) {
- rule.addOwaspTop10(RulesDefinition.OwaspTop10Version.Y2021, RulesDefinition.OwaspTop10.valueOf(s));
- }
- }
- rule.addCwe(securityStandards.CWE);
- }
-
- private static String readResource(URL resource) {
- try (BufferedReader reader = new BufferedReader(new InputStreamReader(resource.openStream(), StandardCharsets.UTF_8))) {
- return reader.lines().collect(Collectors.joining("\n"));
- } catch (IOException e) {
- throw new IllegalStateException("Failed to read: " + resource, e);
- }
- }
+ RuleMetadataLoader ruleMetadataLoader = new RuleMetadataLoader(RESOURCE_BASE_PATH, JavaSonarWayProfile.SONAR_WAY_PATH, sonarRuntime);
+ ruleMetadataLoader.addRulesByAnnotatedClass(repository, CheckList.getChecks());
- static class RuleMetadata {
- private static final String SECURITY_HOTSPOT = "SECURITY_HOTSPOT";
+ TEMPLATE_RULE_KEY.stream()
+ .map(repository::rule)
+ .forEach(rule -> rule.setTemplate(true));
- String title;
- String status;
- @Nullable
- Remediation remediation;
+ INTERNAL_KEYS.forEach((ruleKey, internalKey) -> repository.rule(ruleKey).setInternalKey(internalKey));
- String type;
- String[] tags;
- String defaultSeverity;
- SecurityStandards securityStandards = new SecurityStandards();
+ // for all the rules without explicit deprecated key already declared, register them with "squid:key"
+ CheckList.getChecks().stream()
+ .filter(rule -> !deprecatesRules(rule))
+ .map(JavaRulesDefinition::ruleKey)
+ .map(repository::rule)
+ .forEach(rule -> rule.addDeprecatedRuleKey("squid", rule.key()));
- boolean isSecurityHotspot() {
- return SECURITY_HOTSPOT.equals(type);
- }
+ repository.done();
}
- static class SecurityStandards {
- int[] CWE = {};
-
- @SerializedName("OWASP Top 10 2021")
- String[] OWASP_2021 = {};
-
- @SerializedName("OWASP")
- String[] OWASP_2017 = {};
+ private static String ruleKey(Class rule) {
+ return AnnotationUtils.getAnnotation(rule, org.sonar.check.Rule.class).key();
}
- private static class Remediation {
- String func;
- String constantCost;
- String linearDesc;
- String linearOffset;
- String linearFactor;
-
- public DebtRemediationFunction remediationFunction(DebtRemediationFunctions drf) {
- if (func.startsWith("Constant")) {
- return drf.constantPerIssue(constantCost.replace("mn", "min"));
- }
- if ("Linear".equals(func)) {
- return drf.linear(linearFactor.replace("mn", "min"));
- }
- return drf.linearWithOffset(linearFactor.replace("mn", "min"), linearOffset.replace("mn", "min"));
- }
+ @VisibleForTesting
+ static boolean deprecatesRules(Class rule) {
+ // single annotation
+ return AnnotationUtils.getAnnotation(rule, DeprecatedRuleKey.class) != null
+ // multiple annotations, for instance java:S4830
+ || AnnotationUtils.getAnnotation(rule, DeprecatedRuleKeys.class) != null;
}
-
}
diff --git a/sonar-java-plugin/src/main/java/org/sonar/plugins/java/JavaSensor.java b/sonar-java-plugin/src/main/java/org/sonar/plugins/java/JavaSensor.java
index 2e2ba1c7e34..26fee19b124 100644
--- a/sonar-java-plugin/src/main/java/org/sonar/plugins/java/JavaSensor.java
+++ b/sonar-java-plugin/src/main/java/org/sonar/plugins/java/JavaSensor.java
@@ -117,7 +117,7 @@ public void execute(SensorContext context) {
private static UnaryOperator> createCheckFilter(boolean isAutoScanCheckFiltering) {
if (isAutoScanCheckFiltering) {
- Set sonarWayRuleKeys = JavaSonarWayProfile.readProfile().ruleKeys;
+ Set sonarWayRuleKeys = JavaSonarWayProfile.ruleKeys();
Set> notWorkingChecks = CheckList.getJavaChecksNotWorkingForAutoScan();
return checks -> checks.stream()
.filter(c -> !(c instanceof SECheck))
diff --git a/sonar-java-plugin/src/main/java/org/sonar/plugins/java/JavaSonarWayProfile.java b/sonar-java-plugin/src/main/java/org/sonar/plugins/java/JavaSonarWayProfile.java
index 82742c82468..9892dcf970d 100644
--- a/sonar-java-plugin/src/main/java/org/sonar/plugins/java/JavaSonarWayProfile.java
+++ b/sonar-java-plugin/src/main/java/org/sonar/plugins/java/JavaSonarWayProfile.java
@@ -19,26 +19,18 @@
*/
package org.sonar.plugins.java;
-import com.google.gson.Gson;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
import java.util.HashSet;
-import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import org.sonar.api.rule.RuleKey;
import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition;
-import org.sonar.api.utils.AnnotationUtils;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
import org.sonar.java.annotations.VisibleForTesting;
import org.sonar.java.checks.CheckList;
+import org.sonarsource.analyzer.commons.BuiltInQualityProfileJsonLoader;
import org.sonarsource.api.sonarlint.SonarLintSide;
/**
@@ -47,103 +39,56 @@
@SonarLintSide
public class JavaSonarWayProfile implements BuiltInQualityProfilesDefinition {
+
private static final Logger LOG = Loggers.get(JavaSonarWayProfile.class);
static final String SECURITY_RULES_CLASS_NAME = "com.sonar.plugins.security.api.JavaRules";
static final String DBD_RULES_CLASS_NAME = "com.sonarsource.plugins.dbd.api.JavaRules";
+ static final String SECURITY_RULE_KEYS_METHOD_NAME = "getSecurityRuleKeys";
static final String DBD_RULE_KEYS_METHOD_NAME = "getDataflowBugDetectionRuleKeys";
static final String GET_REPOSITORY_KEY = "getRepositoryKey";
+ static final String SONAR_WAY_PATH = "/org/sonar/l10n/java/rules/java/Sonar_way_profile.json";
+
@Override
public void define(Context context) {
NewBuiltInQualityProfile sonarWay = context.createBuiltInQualityProfile("Sonar way", Java.KEY);
- sonarWay.activateRule("common-" + Java.KEY, "DuplicatedBlocks");
- Profile jsonProfile = readProfile();
- Map keys = legacyKeys();
- for (String key : jsonProfile.ruleKeys) {
- sonarWay.activateRule(CheckList.REPOSITORY_KEY, keys.get(key));
- }
- getSecurityRuleKeys(isSonarSecurityBefore78()).forEach(key -> sonarWay.activateRule(key.repository(), key.rule()));
+ BuiltInQualityProfileJsonLoader.load(sonarWay, CheckList.REPOSITORY_KEY, SONAR_WAY_PATH);
+
+ getSecurityRuleKeys().forEach(key -> sonarWay.activateRule(key.repository(), key.rule()));
getDataflowBugDetectionRuleKeys().forEach(key -> sonarWay.activateRule(key.repository(), key.rule()));
sonarWay.done();
}
- private static Map legacyKeys() {
- Map result = new HashMap<>();
- for (Class checkClass : CheckList.getChecks()) {
- org.sonar.check.Rule ruleAnnotation = AnnotationUtils.getAnnotation(checkClass, org.sonar.check.Rule.class);
- String key = ruleAnnotation.key();
- org.sonar.java.RspecKey rspecKeyAnnotation = AnnotationUtils.getAnnotation(checkClass, org.sonar.java.RspecKey.class);
- String rspecKey = key;
- if (rspecKeyAnnotation != null) {
- rspecKey = rspecKeyAnnotation.value();
- }
- result.put(rspecKey, key);
- }
- return result;
- }
-
- static Profile readProfile() {
- URL resource = JavaSonarWayProfile.class.getResource("/org/sonar/l10n/java/rules/java/Sonar_way_profile.json");
- return new Gson().fromJson(readResource(resource), Profile.class);
- }
-
- private static String readResource(URL resource) {
- try (BufferedReader reader = new BufferedReader(new InputStreamReader(resource.openStream(), StandardCharsets.UTF_8))) {
- return reader.lines().collect(Collectors.joining("\n"));
- } catch (IOException e) {
- throw new IllegalStateException("Failed to read: " + resource, e);
- }
+ static Set ruleKeys() {
+ return BuiltInQualityProfileJsonLoader.loadActiveKeysFromJsonProfile(SONAR_WAY_PATH);
}
@VisibleForTesting
- static Set getSecurityRuleKeys(boolean sonarSecurityBefore78) {
- String ruleKeysMethod = sonarSecurityBefore78 ? "getRuleKeys" : "getSecurityRuleKeys";
- return getExternalRuleKeys(SECURITY_RULES_CLASS_NAME, ruleKeysMethod, "security", sonarSecurityBefore78);
+ static Set getSecurityRuleKeys() {
+ return getExternalRuleKeys(SECURITY_RULES_CLASS_NAME, SECURITY_RULE_KEYS_METHOD_NAME, "security");
}
@VisibleForTesting
static Set getDataflowBugDetectionRuleKeys() {
- return getExternalRuleKeys(DBD_RULES_CLASS_NAME, DBD_RULE_KEYS_METHOD_NAME, "dataflow bug detection", false);
+ return getExternalRuleKeys(DBD_RULES_CLASS_NAME, DBD_RULE_KEYS_METHOD_NAME, "dataflow bug detection");
}
@SuppressWarnings("unchecked")
@VisibleForTesting
- static Set getExternalRuleKeys(String className, String ruleKeysMethod, String rulesCategory, boolean sonarSecurityBefore78) {
+ static Set getExternalRuleKeys(String className, String ruleKeysMethod, String rulesCategory) {
try {
Class javaRulesClass = Class.forName(className);
Method getRuleKeysMethod = javaRulesClass.getMethod(ruleKeysMethod);
Set ruleKeys = (Set) getRuleKeysMethod.invoke(null);
Method getRepositoryKeyMethod = javaRulesClass.getMethod(GET_REPOSITORY_KEY);
- String repositoryKey;
- if (sonarSecurityBefore78) {
- repositoryKey = CheckList.REPOSITORY_KEY;
- } else {
- repositoryKey = (String) getRepositoryKeyMethod.invoke(null);
- }
+ String repositoryKey = (String) getRepositoryKeyMethod.invoke(null);
return ruleKeys.stream().map(k -> RuleKey.of(repositoryKey, k)).collect(Collectors.toSet());
} catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
LOG.debug(String.format("[%s], no %s rules added to Sonar way java profile: %s", e.getClass().getSimpleName(), rulesCategory, e.getMessage()));
}
return new HashSet<>();
}
-
- private static boolean isSonarSecurityBefore78() {
- try {
- Class javaRulesClass = Class.forName(SECURITY_RULES_CLASS_NAME);
- javaRulesClass.getMethod(GET_REPOSITORY_KEY);
- return false;
-
- } catch (NoSuchMethodException | ClassNotFoundException e) {
- return true;
- }
- }
-
- static class Profile {
- String name;
- Set ruleKeys;
- }
-
}
diff --git a/sonar-java-plugin/src/main/resources/static/documentation.md b/sonar-java-plugin/src/main/resources/static/documentation.md
index 26bb15f411f..330286aa871 100644
--- a/sonar-java-plugin/src/main/resources/static/documentation.md
+++ b/sonar-java-plugin/src/main/resources/static/documentation.md
@@ -37,11 +37,25 @@ Key | Value
## Project's specific JDK
-In some situations, you might have to analyze a project built with a different version of Java than the one executing the analysis. The most common case is to run the analysis with **Java 11**, while the project itself uses **Java 8** or before for its build. This case is normally automatically handled when using Maven or Gradle, as well as with any flavor of SonarLint.
-
-If it is your case, and you are **NOT** using Maven or Gradle, you will need to set the property `sonar.java.jdkHome` manually (see below). By doing this you'll specify which JDK classes the analyzer must refer to during the analysis. Not setting this property, while it would have been required, usually leads to inconsistent or even impossible to fix issues being reported, especially in relation with native JDK classes.
+In some situations, you might have to analyze a project built with a different version of Java than the one executing the analysis.
+The most common case is to run the analysis with **Java 11**, while the project itself uses **Java 8** or before for its build.
+
+If this is your case, you will need to set the `sonar.java.jdkHome` property manually to point the appropriate JDK (see below).
+By doing this you will specify which JDK classes the analyzer must refer to during the analysis.
+Not setting this property, while it would have been required, usually leads to inconsistent or even impossible to fix issues being reported, especially in relation with native JDK classes.
+
+When setting `sonar.java.jdkHome`, you need to provide the path to the JDK directory used by the project being analyzed, if different from the Java runtime executing the analysis.
+For example, for a Java 8 project, by setting it as follows: `sonar.java.jdkHome=/usr/lib/jvm/jdk1.8.0_211`
+
+```bash
+# Here maven uses the default version of Java on the system but we specify that we want to analyze a Java 8 project.
+mvn clean verify sonar:sonar \
+ # other analysis parameters
+ -Dsonar.java.jdkHome=/usr/lib/jvm/java-8-openjdk/
+ # other analysis parameters
+```
+This option can of course be added to your `sonar.properties` configuration.
-When setting `sonar.java.jdkHome`, you need to provide the path to the JDK directory used by the project being analyzed, if different from the Java runtime executing the analysis. For example, for a Java 8 project, by setting it as follow: `sonar.java.jdkHome=/usr/lib/jvm/jdk1.8.0_211`
## Turning issues off
@@ -125,6 +139,11 @@ The tutorial [Writing Custom Java Rules 101](https://redirect.sonarsource.com/do
### API changes
+#### **7.15**
+* New method: `JavaResourceLocator#binaryDirs()`. Use this method to get the directories containing the .class files corresponding to the main code.
+* New method: `JavaResourceLocator#testBinaryDirs()`. Use this method to get the directories containing the .class files corresponding to the tests.
+* New method: `JavaResourceLocator#testClasspath()`. Use this method to retrieve the classpath configured for the project's tests.
+
#### **7.12**
* New method: `JavaFileScanner#scanWithoutParsing(InputFileScannerContext)`. Use this method to inspect an unchanged file before it is parsed.
diff --git a/sonar-java-plugin/src/test/java/org/sonar/plugins/java/JavaRulesDefinitionTest.java b/sonar-java-plugin/src/test/java/org/sonar/plugins/java/JavaRulesDefinitionTest.java
index 1a10c97f766..74b364aafcd 100644
--- a/sonar-java-plugin/src/test/java/org/sonar/plugins/java/JavaRulesDefinitionTest.java
+++ b/sonar-java-plugin/src/test/java/org/sonar/plugins/java/JavaRulesDefinitionTest.java
@@ -19,36 +19,34 @@
*/
package org.sonar.plugins.java;
-import java.util.LinkedHashSet;
+import java.util.List;
import java.util.Locale;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
import org.junit.jupiter.api.Test;
+import org.sonar.api.SonarEdition;
+import org.sonar.api.SonarQubeSide;
import org.sonar.api.SonarRuntime;
import org.sonar.api.internal.SonarRuntimeImpl;
import org.sonar.api.rule.RuleKey;
import org.sonar.api.rules.RuleType;
import org.sonar.api.server.rule.RulesDefinition;
import org.sonar.api.utils.Version;
-import org.sonar.check.Rule;
import org.sonar.java.checks.CheckList;
-import org.sonar.java.checks.ServletMethodsExceptionsThrownCheck;
-import org.sonar.plugins.java.api.JavaCheck;
+import org.sonarsource.analyzer.commons.annotations.DeprecatedRuleKey;
+import org.sonarsource.analyzer.commons.annotations.DeprecatedRuleKeys;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
class JavaRulesDefinitionTest {
private static final String REPOSITORY_KEY = "java";
- private static final SonarRuntime SONAR_RUNTIME_9_3 = SonarRuntimeImpl.forSonarLint(Version.create(9, 3));
+ private static final SonarRuntime SONAR_RUNTIME_9_2 = SonarRuntimeImpl.forSonarLint(Version.create(9, 2));
+ private static final SonarRuntime SONAR_RUNTIME_9_8 = SonarRuntimeImpl.forSonarQube(Version.create(9, 8), SonarQubeSide.SERVER, SonarEdition.COMMUNITY);
@Test
void test_creation_of_rules() {
- JavaRulesDefinition definition = new JavaRulesDefinition(SONAR_RUNTIME_9_3);
+ JavaRulesDefinition definition = new JavaRulesDefinition(SONAR_RUNTIME_9_8);
RulesDefinition.Context context = new RulesDefinition.Context();
definition.define(context);
RulesDefinition.Repository repository = context.repository(REPOSITORY_KEY);
@@ -83,7 +81,7 @@ void rules_definition_should_be_locale_independent() {
Locale defaultLocale = Locale.getDefault();
Locale trlocale = Locale.forLanguageTag("tr-TR");
Locale.setDefault(trlocale);
- JavaRulesDefinition definition = new JavaRulesDefinition(SONAR_RUNTIME_9_3);
+ JavaRulesDefinition definition = new JavaRulesDefinition(SONAR_RUNTIME_9_8);
RulesDefinition.Context context = new RulesDefinition.Context();
definition.define(context);
RulesDefinition.Repository repository = context.repository(REPOSITORY_KEY);
@@ -94,39 +92,9 @@ void rules_definition_should_be_locale_independent() {
Locale.setDefault(defaultLocale);
}
- @Test
- void test_invalid_checks() throws Exception {
- RulesDefinition.Context context = new RulesDefinition.Context();
- RulesDefinition.NewRepository newRepository = context.createRepository("test", "java");
- newRepository.createRule("correctRule");
- JavaRulesDefinition definition = new JavaRulesDefinition(SONAR_RUNTIME_9_3);
- JavaSonarWayProfile.Profile profile = new JavaSonarWayProfile.Profile();
- profile.ruleKeys = new LinkedHashSet<>();
- try {
- definition.newRule(CheckWithNoAnnotation.class, newRepository, profile);
- } catch (IllegalArgumentException iae) {
- assertThat(iae).hasMessage("No Rule annotation was found on class " + CheckWithNoAnnotation.class.getName());
- }
-
- try {
- definition.newRule(EmptyRuleKey.class, newRepository, profile);
- } catch (IllegalArgumentException iae) {
- assertThat(iae).hasMessage("No key is defined in Rule annotation of class " + EmptyRuleKey.class.getName());
- }
-
- try {
- definition.newRule(UnregisteredRule.class, newRepository, profile);
- } catch (IllegalStateException ise) {
- assertThat(ise).hasMessage("No rule was created for class " + UnregisteredRule.class.getName() + " in test");
- }
- // no metadata defined, does not fail on registration of rule
- definition.newRule(CorrectRule.class, newRepository, profile);
-
- }
-
@Test
void test_security_hotspot() throws Exception {
- JavaRulesDefinition definition = new JavaRulesDefinition(SONAR_RUNTIME_9_3);
+ JavaRulesDefinition definition = new JavaRulesDefinition(SONAR_RUNTIME_9_2);
RulesDefinition.Context context = new RulesDefinition.Context();
definition.define(context);
RulesDefinition.Repository repository = context.repository(REPOSITORY_KEY);
@@ -134,36 +102,40 @@ void test_security_hotspot() throws Exception {
RulesDefinition.Rule hardcodedIdRule = repository.rule("S1313");
assertThat(hardcodedIdRule.deprecatedRuleKeys()).containsExactly(RuleKey.of("squid", "S1313"));
assertThat(hardcodedIdRule.type()).isEqualTo(RuleType.SECURITY_HOTSPOT);
- assertThat(hardcodedIdRule.activatedByDefault()).isFalse();
+ // SonarLint explicitly exclude hotspot on its side.
+ assertThat(hardcodedIdRule.activatedByDefault()).isTrue();
}
@Test
void test_security_standards() {
- JavaRulesDefinition definition = new JavaRulesDefinition(SONAR_RUNTIME_9_3);
+ JavaRulesDefinition definition = new JavaRulesDefinition(SONAR_RUNTIME_9_8);
RulesDefinition.Context context = new RulesDefinition.Context();
definition.define(context);
RulesDefinition.Repository repository = context.repository(REPOSITORY_KEY);
- RulesDefinition.Rule rule = repository.rule("S1166");
- assertThat(rule.deprecatedRuleKeys()).containsExactly(RuleKey.of("squid", "S1166"));
- assertThat(rule.securityStandards()).containsExactlyInAnyOrder("cwe:778", "owaspTop10:a10", "owaspTop10-2021:a9");
+ RulesDefinition.Rule s1166 = repository.rule("S1166");
+ assertThat(s1166.deprecatedRuleKeys()).containsExactly(RuleKey.of("squid", "S1166"));
+ assertThat(s1166.securityStandards()).containsExactlyInAnyOrder("cwe:778", "owaspTop10:a10", "owaspTop10-2021:a9");
+
+ RulesDefinition.Rule s2053 = repository.rule("S2053");
+ assertThat(s2053.securityStandards()).containsExactlyInAnyOrder("cwe:759", "cwe:760", "owaspTop10:a3", "owaspTop10-2021:a2", "pciDss-3.2:6.5.10", "pciDss-4.0:6.2.4");
}
@Test
void test_security_standards_sq_9_2() {
- JavaRulesDefinition definition = new JavaRulesDefinition(SonarRuntimeImpl.forSonarLint(Version.create(9, 2)));
+ JavaRulesDefinition definition = new JavaRulesDefinition(SONAR_RUNTIME_9_2);
RulesDefinition.Context context = new RulesDefinition.Context();
definition.define(context);
RulesDefinition.Repository repository = context.repository(REPOSITORY_KEY);
- RulesDefinition.Rule rule = repository.rule("S1166");
- assertThat(rule.deprecatedRuleKeys()).containsExactly(RuleKey.of("squid", "S1166"));
- assertThat(rule.securityStandards()).containsExactlyInAnyOrder("cwe:778", "owaspTop10:a10");
+ RulesDefinition.Rule s1166 = repository.rule("S1166");
+ assertThat(s1166.deprecatedRuleKeys()).containsExactly(RuleKey.of("squid", "S1166"));
+ assertThat(s1166.securityStandards()).containsExactlyInAnyOrder("cwe:778", "owaspTop10:a10");
}
@Test
void test_deprecated_key() {
- JavaRulesDefinition definition = new JavaRulesDefinition(SONAR_RUNTIME_9_3);
+ JavaRulesDefinition definition = new JavaRulesDefinition(SONAR_RUNTIME_9_8);
RulesDefinition.Context context = new RulesDefinition.Context();
definition.define(context);
RulesDefinition.Repository repository = context.repository(REPOSITORY_KEY);
@@ -171,11 +143,49 @@ void test_deprecated_key() {
RulesDefinition.Rule rule = repository.rule("S1104");
assertThat(rule.activatedByDefault()).isTrue();
assertThat(rule.deprecatedRuleKeys()).containsExactly(RuleKey.of("squid", "ClassVariableVisibilityCheck"));
+
+ // FIXME SONAR-17167: S4830 should have references to java:S4244 and squid:S4244
+ RulesDefinition.Rule s4830 = repository.rule("S4830");
+ assertThat(s4830.deprecatedRuleKeys()).containsExactlyInAnyOrder(RuleKey.of("squid", "S4830"));
+
+ // FIXME SONAR-17167: Rules can not have multiple links to deprecated keys, especially if one of the deprecated key is a droppped rule
+ List rulesWithManyDeprecatedKeys = repository.rules().stream()
+ .filter(r -> r.deprecatedRuleKeys().size() >= 2)
+ .map(RulesDefinition.Rule::key)
+ .collect(Collectors.toList());
+ assertThat(rulesWithManyDeprecatedKeys).isEmpty();
+ }
+
+ @Test
+ void test_deprecates_rules() {
+ @DeprecatedRuleKey(repositoryKey = "repo", ruleKey = "SXXXX")
+ class RuleA {
+ }
+
+ @DeprecatedRuleKey(repositoryKey = "repo", ruleKey = "SXXXX")
+ @DeprecatedRuleKey(repositoryKey = "repo", ruleKey = "SYYYY")
+ class RuleB {
+ }
+
+ @DeprecatedRuleKeys({
+ @DeprecatedRuleKey(repositoryKey = "repo", ruleKey = "SXXXX"),
+ @DeprecatedRuleKey(repositoryKey = "repo", ruleKey = "SYYYY")
+ })
+ class RuleC {
+ }
+
+ class RuleD {
+ }
+
+ assertThat(JavaRulesDefinition.deprecatesRules(RuleA.class)).isTrue();
+ assertThat(JavaRulesDefinition.deprecatesRules(RuleB.class)).isTrue();
+ assertThat(JavaRulesDefinition.deprecatesRules(RuleC.class)).isTrue();
+ assertThat(JavaRulesDefinition.deprecatesRules(RuleD.class)).isFalse();
}
@Test
void rules_should_not_have_legacy_key() {
- JavaRulesDefinition definition = new JavaRulesDefinition(SONAR_RUNTIME_9_3);
+ JavaRulesDefinition definition = new JavaRulesDefinition(SONAR_RUNTIME_9_8);
RulesDefinition.Context context = new RulesDefinition.Context();
definition.define(context);
Pattern pattern = Pattern.compile("^S[0-9]{3,5}$");
@@ -184,35 +194,11 @@ void rules_should_not_have_legacy_key() {
// NoSonar key can't be changed to RSPEC key
if (!r.key().equals("NoSonar")) {
assertThat(pattern.matcher(r.key()).matches()).isTrue();
+ assertThat(r.internalKey()).isNull();
+ } else {
+ assertThat(r.internalKey()).isEqualTo("S1291");
}
});
}
- @Test
- void test_security_standards_not_set_when_unsupported() throws Exception {
- JavaRulesDefinition definition = new JavaRulesDefinition(SONAR_RUNTIME_9_3);
- RulesDefinition.NewRepository repository = mock(RulesDefinition.NewRepository.class);
- RulesDefinition.NewRule newRule = mock(RulesDefinition.NewRule.class);
- when(repository.rule(any())).thenReturn(newRule);
- definition.newRule(ServletMethodsExceptionsThrownCheck.class, repository, JavaSonarWayProfile.readProfile());
-
- verify(newRule, never()).addOwaspTop10();
- verify(newRule, never()).addCwe();
- }
-
- private class CheckWithNoAnnotation implements JavaCheck {
- }
-
- @Rule(key = "")
- private class EmptyRuleKey implements JavaCheck {
- }
-
- @Rule(key = "myKey")
- private class UnregisteredRule implements JavaCheck {
- }
-
- @Rule(key = "correctRule")
- private class CorrectRule implements JavaCheck {
- }
-
}
diff --git a/sonar-java-plugin/src/test/java/org/sonar/plugins/java/JavaSensorTest.java b/sonar-java-plugin/src/test/java/org/sonar/plugins/java/JavaSensorTest.java
index 5c3fdecdd0d..505e1ab2716 100644
--- a/sonar-java-plugin/src/test/java/org/sonar/plugins/java/JavaSensorTest.java
+++ b/sonar-java-plugin/src/test/java/org/sonar/plugins/java/JavaSensorTest.java
@@ -128,7 +128,7 @@ private void testIssueCreation(InputFile.Type onType, int expectedIssues) throws
DefaultFileSystem fs = context.fileSystem();
fs.setWorkDir(tmp.newFolder().toPath());
SonarComponents sonarComponents = createSonarComponentsMock(context);
- DefaultJavaResourceLocator javaResourceLocator = new DefaultJavaResourceLocator(new ClasspathForMain(settings.asConfig(), fs));
+ DefaultJavaResourceLocator javaResourceLocator = createDefaultJavaResourceLocator(settings.asConfig(), fs);
JavaSensor jss = new JavaSensor(sonarComponents, fs, javaResourceLocator, settings.asConfig(), noSonarFilter, null);
jss.execute(context);
@@ -174,6 +174,13 @@ private static SonarComponents createSonarComponentsMock(SensorContextTester con
return sonarComponents;
}
+ private static DefaultJavaResourceLocator createDefaultJavaResourceLocator(Configuration settings, DefaultFileSystem fs) {
+ ClasspathForMain classpathForMain = new ClasspathForMain(settings, fs);
+ ClasspathForTest classpathForTest = new ClasspathForTest(settings, fs);
+
+ return new DefaultJavaResourceLocator(classpathForMain, classpathForTest);
+ }
+
@Test
void should_invoke_visitors_on_generated_code() throws Exception {
assertJasperIsInvoked(new MapSettings());
@@ -406,7 +413,7 @@ private SensorContextTester analyzeTwoFilesWithIssues(MapSettings settings) thro
when(fileLinesContextFactory.createFor(any(InputFile.class))).thenReturn(mock(FileLinesContext.class));
ClasspathForTest javaTestClasspath = new ClasspathForTest(context.config(), fs);
ClasspathForMain javaClasspath = new ClasspathForMain(context.config(), fs);
- DefaultJavaResourceLocator resourceLocator = new DefaultJavaResourceLocator(new ClasspathForMain(context.config(), fs));
+ DefaultJavaResourceLocator resourceLocator = createDefaultJavaResourceLocator(context.config(), fs);
CheckRegistrar[] checkRegistrars = new CheckRegistrar[] {new CustomRegistrar()};
@@ -439,7 +446,7 @@ private void executeJavaSensorForPerformanceMeasure(MapSettings settings, Path w
DefaultFileSystem fs = context.fileSystem();
fs.setWorkDir(workDir);
SonarComponents components = createSonarComponentsMock(context);
- DefaultJavaResourceLocator resourceLocator = new DefaultJavaResourceLocator(new ClasspathForMain(configuration, fs));
+ DefaultJavaResourceLocator resourceLocator = createDefaultJavaResourceLocator(context.config(), fs);
JavaSensor jss = new JavaSensor(components, fs, resourceLocator, configuration, mock(NoSonarFilter.class), null);
jss.execute(context);
}
diff --git a/sonar-java-plugin/src/test/java/org/sonar/plugins/java/JavaSonarWayProfileTest.java b/sonar-java-plugin/src/test/java/org/sonar/plugins/java/JavaSonarWayProfileTest.java
index 871ef80c27e..0ca551cb509 100644
--- a/sonar-java-plugin/src/test/java/org/sonar/plugins/java/JavaSonarWayProfileTest.java
+++ b/sonar-java-plugin/src/test/java/org/sonar/plugins/java/JavaSonarWayProfileTest.java
@@ -49,7 +49,7 @@ void should_create_sonar_way_profile() {
BuiltInQualityProfilesDefinition.BuiltInQualityProfile profile = context.profile("java", "Sonar way");
assertThat(profile.language()).isEqualTo(Java.KEY);
List activeRules = profile.rules();
- assertThat(activeRules.stream().filter(r -> r.repoKey().equals("common-java"))).hasSize(1);
+ assertThat(activeRules.stream().filter(r -> r.repoKey().equals("common-java"))).isEmpty();
assertThat(activeRules).as("Expected number of rules in profile").hasSizeGreaterThanOrEqualTo(268);
assertThat(profile.name()).isEqualTo("Sonar way");
Set keys = new HashSet<>();
@@ -79,12 +79,11 @@ void should_activate_hotspots_when_supported() {
void should_contains_security_rules_if_present() {
// no security rules available
com.sonar.plugins.security.api.JavaRules.ruleKeys = new HashSet<>();
- assertThat(JavaSonarWayProfile.getSecurityRuleKeys(true)).isEmpty();
+ assertThat(JavaSonarWayProfile.getSecurityRuleKeys()).isEmpty();
// one security rule available
com.sonar.plugins.security.api.JavaRules.ruleKeys = new HashSet<>(Arrays.asList("S3649"));
- assertThat(JavaSonarWayProfile.getSecurityRuleKeys(true)).containsOnly(RuleKey.of("java", "S3649"));
- assertThat(JavaSonarWayProfile.getSecurityRuleKeys(false)).containsOnly(RuleKey.of("security-repo-key", "S3649"));
+ assertThat(JavaSonarWayProfile.getSecurityRuleKeys()).containsOnly(RuleKey.of("security-repo-key", "S3649"));
}
@Test
@@ -100,20 +99,20 @@ void should_contains_dataflow_bug_detection_rules_if_present() {
@Test
void external_rule_keys_missing_class() {
- JavaSonarWayProfile.getExternalRuleKeys("silly.name", "getDataflowBugDetectionRuleKeys", "ruleCategory", false);
+ JavaSonarWayProfile.getExternalRuleKeys("silly.name", "getDataflowBugDetectionRuleKeys", "ruleCategory");
assertThat(logTester.logs(LoggerLevel.DEBUG)).containsExactly("[ClassNotFoundException], no ruleCategory rules added to Sonar way java profile: silly.name");
}
@Test
void external_rule_keys_missing_method() {
- JavaSonarWayProfile.getExternalRuleKeys(DBD_RULES_CLASS_NAME, "nonExistingRuleKeysMethod", "ruleCategory", false);
+ JavaSonarWayProfile.getExternalRuleKeys(DBD_RULES_CLASS_NAME, "nonExistingRuleKeysMethod", "ruleCategory");
assertThat(logTester.logs(LoggerLevel.DEBUG))
.containsExactly("[NoSuchMethodException], no ruleCategory rules added to Sonar way java profile: com.sonarsource.plugins.dbd.api.JavaRules.nonExistingRuleKeysMethod()");
}
@Test
void external_rule_keys_method_throws_exception() {
- JavaSonarWayProfile.getExternalRuleKeys(DBD_RULES_CLASS_NAME, "methodThrowingException", "ruleCategory", false);
+ JavaSonarWayProfile.getExternalRuleKeys(DBD_RULES_CLASS_NAME, "methodThrowingException", "ruleCategory");
assertThat(logTester.logs(LoggerLevel.DEBUG)).containsExactly("[InvocationTargetException], no ruleCategory rules added to Sonar way java profile: null");
}
}
diff --git a/sonarpedia.json b/sonarpedia.json
index 0c0ecc8aa65..86d61741690 100644
--- a/sonarpedia.json
+++ b/sonarpedia.json
@@ -3,9 +3,9 @@
"languages": [
"JAVA"
],
- "latest-update": "2022-05-13T14:10:46.371635Z",
+ "latest-update": "2022-10-25T09:41:34.432584Z",
"options": {
- "no-language-in-filenames": false,
+ "no-language-in-filenames": true,
"preserve-filenames": false
}
}
\ No newline at end of file
diff --git a/wss-unified-agent.config b/wss-unified-agent.config
index d7a19c7f342..be41185b433 100644
--- a/wss-unified-agent.config
+++ b/wss-unified-agent.config
@@ -4,7 +4,6 @@ resolveAllDependencies=False
maven.aggregateModules=True
maven.downloadMissingDependencies=False
-maven.ignoredScopes=None
maven.m2RepositoryPath=.m2/repository
maven.resolveDependencies=True
maven.runPreStep=False