From 0f2c21ee908f36fee40cbaa5bfc24793c63f839a Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Thu, 12 Jul 2012 13:27:56 +0200
Subject: [PATCH] IDEA-82125: do not override @Nullable with @NotNull in
 complex hierarchies

---
 .../nullable/NullableStuffInspection.java     |  3 ++-
 .../overriddenMethods/expected.xml            | 22 +++++++++----------
 .../overriddenMethods/src/Test.java           | 22 +++++++++++++++++++
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java b/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java
index 3e2abb03eb8a..39b807db5bec 100644
--- a/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java
@@ -357,7 +357,8 @@ public class NullableStuffInspection extends BaseLocalInspectionTool {
           if (!manager.isInProject(overriding)) continue;
           if (!methodQuickFixSuggested
               && annotated.isDeclaredNotNull
-              && !nullableManager.isNotNull(overriding, false)) {
+              && !nullableManager.isNotNull(overriding, false) 
+              && !nullableManager.isNullable(overriding, true)) {
             method.getNameIdentifier(); //load tree
             PsiAnnotation annotation = AnnotationUtil.findAnnotation(method, nullableManager.getNotNulls());
             final String defaultNotNull = nullableManager.getDefaultNotNull();
diff --git a/java/java-tests/testData/inspection/nullableProblems/overriddenMethods/expected.xml b/java/java-tests/testData/inspection/nullableProblems/overriddenMethods/expected.xml
index fe143ef404fb..1c1f7ce48c10 100644
--- a/java/java-tests/testData/inspection/nullableProblems/overriddenMethods/expected.xml
+++ b/java/java-tests/testData/inspection/nullableProblems/overriddenMethods/expected.xml
@@ -2,42 +2,42 @@
 <problems>
 <problem>
   <file>Test.java</file>
-  <line>17</line>
+  <line>18</line>
   <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@NotNull/@Nullable problems</problem_class>
   <description>Not annotated method overrides method annotated with @NotNull</description>
 </problem>
 
 <problem>
   <file>Test.java</file>
-  <line>17</line>
+  <line>18</line>
   <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@NotNull/@Nullable problems</problem_class>
   <description>Not annotated parameter overrides @NotNull parameter</description>
 </problem>
 
-<problem>
-  <file>Test.java</file>
-  <line>4</line>
-  <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@NotNull/@Nullable problems</problem_class>
-  <description>Overridden methods are not annotated</description>
-</problem>
-
 <problem>
   <file>Test.java</file>
   <line>5</line>
   <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@NotNull/@Nullable problems</problem_class>
+  <description>Overridden methods are not annotated</description>
+</problem>
+
+<problem>
+  <file>Test.java</file>
+  <line>6</line>
+  <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@NotNull/@Nullable problems</problem_class>
   <description>Overridden method parameters are not annotated</description>
 </problem>
 
 <problem>
   <file>Test.java</file>
-  <line>11</line>
+  <line>12</line>
   <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@NotNull/@Nullable problems</problem_class>
   <description>Not annotated method overrides method annotated with @NotNull</description>
 </problem>
 
 <problem>
   <file>Test.java</file>
-  <line>11</line>
+  <line>12</line>
   <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@NotNull/@Nullable problems</problem_class>
   <description>Not annotated parameter overrides @NotNull parameter</description>
 </problem></problems>
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/nullableProblems/overriddenMethods/src/Test.java b/java/java-tests/testData/inspection/nullableProblems/overriddenMethods/src/Test.java
index f8a85f48a751..e44eb8c9a0d4 100644
--- a/java/java-tests/testData/inspection/nullableProblems/overriddenMethods/src/Test.java
+++ b/java/java-tests/testData/inspection/nullableProblems/overriddenMethods/src/Test.java
@@ -1,4 +1,5 @@
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 abstract class P2 {
     @NotNull
@@ -29,3 +30,24 @@ class FooImpl extends java.awt.Frame implements Foo {
 //        return super.getTitle();    //To change body of overridden methods use File | Settings | File Templates.
 //    }
 }
+
+
+interface I1 {
+  @Nullable
+  Object foo();
+}
+
+interface I2 extends I1 {
+  @NotNull
+  Object foo();
+}
+
+class A implements I1 {
+  @Override
+  public Object foo() {
+    // returns something
+  }
+}
+
+class B extends A implements I2 {
+}
\ No newline at end of file