SONARJAVA-5866 S6816 should not raise on fields and parameters annotated as NonNull

Author: aurelien-coet-sonarsource

its/autoscan/src/test/resources/autoscan/diffs/diff_S6816.json

@@ -1,6 +1,6 @@
 {
   "ruleKey": "S6816",
   "hasTruePositives": false,
-  "falseNegatives": 14,
+  "falseNegatives": 12,
   "falsePositives": 0
 }

java-checks-test-sources/default/src/main/java/checks/spring/NullableInjectedFieldsHaveDefaultValueSample.java

@@ -3,6 +3,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.lang.NonNull;
 
 public class NullableInjectedFieldsHaveDefaultValueSample {
   @Nullable
@@ -39,7 +40,7 @@ public class NullableInjectedFieldsHaveDefaultValueSample {
 
   private static final String NON_COMPLIANT_IN_A_CONSTANT = "${non.compliant.constant}";
   //fix@fixStaticConstant {{Set null as default value}}
-  //edit@fixStaticConstant [[sl=40;el=40;sc=61;ec=88]] {{"${non.compliant.constant:#{null}}"}}
+  //edit@fixStaticConstant [[sl=-4;el=-4;sc=61;ec=88]] {{"${non.compliant.constant:#{null}}"}}
   @Nullable
   @Value(value = NON_COMPLIANT_IN_A_CONSTANT) // Noncompliant [[sc=3;ec=46;secondary=-1;quickfixes=fixStaticConstant,localFixOnStaticConstant]]
   //fix@localFixOnStaticConstant {{Set null as default value locally}}
@@ -48,7 +49,7 @@ public class NullableInjectedFieldsHaveDefaultValueSample {
 
   private final String finalButNotStatic = "${non.compliant.constant}";
   //fix@fixConstant {{Set null as default value}}
-  //edit@fixConstant [[sl=49;el=49;sc=44;ec=71]] {{"${non.compliant.constant:#{null}}"}}
+  //edit@fixConstant [[sl=-4;el=-4;sc=44;ec=71]] {{"${non.compliant.constant:#{null}}"}}
   @Nullable
   @Value(finalButNotStatic) // Noncompliant [[sc=3;ec=28;secondary=-1;quickfixes=fixConstant,localFixOnConstant]]
   // fix@localFixOnConstant {{Set null as default value locally}}
@@ -118,4 +119,16 @@ private String setNothingWithTwoParameters(@Nullable String a, String b) {
   @org.jspecify.annotations.Nullable
   @Value("${my.property_jspecify}") // Noncompliant  {{Provide a default null value for this field.}} [[sc=3;ec=27;secondary=-1]]
   private String myProperty_jspecify;
+
+  @Value("${notNull}")
+  @NonNull
+  private String notNull; // Compliant, fields marked as non-null should be ignored
+
+  private String nonNullArgument1(@Value("${x}") @org.jspecify.annotations.NonNull String x) { // Compliant, parameters marked as non-null should be ignored
+    return x;
+  }
+
+  private String nonNullArgument2(@Value("${x}") @NonNull String x) { // Compliant, parameters marked as non-null should be ignored
+    return x;
+  }
 }

java-checks/src/main/java/org/sonar/java/checks/spring/NullableInjectedFieldsHaveDefaultValueCheck.java

@@ -170,7 +170,7 @@ private static AnnotationTree extractValueAnnotationOnSetter(MethodTree method)
   private static Optional<AnnotationTree> getNullableAnnotation(VariableTree field) {
     SymbolMetadata.NullabilityData nullabilityData = field.symbol().metadata().nullabilityData(SymbolMetadata.NullabilityTarget.FIELD);
     SymbolMetadata.AnnotationInstance instance = nullabilityData.annotation();
-    if (instance == null) {
+    if (instance == null || nullabilityData.isNonNull(SymbolMetadata.NullabilityLevel.CLASS, false, false)) {
       return Optional.empty();
     }
     return Optional.ofNullable(field.symbol().metadata().findAnnotationTree(instance));