data flow inspection: getters without explicit nullable annotation are nullable if their fields are nullable

java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaPsiUtil.java

@@ -110,6 +110,13 @@ public class DfaPsiUtil {
       return inferParameterNullability((PsiParameter)owner);
     }
 
+    if (owner instanceof PsiMethod) {
+      PsiField field = PropertyUtil.getFieldOfGetter((PsiMethod)owner);
+      if (field != null && getElementNullability(resultType, field) == Nullness.NULLABLE) {
+        return Nullness.NULLABLE;
+      }
+    }
+
     return Nullness.UNKNOWN;
   }
 

java/java-tests/testData/inspection/dataFlow/fixture/GetterOfNullableFieldIsNotAnnotated.java

@@ -0,0 +1,17 @@
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+class A {
+  @Nullable
+  private final String xxxx = "";
+
+  public String getXxxx() {
+    return xxxx;
+  }
+}
+
+class B {
+
+  @NotNull
+  String x = <warning descr="Expression 'new A().getXxxx()' might evaluate to null but is assigned to a variable that is annotated with @NotNull">new A().getXxxx()</warning>;
+}

java/java-tests/testData/inspection/dataFlow/fixture/GetterOfNullableFieldIsNotNull.java

@@ -0,0 +1,18 @@
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+class A {
+  @Nullable
+  private final String xxxx = "";
+
+  @NotNull
+  public String getXxxx() {
+    return xxxx;
+  }
+}
+
+class B {
+
+  @NotNull
+  String x = new A().getXxxx();
+}

java/java-tests/testSrc/com/intellij/java/codeInspection/DataFlowInspectionTest.java

@@ -542,4 +542,8 @@ public class DataFlowInspectionTest extends DataFlowInspectionTestCase {
   public void testInnerClass() { doTest(); }
   public void testCovariantReturn() { doTest(); }
   public void testArrayInitializerLength() { doTest(); }
+
+  public void testGetterOfNullableFieldIsNotAnnotated() { doTest(); }
+
+  public void testGetterOfNullableFieldIsNotNull() { doTest(); }
 }