From 404c2bc89142ac849152e272aafe09f74ccb2885 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 22 Jun 2018 17:07:09 +0200
Subject: [PATCH] IDEA-194439 Regression: Enum.toString() should not be
 externally annotated as @NotNull

---
 .../nullableProblems/NonAnnotatedSiblingOverriding.java     | 6 +++++-
 java/jdkAnnotations/java/lang/annotations.xml               | 3 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/java/java-tests/testData/inspection/nullableProblems/NonAnnotatedSiblingOverriding.java b/java/java-tests/testData/inspection/nullableProblems/NonAnnotatedSiblingOverriding.java
index bbd24d3a5cd0..8a85c405095e 100644
--- a/java/java-tests/testData/inspection/nullableProblems/NonAnnotatedSiblingOverriding.java
+++ b/java/java-tests/testData/inspection/nullableProblems/NonAnnotatedSiblingOverriding.java
@@ -23,4 +23,8 @@ interface NonNullEnum {
   String name();
 }
 
-enum NonNullEnumImpl implements NonNullEnum {}
\ No newline at end of file
+enum NonNullEnumImpl implements NonNullEnum { a;
+  public String toString() {
+    return null;
+  }
+}
\ No newline at end of file
diff --git a/java/jdkAnnotations/java/lang/annotations.xml b/java/jdkAnnotations/java/lang/annotations.xml
index 093c9296eef7..5c0fc791dd9c 100644
--- a/java/jdkAnnotations/java/lang/annotations.xml
+++ b/java/jdkAnnotations/java/lang/annotations.xml
@@ -86,9 +86,6 @@
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
   <item name='java.lang.Enum java.lang.String name()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-  <item name='java.lang.Enum java.lang.String toString()'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
   <item name='java.lang.Integer int bitCount(int)'>