testing new @Nullable annotations

2026-05-06 05:10:22 +07:00 · 2014-08-31 01:31:41 +04:00
parent 78d91da38d
commit f28955f810
34 changed files with 1300 additions and 9 deletions
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/awt/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/awt/annotations.xml
@@ -132,15 +132,32 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;_,null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Component java.awt.Color getBackground()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Component java.awt.Color getForeground()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.awt.Component java.awt.Component findUnderMouseInWindow(java.awt.PointerInfo)">
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Component java.awt.Component getComponentAt(int, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.awt.Component java.awt.Component getComponentAt(java.awt.Point) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.awt.Component java.awt.Component getComponentAt(java.awt.Point)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Component java.awt.Component locate(int, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.awt.Component java.awt.Dimension getMaximumSize()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -161,6 +178,24 @@
  <item name="java.awt.Component java.awt.Dimension size()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.awt.Component java.awt.Font getFont()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Component java.awt.Font getFont_NoClientCode()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Component java.awt.Graphics getGraphics()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Component java.awt.GraphicsConfiguration getGraphicsConfiguration()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Component java.awt.Image createImage(int, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Component java.awt.Image getBackBuffer()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.awt.Component java.awt.Point getLocation(java.awt.Point) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -169,6 +204,9 @@
      <val val="&quot;!null-&gt;!null;null-&gt;!null&quot;"/>
    </annotation>
  </item>
+  <item name="java.awt.Component java.awt.Point getMousePosition()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.awt.Component java.awt.Point location()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -194,9 +232,24 @@
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
  </item>
+  <item name="java.awt.Component java.awt.im.InputContext getInputContext()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Component java.awt.im.InputMethodRequests getInputMethodRequests()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Component java.awt.image.VolatileImage createVolatileImage(int, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.awt.Component java.awt.image.VolatileImage createVolatileImage(int, int, java.awt.ImageCapabilities) 2">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.awt.Component java.awt.image.VolatileImage createVolatileImage(int, int, java.awt.ImageCapabilities)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Component java.lang.String constructComponentName()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.awt.Component java.lang.String paramString()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -369,21 +422,57 @@
      <val val="&quot;_,!null-&gt;!null;_,null-&gt;null&quot;"/>
    </annotation>
  </item>
+  <item name="java.awt.Container java.awt.Component findComponentAt(int, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Container java.awt.Component findComponentAt(int, int, boolean)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.awt.Container java.awt.Component findComponentAt(java.awt.Point) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.awt.Container java.awt.Component findComponentAt(java.awt.Point)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Container java.awt.Component findComponentAtImpl(int, int, boolean)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Container java.awt.Component getComponentAt(int, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.awt.Container java.awt.Component getComponentAt(java.awt.Point) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.awt.Container java.awt.Component getComponentAt(java.awt.Point)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Container java.awt.Component getMouseEventTargetImpl(int, int, boolean, java.awt.Container.EventTargetFilter, boolean, boolean)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Container java.awt.Component locate(int, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.awt.Container java.awt.Component[] getComponents()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
  <item name="java.awt.Container java.awt.Component[] getComponents_NoClientCode()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.awt.Container java.awt.FocusTraversalPolicy getFocusTraversalPolicy()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Container java.awt.Point getMousePosition(boolean)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.awt.Container java.lang.String paramString()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.awt.Container javax.accessibility.Accessible getAccessibleAt(java.awt.Point)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Container javax.accessibility.Accessible getAccessibleChild(int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.awt.Container void addContainerListener(java.awt.event.ContainerListener) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -504,6 +593,15 @@
      <val val="&quot;null-&gt;false&quot;"/>
    </annotation>
  </item>
+  <item name="java.awt.Window java.awt.Component getFocusOwner()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Window java.awt.Component getMostRecentFocusOwner()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.awt.Window java.awt.Container getFocusCycleRootAncestor()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.awt.Window java.lang.Object access$000(java.awt.Window) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/beans/beancontext/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/beans/beancontext/annotations.xml
@@ -12,6 +12,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.beans.beancontext.BeanContextServicesSupport java.beans.beancontext.BeanContextServicesSupport.BCSSServiceProvider createBCSSServiceProvider(java.lang.Class, java.beans.beancontext.BeanContextServiceProvider)">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -31,9 +32,15 @@
  <item name="java.beans.beancontext.BeanContextServicesSupport java.lang.Object getService(java.beans.beancontext.BeanContextChild, java.lang.Object, java.lang.Class, java.lang.Object, java.beans.beancontext.BeanContextServiceRevokedListener) 4">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.beans.beancontext.BeanContextServicesSupport java.lang.Object getService(java.beans.beancontext.BeanContextChild, java.lang.Object, java.lang.Class, java.lang.Object, java.beans.beancontext.BeanContextServiceRevokedListener)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.beans.beancontext.BeanContextServicesSupport java.util.Iterator getCurrentServiceClasses()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.beans.beancontext.BeanContextServicesSupport java.util.Iterator getCurrentServiceSelectors(java.lang.Class)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.beans.beancontext.BeanContextServicesSupport void addBeanContextServicesListener(java.beans.beancontext.BeanContextServicesListener) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/io/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/io/annotations.xml
@@ -11,6 +11,12 @@
  <item name="java.io.BufferedReader int read(char[], int, int) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.io.BufferedReader java.lang.String readLine()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.io.BufferedReader java.lang.String readLine(boolean)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.io.BufferedWriter BufferedWriter(java.io.Writer) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -50,6 +56,9 @@
  <item name="java.io.DataInputStream int read(byte[]) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.io.DataInputStream java.lang.String readLine()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.io.DataInputStream java.lang.String readUTF()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -133,15 +142,30 @@
  <item name="java.io.File java.io.File getCanonicalFile()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.io.File java.io.File getParentFile()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.io.File java.io.File[] listFiles()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.io.File java.io.File[] listFiles(java.io.FileFilter) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.io.File java.io.File[] listFiles(java.io.FileFilter)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.io.File java.io.File[] listFiles(java.io.FilenameFilter) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.io.File java.io.File[] listFiles(java.io.FilenameFilter)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.io.File java.lang.String getName()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.io.File java.lang.String getParent()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.io.File java.lang.String slashify(java.lang.String, boolean) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -270,9 +294,33 @@
  <item name="java.io.ObjectInputStream java.lang.Class resolveProxyClass(java.lang.String[]) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.io.ObjectInputStream java.lang.Enum readEnum(boolean)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.io.ObjectInputStream java.lang.Object access$300(java.io.ObjectInputStream, boolean) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.io.ObjectInputStream java.lang.Object access$300(java.io.ObjectInputStream, boolean)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.io.ObjectInputStream java.lang.Object readArray(boolean)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.io.ObjectInputStream java.lang.Object readNull()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.io.ObjectInputStream java.lang.Object readObject()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.io.ObjectInputStream java.lang.Object readObject0(boolean)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.io.ObjectInputStream java.lang.Object readObjectOverride()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.io.ObjectInputStream java.lang.Object readUnshared()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.io.ObjectInputStream java.lang.Object resolveObject(java.lang.Object)">
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;!null;null-&gt;null&quot;"/>
@@ -466,6 +514,9 @@
  <item name="java.io.RandomAccessFile int read(byte[]) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.io.RandomAccessFile java.lang.String readLine()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.io.RandomAccessFile java.lang.String readUTF()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/lang/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/lang/annotations.xml
@@ -250,6 +250,15 @@
      <val val="&quot;!null-&gt;!null;null-&gt;null&quot;"/>
    </annotation>
  </item>
+  <item name="java.lang.Class T newInstance()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.Class T newInstance0()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.Class T[] getEnumConstants()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.Class boolean access$100(java.lang.Object[], java.lang.Object[]) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -275,6 +284,9 @@
  <item name="java.lang.Class boolean isAnnotationPresent(java.lang.Class&lt;? extends java.lang.annotation.Annotation&gt;) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.Class java.io.InputStream getResourceAsStream(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.Class java.lang.Class toClass(java.lang.reflect.Type)">
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
@@ -286,12 +298,24 @@
  <item name="java.lang.Class java.lang.Class&lt;? extends U&gt; asSubclass(java.lang.Class&lt;U&gt;)">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.Class java.lang.Class.EnclosingMethodInfo getEnclosingMethodInfo()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.Class java.lang.ClassLoader getClassLoader()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.Class java.lang.String argumentTypesToString(java.lang.Class[]) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.lang.Class java.lang.String argumentTypesToString(java.lang.Class[])">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.Class java.lang.String getCanonicalName()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.Class java.lang.String getSimpleBinaryName()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.Class java.lang.String getSimpleName()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -303,6 +327,9 @@
  <item name="java.lang.Class java.lang.String toString()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.Class java.lang.reflect.Constructor&lt;?&gt; getEnclosingConstructor()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.Class java.lang.reflect.Constructor&lt;T&gt; getConstructor(java.lang.Class...) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -324,12 +351,18 @@
  <item name="java.lang.Class java.lang.reflect.Field getField0(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.Class java.lang.reflect.Field getField0(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.Class java.lang.reflect.Field searchFields(java.lang.reflect.Field[], java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
  <item name="java.lang.Class java.lang.reflect.Field searchFields(java.lang.reflect.Field[], java.lang.String) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.Class java.lang.reflect.Field searchFields(java.lang.reflect.Field[], java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.Class java.lang.reflect.Field[] copyFields(java.lang.reflect.Field[]) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -342,12 +375,18 @@
  <item name="java.lang.Class java.lang.reflect.Method getDeclaredMethod(java.lang.String, java.lang.Class...) 1">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.lang.Class java.lang.reflect.Method getEnclosingMethod()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.Class java.lang.reflect.Method getMethod(java.lang.String, java.lang.Class...) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
  <item name="java.lang.Class java.lang.reflect.Method getMethod0(java.lang.String, java.lang.Class[]) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.Class java.lang.reflect.Method getMethod0(java.lang.String, java.lang.Class[])">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.Class java.lang.reflect.Method searchMethods(java.lang.reflect.Method[], java.lang.String, java.lang.Class[]) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -360,6 +399,12 @@
  <item name="java.lang.Class java.lang.reflect.Method[] copyMethods(java.lang.reflect.Method[]) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.Class java.lang.reflect.Type getGenericSuperclass()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.Class java.net.URL getResource(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.Class void addAll(java.util.Collection, java.lang.reflect.Field[]) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -380,6 +425,21 @@
      <val val="&quot;_,null-&gt;false&quot;"/>
    </annotation>
  </item>
+  <item name="java.lang.ClassLoader java.io.InputStream getResourceAsStream(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.ClassLoader java.io.InputStream getSystemResourceAsStream(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.ClassLoader java.lang.ClassLoader getCallerClassLoader()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.ClassLoader java.lang.ClassLoader getParent()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.ClassLoader java.lang.ClassLoader getSystemClassLoader()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.ClassLoader java.lang.Package definePackage(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.net.URL)">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -390,6 +450,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;null;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.lang.ClassLoader java.lang.String[] initializePath(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -401,6 +462,16 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;null;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.ClassLoader java.net.URL getBootstrapResource(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.ClassLoader java.net.URL getResource(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.ClassLoader java.net.URL getSystemResource(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.lang.ClassLoader java.util.Enumeration findResources(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -1465,6 +1536,12 @@
  <item name="java.lang.StringBuilder void writeObject(java.io.ObjectOutputStream) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.System java.io.InputStream nullInputStream()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.System java.io.PrintStream nullPrintStream()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.System java.lang.String clearProperty(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1486,6 +1563,9 @@
  <item name="java.lang.System void setSecurityManager0(java.lang.SecurityManager) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.lang.System.1 java.lang.Object run()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.System.2 sun.reflect.ConstantPool getConstantPool(java.lang.Class) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1525,6 +1605,9 @@
  <item name="java.lang.Thread Thread(java.lang.ThreadGroup, java.lang.String) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.Thread java.lang.ClassLoader getContextClassLoader()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.Thread java.lang.String getName()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1543,6 +1626,15 @@
  <item name="java.lang.ThreadLocal T childValue(T) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.lang.ThreadLocal T get()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.ThreadLocal T initialValue()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.ThreadLocal T setInitialValue()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.ThreadLocal int access$400(java.lang.ThreadLocal) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1576,9 +1668,15 @@
  <item name="java.lang.ThreadLocal.ThreadLocalMap java.lang.ThreadLocal.ThreadLocalMap.Entry access$000(java.lang.ThreadLocal.ThreadLocalMap, java.lang.ThreadLocal) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.ThreadLocal.ThreadLocalMap java.lang.ThreadLocal.ThreadLocalMap.Entry access$000(java.lang.ThreadLocal.ThreadLocalMap, java.lang.ThreadLocal)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.ThreadLocal.ThreadLocalMap java.lang.ThreadLocal.ThreadLocalMap.Entry getEntry(java.lang.ThreadLocal) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.ThreadLocal.ThreadLocalMap java.lang.ThreadLocal.ThreadLocalMap.Entry getEntry(java.lang.ThreadLocal)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.ThreadLocal.ThreadLocalMap java.lang.ThreadLocal.ThreadLocalMap.Entry getEntryAfterMiss(java.lang.ThreadLocal, int, java.lang.ThreadLocal.ThreadLocalMap.Entry) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -1589,6 +1687,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;_,_,null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.lang.ThreadLocal.ThreadLocalMap void access$100(java.lang.ThreadLocal.ThreadLocalMap, java.lang.ThreadLocal, java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -1608,6 +1707,9 @@
  <item name="java.lang.ThreadLocal.ThreadLocalMap void set(java.lang.ThreadLocal, java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.Throwable java.lang.Throwable getCause()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.Throwable java.lang.Throwable initCause(java.lang.Throwable)">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/lang/invoke/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/lang/invoke/annotations.xml
@@ -118,19 +118,32 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null,_,_,_-&gt;null;_,!null,_,_-&gt;null;_,_,_,!null-&gt;null;_,_,_,null-&gt;null;_,null,_,_-&gt;null;null,_,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeCheckCast(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, java.lang.Class&lt;?&gt;) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeCheckCast(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, java.lang.Class&lt;?&gt;)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeDropArguments(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, int) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeDropArguments(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeDupArguments(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, int) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeDupArguments(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makePairwiseConvert(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makePairwiseConvert(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makePermutation(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int[]) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -144,16 +157,26 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeRetype(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, boolean) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeRetype(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, boolean)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeRetypeOnly(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeRetypeOnly(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeRetypeRaw(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeRetypeRaw(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeRotateArguments(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, int, int) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -161,14 +184,19 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_,_,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeSpreadArguments(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, java.lang.Class&lt;?&gt;, int, int) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeSpreadArguments(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, java.lang.Class&lt;?&gt;, int, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeSwapArguments(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, int)">
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;_,null,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeUnboxArgument(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, java.lang.Class&lt;?&gt;) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -176,6 +204,9 @@
  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeUnboxArgument(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, java.lang.Class&lt;?&gt;) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeUnboxArgument(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, java.lang.Class&lt;?&gt;)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeVarargsCollector(java.lang.invoke.MethodHandle, java.lang.Class&lt;?&gt;) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -236,6 +267,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null,_,_-&gt;!null;null,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.lang.invoke.BoundMethodHandle java.lang.RuntimeException badBoundArgumentException(java.lang.Object, java.lang.invoke.MethodHandle, int) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -271,6 +303,9 @@
  <item name="java.lang.invoke.CallSite java.lang.invoke.CallSite makeSite(java.lang.invoke.MethodHandle, java.lang.String, java.lang.invoke.MethodType, java.lang.Object, java.lang.invoke.MemberName, int) 4">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.CallSite java.lang.invoke.MethodHandle makeDynamicInvoker()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.CallSite java.lang.invoke.WrongMethodTypeException wrongTargetType(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -328,6 +363,9 @@
  <item name="java.lang.invoke.FilterGeneric java.lang.invoke.FilterGeneric.Adapter findAdapter(java.lang.invoke.MethodType, java.lang.invoke.FilterGeneric.Kind, int) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.FilterGeneric java.lang.invoke.FilterGeneric.Adapter findAdapter(java.lang.invoke.MethodType, java.lang.invoke.FilterGeneric.Kind, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.FilterGeneric java.lang.invoke.FilterGeneric.Adapter getAdapter(java.lang.invoke.FilterGeneric.Kind, int) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -389,6 +427,9 @@
  <item name="java.lang.invoke.FilterGeneric.Adapter java.lang.Class&lt;? extends java.lang.invoke.FilterGeneric.Adapter&gt; findSubClass(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.lang.invoke.FilterGeneric.Adapter java.lang.Class&lt;? extends java.lang.invoke.FilterGeneric.Adapter&gt; findSubClass(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.FilterGeneric.F0 F0(java.lang.invoke.MethodHandle) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -667,6 +708,9 @@
  <item name="java.lang.invoke.FromGeneric java.lang.invoke.FromGeneric.Adapter findAdapter(java.lang.invoke.MethodType) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.FromGeneric java.lang.invoke.FromGeneric.Adapter findAdapter(java.lang.invoke.MethodType)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.FromGeneric java.lang.invoke.FromGeneric.Adapter makeInstance(java.lang.invoke.MethodHandle) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -826,6 +870,9 @@
  <item name="java.lang.invoke.FromGeneric.Adapter java.lang.Class&lt;? extends java.lang.invoke.FromGeneric.Adapter&gt; findSubClass(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.lang.invoke.FromGeneric.Adapter java.lang.Class&lt;? extends java.lang.invoke.FromGeneric.Adapter&gt; findSubClass(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.InvokeGeneric boolean returnConversionNeeded(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -863,6 +910,9 @@
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
  </item>
+  <item name="java.lang.invoke.InvokeGeneric java.lang.invoke.MethodHandle makeInitialInvoker()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.Invokers Invokers(java.lang.invoke.MethodType) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -893,6 +943,12 @@
  <item name="java.lang.invoke.MemberName int access$200(java.lang.invoke.MemberName) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MemberName java.lang.Class&lt;?&gt; getFieldType()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.invoke.MemberName java.lang.ClassLoader getClassLoader()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MemberName java.lang.IllegalAccessException makeAccessException(java.lang.String, java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -913,6 +969,9 @@
      <val val="&quot;_,!null-&gt;!null;_,null-&gt;null&quot;"/>
    </annotation>
  </item>
+  <item name="java.lang.invoke.MemberName java.lang.Object getType()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MemberName java.lang.ReflectiveOperationException makeAccessException(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -930,6 +989,9 @@
      <val val="&quot;_,!null-&gt;!null;_,null-&gt;null&quot;"/>
    </annotation>
  </item>
+  <item name="java.lang.invoke.MemberName java.lang.String getName()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MemberName java.lang.String getName(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -938,12 +1000,21 @@
      <val val="&quot;null-&gt;!null&quot;"/>
    </annotation>
  </item>
+  <item name="java.lang.invoke.MemberName java.lang.String getSignature()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.invoke.MemberName java.lang.invoke.MethodType getMethodType()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MemberName.Factory boolean resolveInPlace(java.lang.invoke.MemberName, boolean, java.lang.Class&lt;?&gt;) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
  <item name="java.lang.invoke.MemberName.Factory java.lang.invoke.MemberName resolveOrNull(java.lang.invoke.MemberName, boolean, java.lang.Class&lt;?&gt;) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MemberName.Factory java.lang.invoke.MemberName resolveOrNull(java.lang.invoke.MemberName, boolean, java.lang.Class&lt;?&gt;)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MemberName.Factory java.util.List&lt;java.lang.invoke.MemberName&gt; getMembers(java.lang.Class&lt;?&gt;, java.lang.String, java.lang.Object, int, java.lang.Class&lt;?&gt;) 2">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -1005,10 +1076,14 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle collectArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType, int, java.lang.invoke.MethodHandle) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle collectArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType, int, java.lang.invoke.MethodHandle)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle dropArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType, int) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1030,6 +1105,9 @@
  <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle foldArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType, java.lang.invoke.MethodHandle) 2">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle foldArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType, java.lang.invoke.MethodHandle)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle makeAllocator(java.lang.invoke.MethodHandle) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1039,15 +1117,24 @@
  <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle makeGuardWithCatch(java.lang.invoke.MethodHandle, java.lang.Class&lt;? extends java.lang.Throwable&gt;, java.lang.invoke.MethodHandle) 2">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle makeGuardWithCatch(java.lang.invoke.MethodHandle, java.lang.Class&lt;? extends java.lang.Throwable&gt;, java.lang.invoke.MethodHandle)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle makeGuardWithTest(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
  <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle makeGuardWithTest(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle makeGuardWithTest(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle spreadArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType, int) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle throwException(java.lang.invoke.MethodType)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandleImpl sun.invoke.empty.Empty throwException(T) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -1057,6 +1144,9 @@
  <item name="java.lang.invoke.MethodHandleImpl.AllocateObject java.lang.invoke.MethodHandle make(java.lang.Class&lt;?&gt;, java.lang.invoke.MethodHandle) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandleImpl.AllocateObject java.lang.invoke.MethodHandle make(java.lang.Class&lt;?&gt;, java.lang.invoke.MethodHandle)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandleImpl.AllocateObject java.lang.invoke.MethodType makeConType(java.lang.invoke.MethodHandle) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1093,6 +1183,9 @@
  <item name="java.lang.invoke.MethodHandleImpl.FieldAccessor java.lang.Object staticBase(java.lang.invoke.MemberName) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandleImpl.FieldAccessor java.lang.Object staticBase(java.lang.invoke.MemberName)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandleImpl.FieldAccessor java.lang.String aname(java.lang.Class&lt;?&gt;, boolean) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1165,6 +1258,9 @@
  <item name="java.lang.invoke.MethodHandleImpl.GuardWithTest java.lang.invoke.MethodHandle make(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandleImpl.GuardWithTest java.lang.invoke.MethodHandle make(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandleNatives java.lang.Object[] makeTarget(java.lang.Class&lt;?&gt;, java.lang.String, java.lang.String, int, java.lang.Class&lt;?&gt;)">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1271,9 +1367,15 @@
  <item name="java.lang.invoke.MethodHandles java.lang.Object access$200(java.lang.Object, java.lang.reflect.Method, java.lang.Object[]) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandles java.lang.Object access$200(java.lang.Object, java.lang.reflect.Method, java.lang.Object[])">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandles java.lang.Object callObjectMethod(java.lang.Object, java.lang.reflect.Method, java.lang.Object[]) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandles java.lang.Object callObjectMethod(java.lang.Object, java.lang.reflect.Method, java.lang.Object[])">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandles java.lang.RuntimeException misMatchedTypes(java.lang.String, java.lang.invoke.MethodType, java.lang.invoke.MethodType) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -1304,6 +1406,9 @@
  <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle catchException(java.lang.invoke.MethodHandle, java.lang.Class&lt;? extends java.lang.Throwable&gt;, java.lang.invoke.MethodHandle) 2">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle catchException(java.lang.invoke.MethodHandle, java.lang.Class&lt;? extends java.lang.Throwable&gt;, java.lang.invoke.MethodHandle)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle collectArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1350,12 +1455,18 @@
  <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle filterReturnValue(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle filterReturnValue(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle foldArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
  <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle foldArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle foldArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle genericInvoker(java.lang.invoke.MethodType) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1368,6 +1479,12 @@
  <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle guardWithTest(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle) 2">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle guardWithTest(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle identity(java.lang.Class&lt;?&gt;)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle insertArguments(java.lang.invoke.MethodHandle, int, java.lang.Object...) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1395,6 +1512,9 @@
  <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle throwException(java.lang.Class&lt;?&gt;, java.lang.Class&lt;? extends java.lang.Throwable&gt;) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle throwException(java.lang.Class&lt;?&gt;, java.lang.Class&lt;? extends java.lang.Throwable&gt;)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle wrapperInstanceTarget(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1404,9 +1524,15 @@
  <item name="java.lang.invoke.MethodHandles java.lang.reflect.Constructor getSingleConstructor(java.lang.Class&lt;?&gt;) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandles java.lang.reflect.Constructor getSingleConstructor(java.lang.Class&lt;?&gt;)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandles java.lang.reflect.Method getSingleMethod(java.lang.Class&lt;?&gt;) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandles java.lang.reflect.Method getSingleMethod(java.lang.Class&lt;?&gt;)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandles sun.invoke.WrapperInstance asWrapperInstance(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1433,6 +1559,12 @@
  <item name="java.lang.invoke.MethodHandles.1 java.lang.Object invoke(java.lang.Object, java.lang.reflect.Method, java.lang.Object[]) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodHandles.1 java.lang.Object invoke(java.lang.Object, java.lang.reflect.Method, java.lang.Object[])">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.lang.invoke.MethodHandles.Lookup java.lang.Class&lt;?&gt; lookupClassOrNull()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodHandles.Lookup java.lang.String accessFailedMessage(java.lang.Class&lt;?&gt;, java.lang.invoke.MemberName) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1674,10 +1806,14 @@
  <item name="java.lang.invoke.MethodTypeForm int[] primsAtEndOrder(java.lang.invoke.MethodType) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodTypeForm int[] primsAtEndOrder(java.lang.invoke.MethodType)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodTypeForm java.lang.Class&lt;?&gt; canonicalize(java.lang.Class&lt;?&gt;, int)">
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.lang.invoke.MethodTypeForm java.lang.Class&lt;?&gt;[] canonicalizes(java.lang.Class&lt;?&gt;[], int) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -1688,6 +1824,9 @@
  <item name="java.lang.invoke.MethodTypeForm java.lang.invoke.MethodType canonicalize(java.lang.invoke.MethodType, int, int) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.MethodTypeForm java.lang.invoke.MethodType canonicalize(java.lang.invoke.MethodType, int, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.MethodTypeForm java.lang.invoke.MethodType reorderParameters(java.lang.invoke.MethodType, int[], java.lang.Class&lt;?&gt;[]) 1">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -1747,6 +1886,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;_,null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.lang.invoke.SpreadGeneric.Adapter Adapter(java.lang.invoke.SpreadGeneric, java.lang.invoke.MethodHandle) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -1754,6 +1894,9 @@
  <item name="java.lang.invoke.SpreadGeneric.Adapter java.lang.Class&lt;? extends java.lang.invoke.SpreadGeneric.Adapter&gt; findSubClass(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.lang.invoke.SpreadGeneric.Adapter java.lang.Class&lt;? extends java.lang.invoke.SpreadGeneric.Adapter&gt; findSubClass(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.SpreadGeneric.S0 S0(java.lang.invoke.SpreadGeneric, java.lang.invoke.MethodHandle) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1857,6 +2000,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;_,null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.lang.invoke.SwitchPoint void invalidateAll(java.lang.invoke.SwitchPoint[]) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -1873,6 +2017,9 @@
  <item name="java.lang.invoke.ToGeneric java.lang.invoke.MethodHandle computeReturnConversion(java.lang.invoke.MethodType, java.lang.invoke.MethodType, boolean) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.ToGeneric java.lang.invoke.MethodHandle computeReturnConversion(java.lang.invoke.MethodType, java.lang.invoke.MethodType, boolean)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.ToGeneric java.lang.invoke.MethodHandle make(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1886,6 +2033,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.lang.invoke.ToGeneric java.lang.invoke.ToGeneric of(java.lang.invoke.MethodType) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -1896,6 +2044,9 @@
  <item name="java.lang.invoke.ToGeneric java.lang.invoke.ToGeneric.Adapter findAdapter(java.lang.invoke.MethodType) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.lang.invoke.ToGeneric java.lang.invoke.ToGeneric.Adapter findAdapter(java.lang.invoke.MethodType)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.ToGeneric java.lang.invoke.ToGeneric.Adapter makeInstance(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -2040,6 +2191,9 @@
  <item name="java.lang.invoke.ToGeneric.Adapter java.lang.Class&lt;? extends java.lang.invoke.ToGeneric.Adapter&gt; findSubClass(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.lang.invoke.ToGeneric.Adapter java.lang.Class&lt;? extends java.lang.invoke.ToGeneric.Adapter&gt; findSubClass(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.lang.invoke.VolatileCallSite VolatileCallSite(java.lang.invoke.MethodHandle) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/net/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/net/annotations.xml
@@ -41,6 +41,18 @@
  <item name="java.net.DatagramSocket DatagramSocket(java.net.SocketAddress) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.net.DatagramSocket java.net.InetAddress getLocalAddress()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.net.DatagramSocket java.net.SocketAddress getLocalSocketAddress()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.net.DatagramSocket java.net.SocketAddress getRemoteSocketAddress()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.net.DatagramSocket java.nio.channels.DatagramChannel getChannel()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.net.DatagramSocket void connect(java.net.InetAddress, int) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -67,6 +79,9 @@
      <val val="&quot;!null-&gt;false;null-&gt;false&quot;"/>
    </annotation>
  </item>
+  <item name="java.net.InetAddress byte[] getAddress()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.net.InetAddress int checkNumericZone(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -74,13 +89,20 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.net.InetAddress java.lang.Object getCachedAddress(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.net.InetAddress java.lang.Object getCachedAddress(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.net.InetAddress java.lang.Object readResolve()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.net.InetAddress java.lang.String getHostAddress()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.net.InetAddress java.lang.String getHostFromNameService(java.net.InetAddress, boolean) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -127,12 +149,21 @@
  <item name="java.net.ServerSocket java.lang.String toString()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.net.ServerSocket java.net.InetAddress getInetAddress()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.net.ServerSocket java.net.Socket accept()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.net.ServerSocket java.net.SocketAddress getLocalSocketAddress()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.net.ServerSocket java.net.SocketImpl access$000(java.net.ServerSocket) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.net.ServerSocket java.nio.channels.ServerSocketChannel getChannel()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.net.ServerSocket void implAccept(java.net.Socket) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -163,6 +194,18 @@
  <item name="java.net.Socket java.lang.String toString()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.net.Socket java.net.InetAddress getInetAddress()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.net.Socket java.net.SocketAddress getLocalSocketAddress()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.net.Socket java.net.SocketAddress getRemoteSocketAddress()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.net.Socket java.nio.channels.SocketChannel getChannel()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.net.Socket void bind(java.net.SocketAddress) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -572,9 +615,15 @@
  <item name="java.net.URLConnection int readBytes(int[], int, java.io.InputStream) 2">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.net.URLConnection java.lang.String getContentEncoding()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.net.URLConnection java.lang.String getContentHandlerPkgPrefixes()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.net.URLConnection java.lang.String getContentType()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.net.URLConnection java.lang.String getDefaultRequestProperty(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -582,6 +631,10 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;null;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.net.URLConnection java.lang.String getHeaderField(int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.net.URLConnection java.lang.String getHeaderField(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -590,10 +643,20 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;null;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.net.URLConnection java.lang.String getHeaderFieldKey(int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.net.URLConnection java.lang.String getRequestProperty(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.net.URLConnection java.lang.String guessContentTypeFromStream(java.io.InputStream) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.net.URLConnection java.lang.String guessContentTypeFromStream(java.io.InputStream)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.net.URLConnection java.lang.String stripOffParameters(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -601,6 +664,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;!null;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.net.URLConnection java.lang.String toString()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/security/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/security/annotations.xml
@@ -45,6 +45,12 @@
  <item name="java.security.Provider java.lang.String[] getTypeAndAlgorithm(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.security.Provider java.lang.String[] getTypeAndAlgorithm(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.security.Provider java.security.Provider.Service getService(java.lang.String, java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.security.Provider java.util.Collection values()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -120,6 +126,9 @@
  <item name="java.security.Security java.lang.String getAlgorithmProperty(java.lang.String, java.lang.String) 1">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.security.Security java.lang.String getAlgorithmProperty(java.lang.String, java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.security.Security java.lang.String getProviderProperty(java.lang.String, java.security.Provider) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -135,9 +144,18 @@
  <item name="java.security.Security java.security.Provider[] getProviders(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.security.Security java.security.Provider[] getProviders(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.security.Security java.security.Provider[] getProviders(java.util.Map) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.security.Security java.security.Provider[] getProviders(java.util.Map)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.security.Security java.security.Security.ProviderProperty getProviderProperty(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.security.Security java.util.LinkedHashSet getAllQualifyingCandidates(java.lang.String, java.lang.String, java.security.Provider[]) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/sql/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/sql/annotations.xml
@@ -23,6 +23,9 @@
  <item name="java.sql.BatchUpdateException BatchUpdateException(java.lang.String, java.lang.String, int[], java.lang.Throwable) 2">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.sql.BatchUpdateException int[] getUpdateCounts()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.sql.Date java.lang.String toString()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -89,6 +92,12 @@
  <item name="java.sql.DriverManager void setLogWriter(java.io.PrintWriter) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.sql.DriverManager.2 java.lang.Object run()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.sql.DriverManager.2 java.lang.Void run()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.sql.SQLException java.util.Iterator&lt;java.lang.Throwable&gt; iterator()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/annotations.xml
@@ -61,6 +61,9 @@
  <item name="java.util.AbstractMap V get(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.util.AbstractMap V get(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.AbstractMap V put(K, V) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -70,6 +73,9 @@
  <item name="java.util.AbstractMap V remove(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.util.AbstractMap V remove(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.AbstractMap boolean containsKey(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -1101,6 +1107,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;null;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.util.Collections.EmptyMap boolean containsKey(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -1172,6 +1179,9 @@
  <item name="java.util.Collections.SingletonMap V get(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.util.Collections.SingletonMap V get(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.Collections.SingletonMap boolean containsKey(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -1392,6 +1402,9 @@
  <item name="java.util.Date int compareTo(java.util.Date) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.util.Date java.lang.Object clone()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.Date long parse(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1442,13 +1455,23 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.util.HashMap V get(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.util.HashMap V get(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.HashMap V put(K, V) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.util.HashMap V put(K, V)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.util.HashMap V remove(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.HashMap boolean containsKey(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -1476,6 +1499,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.util.HashMap java.util.Iterator&lt;K&gt; newKeyIterator()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -1510,15 +1534,24 @@
  <item name="java.util.Hashtable V get(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.util.Hashtable V get(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.Hashtable V put(K, V) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
  <item name="java.util.Hashtable V put(K, V) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.util.Hashtable V put(K, V)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.Hashtable V remove(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.util.Hashtable V remove(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.Hashtable boolean contains(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1615,12 +1648,21 @@
  <item name="java.util.IdentityHashMap V get(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.util.IdentityHashMap V get(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.IdentityHashMap V put(K, V) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.util.IdentityHashMap V put(K, V)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.IdentityHashMap V remove(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.util.IdentityHashMap V remove(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.IdentityHashMap boolean access$1500(java.util.IdentityHashMap, java.lang.Object, java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -1676,6 +1718,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.util.IdentityHashMap java.lang.Object maskNull(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -1689,6 +1732,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.util.IdentityHashMap java.lang.Object[] access$100(java.util.IdentityHashMap) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -1711,6 +1755,9 @@
  <item name="java.util.IdentityHashMap.EntryIterator.Entry Entry(java.util.IdentityHashMap.EntryIterator, int, java.util.IdentityHashMap.1) 2">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.util.IdentityHashMap.EntryIterator.Entry K getKey()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.IdentityHashMap.EntryIterator.Entry boolean equals(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -1751,6 +1798,9 @@
  <item name="java.util.IdentityHashMap.IdentityHashMapIterator IdentityHashMapIterator(java.util.IdentityHashMap, java.util.IdentityHashMap.1) 1">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="java.util.IdentityHashMap.KeyIterator K next()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.IdentityHashMap.KeyIterator KeyIterator(java.util.IdentityHashMap, java.util.IdentityHashMap.1) 1">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -1835,6 +1885,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;_,null-&gt;!null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.util.Locale java.lang.String toLowerCase(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -1944,6 +1995,15 @@
  <item name="java.util.TreeMap TreeMap(java.util.SortedMap&lt;K,? extends V&gt;) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.util.TreeMap V get(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.util.TreeMap V put(K, V)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.util.TreeMap V remove(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.TreeMap boolean access$500(java.lang.Object, java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -1997,12 +2057,18 @@
  <item name="java.util.TreeMap java.util.TreeMap.Entry access$1100(java.util.TreeMap, java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.util.TreeMap java.util.TreeMap.Entry access$1100(java.util.TreeMap, java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.TreeMap java.util.TreeMap.Entry access$1300(java.util.TreeMap) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
  <item name="java.util.TreeMap java.util.TreeMap.Entry access$1400(java.util.TreeMap, java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.util.TreeMap java.util.TreeMap.Entry access$1400(java.util.TreeMap, java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.TreeMap java.util.TreeMap.Entry access$300(java.util.TreeMap) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -2016,10 +2082,26 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;_,null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.util.TreeMap java.util.TreeMap.Entry access$800(java.util.TreeMap, java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.util.TreeMap java.util.TreeMap.Entry access$800(java.util.TreeMap, java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.util.TreeMap java.util.TreeMap.Entry&lt;K,V&gt; buildFromSorted(int, int, int, int, java.util.Iterator, java.io.ObjectInputStream, V)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.util.TreeMap java.util.TreeMap.Entry&lt;K,V&gt; getCeilEntry(K)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.util.TreeMap java.util.TreeMap.Entry&lt;K,V&gt; getEntry(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.util.TreeMap java.util.TreeMap.Entry&lt;K,V&gt; getPrecedingEntry(K)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.TreeMap java.util.TreeMap.Entry&lt;K,V&gt; leftOf(java.util.TreeMap.Entry&lt;K,V&gt;) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -2027,6 +2109,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.util.TreeMap java.util.TreeMap.Entry&lt;K,V&gt; parentOf(java.util.TreeMap.Entry&lt;K,V&gt;) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -2035,6 +2118,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.util.TreeMap java.util.TreeMap.Entry&lt;K,V&gt; rightOf(java.util.TreeMap.Entry&lt;K,V&gt;) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -2043,6 +2127,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.util.TreeMap java.util.TreeMap.Entry&lt;K,V&gt; successor(java.util.TreeMap.Entry&lt;K,V&gt;) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -2051,6 +2136,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="java.util.TreeMap void access$600(java.util.TreeMap, java.util.TreeMap.Entry) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/concurrent/locks/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/concurrent/locks/annotations.xml
@@ -29,6 +29,12 @@
  <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer java.lang.String toString()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer java.lang.Thread fullGetFirstQueuedThread()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer java.lang.Thread getFirstQueuedThread()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer java.util.Collection&lt;java.lang.Thread&gt; getWaitingThreads(java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -83,12 +89,18 @@
  <item name="java.util.concurrent.locks.ReentrantLock java.lang.String toString()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.util.concurrent.locks.ReentrantLock java.lang.Thread getOwner()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.concurrent.locks.ReentrantLock java.util.Collection&lt;java.lang.Thread&gt; getWaitingThreads(java.util.concurrent.locks.Condition) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
  <item name="java.util.concurrent.locks.ReentrantLock java.util.concurrent.locks.Condition newCondition()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.util.concurrent.locks.ReentrantLock.Sync java.lang.Thread getOwner()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.concurrent.locks.ReentrantLock.Sync java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject newCondition()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -104,6 +116,9 @@
  <item name="java.util.concurrent.locks.ReentrantReadWriteLock java.lang.String toString()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.util.concurrent.locks.ReentrantReadWriteLock java.lang.Thread getOwner()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.concurrent.locks.ReentrantReadWriteLock java.util.Collection&lt;java.lang.Thread&gt; getWaitingThreads(java.util.concurrent.locks.Condition) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -119,6 +134,9 @@
  <item name="java.util.concurrent.locks.ReentrantReadWriteLock.Sync java.lang.IllegalMonitorStateException unmatchedUnlockException()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="java.util.concurrent.locks.ReentrantReadWriteLock.Sync java.lang.Thread getOwner()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="java.util.concurrent.locks.ReentrantReadWriteLock.Sync java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject newCondition()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/javax/swing/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/javax/swing/annotations.xml
@@ -5,9 +5,15 @@
  <item name="javax.swing.AbstractButton boolean isListener(java.lang.Class, java.awt.event.ActionListener) 1">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="javax.swing.AbstractButton java.awt.Insets getMargin()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="javax.swing.AbstractButton java.beans.PropertyChangeListener createActionPropertyChangeListener(javax.swing.Action)">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="javax.swing.AbstractButton java.lang.Object[] getSelectedObjects()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="javax.swing.AbstractButton java.lang.String paramString()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -63,6 +69,9 @@
  <item name="javax.swing.JComponent byte getWriteObjCounter(javax.swing.JComponent) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="javax.swing.JComponent java.awt.Container getTopLevelAncestor()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="javax.swing.JComponent java.awt.Dimension getSize(java.awt.Dimension) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -94,6 +103,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;null;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="javax.swing.JComponent java.awt.Point getToolTipLocation(java.awt.event.MouseEvent) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -102,6 +112,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;null;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="javax.swing.JComponent java.awt.Rectangle getBounds(java.awt.Rectangle) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -114,6 +125,12 @@
  <item name="javax.swing.JComponent java.awt.Rectangle getVisibleRect()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="javax.swing.JComponent java.awt.event.ActionListener getActionForKeyStroke(javax.swing.KeyStroke)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="javax.swing.JComponent java.lang.Object getClientProperty(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="javax.swing.JComponent java.lang.String getToolTipText(java.awt.event.MouseEvent) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -123,6 +140,27 @@
  <item name="javax.swing.JComponent java.lang.String paramString()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="javax.swing.JComponent javax.swing.ActionMap getActionMap()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="javax.swing.JComponent javax.swing.ActionMap getActionMap(boolean)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="javax.swing.JComponent javax.swing.InputMap getInputMap()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="javax.swing.JComponent javax.swing.InputMap getInputMap(int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="javax.swing.JComponent javax.swing.InputMap getInputMap(int, boolean)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="javax.swing.JComponent javax.swing.JPopupMenu getPopupMenu()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="javax.swing.JComponent javax.swing.JRootPane getRootPane()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="javax.swing.JComponent javax.swing.JToolTip createToolTip()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -178,10 +216,20 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="javax.swing.JComponent.AccessibleJComponent java.lang.String getTitledBorderText()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="javax.swing.JComponent.AccessibleJComponent java.lang.String getToolTipText()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="javax.swing.JComponent.AccessibleJComponent javax.accessibility.AccessibleExtendedComponent getAccessibleExtendedComponent()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="javax.swing.JComponent.AccessibleJComponent javax.accessibility.AccessibleKeyBinding getAccessibleKeyBinding()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="javax.swing.JComponent.AccessibleJComponent javax.swing.JComponent access$100(javax.swing.JComponent.AccessibleJComponent) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -245,6 +293,9 @@
  <item name="javax.swing.JScrollPane java.awt.Component getCorner(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="javax.swing.JScrollPane java.awt.Component getCorner(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="javax.swing.JScrollPane java.awt.Rectangle getViewportBorderBounds()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -343,6 +394,9 @@
  <item name="javax.swing.JTable javax.swing.table.JTableHeader createDefaultTableHeader()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="javax.swing.JTable javax.swing.table.TableCellEditor getCellEditor(int, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="javax.swing.JTable javax.swing.table.TableCellEditor getDefaultEditor(java.lang.Class) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -350,6 +404,10 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="javax.swing.JTable javax.swing.table.TableCellRenderer getCellRenderer(int, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="javax.swing.JTable javax.swing.table.TableCellRenderer getDefaultRenderer(java.lang.Class) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -358,6 +416,10 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="javax.swing.JTable javax.swing.table.TableColumn getResizingColumn()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="javax.swing.JTable javax.swing.table.TableColumnModel createDefaultColumnModel()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -521,12 +583,21 @@
  <item name="javax.swing.SwingUtilities java.awt.Component findFocusOwner(java.awt.Component) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="javax.swing.SwingUtilities java.awt.Component findFocusOwner(java.awt.Component)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="javax.swing.SwingUtilities java.awt.Component getDeepestComponentAt(java.awt.Component, int, int) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="javax.swing.SwingUtilities java.awt.Component getDeepestComponentAt(java.awt.Component, int, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="javax.swing.SwingUtilities java.awt.Component getRoot(java.awt.Component) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="javax.swing.SwingUtilities java.awt.Component getRoot(java.awt.Component)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="javax.swing.SwingUtilities java.awt.Container getAncestorNamed(java.lang.String, java.awt.Component) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -537,6 +608,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;_,null-&gt;null;null,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="javax.swing.SwingUtilities java.awt.Container getAncestorOfClass(java.lang.Class, java.awt.Component) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -548,6 +620,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;_,null-&gt;null;null,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="javax.swing.SwingUtilities java.awt.Point convertPoint(java.awt.Component, int, int, java.awt.Component)">
    <annotation name="org.jetbrains.annotations.Contract">
@@ -575,6 +648,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="javax.swing.SwingUtilities java.awt.Rectangle computeIntersection(int, int, int, int, java.awt.Rectangle) 4">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -613,9 +687,15 @@
  <item name="javax.swing.SwingUtilities java.awt.Window getWindowAncestor(java.awt.Component) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="javax.swing.SwingUtilities java.awt.Window getWindowAncestor(java.awt.Component)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="javax.swing.SwingUtilities java.awt.Window windowForComponent(java.awt.Component) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="javax.swing.SwingUtilities java.awt.Window windowForComponent(java.awt.Component)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="javax.swing.SwingUtilities java.awt.event.MouseEvent convertMouseEvent(java.awt.Component, java.awt.event.MouseEvent, java.awt.Component) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -686,6 +766,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="javax.swing.SwingUtilities javax.accessibility.Accessible getAccessibleChild(java.awt.Component, int) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -696,12 +777,18 @@
  <item name="javax.swing.SwingUtilities javax.swing.ActionMap getUIActionMap(javax.swing.JComponent) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="javax.swing.SwingUtilities javax.swing.ActionMap getUIActionMap(javax.swing.JComponent)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="javax.swing.SwingUtilities javax.swing.CellRendererPane getCellRendererPane(java.awt.Component, java.awt.Container) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
  <item name="javax.swing.SwingUtilities javax.swing.InputMap getUIInputMap(javax.swing.JComponent, int) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="javax.swing.SwingUtilities javax.swing.InputMap getUIInputMap(javax.swing.JComponent, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="javax.swing.SwingUtilities javax.swing.JRootPane getRootPane(java.awt.Component) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -709,6 +796,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="javax.swing.SwingUtilities void convertPointFromScreen(java.awt.Point, java.awt.Component) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/annotations.xml
@@ -20,6 +20,15 @@
  <item name="org.apache.commons.collections.ExtendedProperties java.lang.String escape(java.lang.String)">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.commons.collections.ExtendedProperties java.lang.String getString(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.commons.collections.ExtendedProperties java.lang.String getString(java.lang.String, java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.commons.collections.ExtendedProperties java.lang.String interpolate(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.collections.ExtendedProperties java.lang.String interpolateHelper(java.lang.String, java.util.List) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -27,10 +36,14 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null,_-&gt;!null;null,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.collections.ExtendedProperties java.lang.String testBoolean(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.commons.collections.ExtendedProperties java.lang.String testBoolean(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.collections.ExtendedProperties java.lang.String unescape(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -40,6 +53,9 @@
  <item name="org.apache.commons.collections.ExtendedProperties org.apache.commons.collections.ExtendedProperties convertProperties(java.util.Properties) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.commons.collections.ExtendedProperties org.apache.commons.collections.ExtendedProperties subset(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.collections.ExtendedProperties void combine(org.apache.commons.collections.ExtendedProperties) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -52,6 +68,9 @@
  <item name="org.apache.commons.collections.ExtendedProperties void setInclude(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.commons.collections.ExtendedProperties.PropertiesReader java.lang.String readProperty()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.collections.ExtendedProperties.PropertiesTokenizer java.lang.String nextToken()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/map/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/map/annotations.xml
@@ -24,6 +24,9 @@
  <item name="org.apache.commons.collections.map.AbstractHashedMap int hash(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.commons.collections.map.AbstractHashedMap java.lang.Object clone()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.collections.map.AbstractHashedMap java.lang.Object convertKey(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -38,6 +41,15 @@
  <item name="org.apache.commons.collections.map.AbstractHashedMap java.lang.Object entryValue(org.apache.commons.collections.map.AbstractHashedMap.HashEntry) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.commons.collections.map.AbstractHashedMap java.lang.Object get(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.commons.collections.map.AbstractHashedMap java.lang.Object put(java.lang.Object, java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.commons.collections.map.AbstractHashedMap java.lang.Object remove(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.collections.map.AbstractHashedMap java.lang.String toString()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -47,6 +59,9 @@
  <item name="org.apache.commons.collections.map.AbstractHashedMap org.apache.commons.collections.map.AbstractHashedMap.HashEntry entryNext(org.apache.commons.collections.map.AbstractHashedMap.HashEntry) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.commons.collections.map.AbstractHashedMap org.apache.commons.collections.map.AbstractHashedMap.HashEntry getEntry(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.collections.map.AbstractHashedMap void destroyEntry(org.apache.commons.collections.map.AbstractHashedMap.HashEntry) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -93,6 +108,9 @@
  <item name="org.apache.commons.collections.map.AbstractHashedMap.HashEntry boolean equals(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.commons.collections.map.AbstractHashedMap.HashEntry java.lang.Object getKey()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.collections.map.AbstractHashedMap.HashEntry java.lang.String toString()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -117,6 +135,12 @@
  <item name="org.apache.commons.collections.map.AbstractLinkedMap boolean containsValue(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.commons.collections.map.AbstractLinkedMap java.lang.Object nextKey(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.commons.collections.map.AbstractLinkedMap java.lang.Object previousKey(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.collections.map.AbstractLinkedMap org.apache.commons.collections.map.AbstractHashedMap.HashEntry createEntry(org.apache.commons.collections.map.AbstractHashedMap.HashEntry, int, java.lang.Object, java.lang.Object)">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -167,6 +191,9 @@
      <val val="&quot;!null-&gt;true;null-&gt;true&quot;"/>
    </annotation>
  </item>
+  <item name="org.apache.commons.collections.map.LRUMap java.lang.Object get(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.collections.map.LRUMap void doReadObject(java.io.ObjectInputStream) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/annotations.xml
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/enum/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/enum/annotations.xml
@@ -5,6 +5,9 @@
  <item name="org.apache.commons.lang.enum.Enum boolean equals(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.commons.lang.enum.Enum java.lang.Object readResolve()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.lang.enum.Enum java.lang.String getNameInOtherClassLoader(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -20,6 +23,9 @@
  <item name="org.apache.commons.lang.enum.Enum org.apache.commons.lang.enum.Enum getEnum(java.lang.Class, java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.commons.lang.enum.Enum org.apache.commons.lang.enum.Enum getEnum(java.lang.Class, java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.lang.enum.Enum org.apache.commons.lang.enum.Enum.Entry createEntry(java.lang.Class) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -38,6 +44,9 @@
  <item name="org.apache.commons.lang.enum.EnumUtils org.apache.commons.lang.enum.Enum getEnum(java.lang.Class, java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.commons.lang.enum.EnumUtils org.apache.commons.lang.enum.Enum getEnum(java.lang.Class, java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.lang.enum.EnumUtils org.apache.commons.lang.enum.ValuedEnum getEnum(java.lang.Class, int) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -50,4 +59,7 @@
  <item name="org.apache.commons.lang.enum.ValuedEnum org.apache.commons.lang.enum.Enum getEnum(java.lang.Class, int) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.commons.lang.enum.ValuedEnum org.apache.commons.lang.enum.Enum getEnum(java.lang.Class, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
 </root>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/enums/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/enums/annotations.xml
@@ -5,6 +5,9 @@
  <item name="org.apache.commons.lang.enums.Enum boolean equals(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.commons.lang.enums.Enum java.lang.Object readResolve()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.lang.enums.Enum java.lang.String getNameInOtherClassLoader(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -20,6 +23,9 @@
  <item name="org.apache.commons.lang.enums.Enum org.apache.commons.lang.enums.Enum getEnum(java.lang.Class, java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.commons.lang.enums.Enum org.apache.commons.lang.enums.Enum getEnum(java.lang.Class, java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.lang.enums.Enum org.apache.commons.lang.enums.Enum.Entry createEntry(java.lang.Class) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -38,6 +44,9 @@
  <item name="org.apache.commons.lang.enums.EnumUtils org.apache.commons.lang.enums.Enum getEnum(java.lang.Class, java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.commons.lang.enums.EnumUtils org.apache.commons.lang.enums.Enum getEnum(java.lang.Class, java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.lang.enums.EnumUtils org.apache.commons.lang.enums.ValuedEnum getEnum(java.lang.Class, int) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -50,4 +59,7 @@
  <item name="org.apache.commons.lang.enums.ValuedEnum org.apache.commons.lang.enums.Enum getEnum(java.lang.Class, int) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.commons.lang.enums.ValuedEnum org.apache.commons.lang.enums.Enum getEnum(java.lang.Class, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
 </root>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/exception/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/exception/annotations.xml
@@ -86,6 +86,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.exception.ExceptionUtils java.lang.Throwable getCause(java.lang.Throwable, java.lang.String[]) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -94,6 +95,13 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.commons.lang.exception.ExceptionUtils java.lang.Throwable getCauseUsingFieldName(java.lang.Throwable, java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.commons.lang.exception.ExceptionUtils java.lang.Throwable getCauseUsingMethodName(java.lang.Throwable, java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.exception.ExceptionUtils java.lang.Throwable getCauseUsingWellKnownTypes(java.lang.Throwable) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -102,10 +110,14 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.exception.ExceptionUtils java.lang.Throwable getRootCause(java.lang.Throwable) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.commons.lang.exception.ExceptionUtils java.lang.Throwable getRootCause(java.lang.Throwable)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.lang.exception.ExceptionUtils java.lang.Throwable[] getThrowables(java.lang.Throwable) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -153,4 +165,13 @@
  <item name="org.apache.commons.lang.exception.NestableDelegate void trimStackFrames(java.util.List) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.commons.lang.exception.NestableError java.lang.String getMessage()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.commons.lang.exception.NestableException java.lang.String getMessage()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.commons.lang.exception.NestableRuntimeException java.lang.String getMessage()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
 </root>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/math/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/math/annotations.xml
@@ -302,6 +302,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;!null;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.math.NumberUtils java.lang.Float createFloat(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -310,6 +311,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;!null;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.math.NumberUtils java.lang.Integer createInteger(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -318,6 +320,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;!null;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.math.NumberUtils java.lang.Long createLong(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -326,6 +329,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;!null;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.math.NumberUtils java.lang.Number createNumber(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -334,6 +338,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.math.NumberUtils java.math.BigDecimal createBigDecimal(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -342,6 +347,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;!null;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.math.NumberUtils java.math.BigInteger createBigInteger(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -350,6 +356,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;!null;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.math.NumberUtils long max(long[]) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/text/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/text/annotations.xml
@@ -37,11 +37,13 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;_,_,!null,_-&gt;!null;_,_,null,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.text.ExtendedMessageFormat java.text.Format getFormat(java.lang.String)">
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.text.ExtendedMessageFormat java.text.ParsePosition next(java.text.ParsePosition) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -422,6 +424,9 @@
  <item name="org.apache.commons.lang.text.StrLookup org.apache.commons.lang.text.StrLookup mapLookup(java.util.Map)">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.commons.lang.text.StrLookup.MapStrLookup java.lang.String lookup(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.lang.text.StrMatcher int isMatch(char[], int) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -503,6 +508,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(char[], int, int) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -511,6 +517,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -519,6 +526,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -527,6 +535,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(java.lang.String, int, int) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -535,6 +544,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(java.lang.StringBuffer) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -543,6 +553,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(java.lang.StringBuffer, int, int) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -551,6 +562,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(org.apache.commons.lang.text.StrBuilder) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -559,6 +571,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(org.apache.commons.lang.text.StrBuilder, int, int) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -567,10 +580,14 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String resolveVariable(java.lang.String, org.apache.commons.lang.text.StrBuilder, int, int) 1">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String resolveVariable(java.lang.String, org.apache.commons.lang.text.StrBuilder, int, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.lang.text.StrSubstitutor org.apache.commons.lang.text.StrSubstitutor setVariablePrefix(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -613,6 +630,18 @@
  <item name="org.apache.commons.lang.text.StrTokenizer int readWithQuotes(char[], int, int, org.apache.commons.lang.text.StrBuilder, java.util.List, int, int) 3">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.commons.lang.text.StrTokenizer java.lang.Object clone()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.commons.lang.text.StrTokenizer java.lang.String getContent()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.commons.lang.text.StrTokenizer java.lang.String nextToken()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.commons.lang.text.StrTokenizer java.lang.String previousToken()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.lang.text.StrTokenizer java.lang.String toString()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/time/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/time/annotations.xml
@@ -373,6 +373,9 @@
      <val val="&quot;null-&gt;false&quot;"/>
    </annotation>
  </item>
+  <item name="org.apache.commons.lang.time.DurationFormatUtils.Token java.lang.String toString()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.commons.lang.time.FastDateFormat FastDateFormat(java.lang.String, java.util.TimeZone, java.util.Locale) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -400,6 +403,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null,_-&gt;null;_,!null-&gt;null;null,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.commons.lang.time.FastDateFormat java.lang.String format(java.util.Calendar)">
    <annotation name="org.jetbrains.annotations.NotNull"/>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/annotations.xml
@@ -5,4 +5,7 @@
  <item name="org.apache.velocity.VelocityContext VelocityContext(java.util.Map, org.apache.velocity.context.Context) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.velocity.VelocityContext java.lang.Object clone()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
 </root>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/annotations.xml
@@ -1,4 +1,7 @@
 <root>
+  <item name="org.apache.velocity.app.FieldMethodizer java.lang.Object get(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.app.FieldMethodizer void addObject(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/event/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/event/annotations.xml
@@ -23,6 +23,9 @@
      <val val="&quot;null-&gt;false&quot;"/>
    </annotation>
  </item>
+  <item name="org.apache.velocity.app.event.EventCartridge java.util.Iterator getReferenceInsertionEventHandlers()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.app.event.EventHandlerUtil boolean shouldLogOnNullSet(org.apache.velocity.runtime.RuntimeServices, org.apache.velocity.context.InternalContextAdapter, java.lang.String, java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -95,6 +98,9 @@
  <item name="org.apache.velocity.app.event.InvalidReferenceEventHandler.InvalidMethodExecutor void execute(org.apache.velocity.app.event.EventHandler) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.app.event.InvalidReferenceEventHandler.InvalidSetMethodExecutor java.lang.Object getReturnValue()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.app.event.InvalidReferenceEventHandler.InvalidSetMethodExecutor void execute(org.apache.velocity.app.event.EventHandler) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/event/implement/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/event/implement/annotations.xml
@@ -2,12 +2,18 @@
  <item name="org.apache.velocity.app.event.implement.EscapeHtmlReference java.lang.String escape(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.app.event.implement.EscapeHtmlReference java.lang.String escape(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.app.event.implement.EscapeHtmlReference java.lang.String getMatchAttribute()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
  <item name="org.apache.velocity.app.event.implement.EscapeJavaScriptReference java.lang.String escape(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.app.event.implement.EscapeJavaScriptReference java.lang.String escape(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.app.event.implement.EscapeJavaScriptReference java.lang.String getMatchAttribute()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -22,12 +28,18 @@
  <item name="org.apache.velocity.app.event.implement.EscapeSqlReference java.lang.String escape(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.app.event.implement.EscapeSqlReference java.lang.String escape(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.app.event.implement.EscapeSqlReference java.lang.String getMatchAttribute()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
  <item name="org.apache.velocity.app.event.implement.EscapeXmlReference java.lang.String escape(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.app.event.implement.EscapeXmlReference java.lang.String escape(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.app.event.implement.EscapeXmlReference java.lang.String getMatchAttribute()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -37,6 +49,9 @@
  <item name="org.apache.velocity.app.event.implement.IncludeNotFound java.lang.String includeEvent(java.lang.String, java.lang.String, java.lang.String) 2">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.velocity.app.event.implement.IncludeNotFound java.lang.String includeEvent(java.lang.String, java.lang.String, java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.app.event.implement.IncludeNotFound void setRuntimeServices(org.apache.velocity.runtime.RuntimeServices) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -102,6 +117,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null,_,_,_,_-&gt;null;_,!null,_,_,_-&gt;null;_,_,!null,_,_-&gt;null;_,_,_,!null,_-&gt;null;_,_,_,_,!null-&gt;null;_,_,_,_,null-&gt;null;_,_,_,null,_-&gt;null;_,_,null,_,_-&gt;null;_,null,_,_,_-&gt;null;null,_,_,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.app.event.implement.ReportInvalidReferences java.lang.Object invalidMethod(org.apache.velocity.context.Context, java.lang.String, java.lang.Object, java.lang.String, org.apache.velocity.util.introspection.Info) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -119,6 +135,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null,_,_,_,_-&gt;null;_,!null,_,_,_-&gt;null;_,_,!null,_,_-&gt;null;_,_,_,!null,_-&gt;null;_,_,_,_,!null-&gt;null;_,_,_,_,null-&gt;null;_,_,_,null,_-&gt;null;_,_,null,_,_-&gt;null;_,null,_,_,_-&gt;null;null,_,_,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.app.event.implement.ReportInvalidReferences void reportInvalidReference(java.lang.String, org.apache.velocity.util.introspection.Info) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/context/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/context/annotations.xml
@@ -14,6 +14,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.context.AbstractContext java.lang.Object put(java.lang.String, java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -22,6 +23,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.context.AbstractContext java.lang.Object remove(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -30,6 +32,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.context.EvaluateContext EvaluateContext(org.apache.velocity.context.InternalContextAdapter, org.apache.velocity.runtime.RuntimeServices) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -37,12 +40,21 @@
  <item name="org.apache.velocity.context.EvaluateContext void initContext(org.apache.velocity.runtime.RuntimeServices) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.context.InternalContextAdapterImpl org.apache.velocity.app.event.EventCartridge attachEventCartridge(org.apache.velocity.app.event.EventCartridge)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.velocity.context.InternalContextAdapterImpl org.apache.velocity.app.event.EventCartridge getEventCartridge()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.context.InternalContextAdapterImpl org.apache.velocity.context.InternalContextAdapter getBaseContext()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
  <item name="org.apache.velocity.context.ProxyVMContext boolean isConstant(org.apache.velocity.runtime.parser.node.Node) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.context.ProxyVMContext java.lang.Object remove(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.context.ProxyVMContext void addVMProxyArg(org.apache.velocity.context.InternalContextAdapter, java.lang.String, java.lang.String, org.apache.velocity.runtime.Renderable) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/io/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/io/annotations.xml
@@ -1,4 +1,7 @@
 <root>
+  <item name="org.apache.velocity.io.UnicodeInputStream java.lang.String readEncoding()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.io.UnicodeInputStream org.apache.velocity.io.UnicodeInputStream.UnicodeBOM match(org.apache.velocity.io.UnicodeInputStream.UnicodeBOM, org.apache.velocity.io.UnicodeInputStream.UnicodeBOM) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/annotations.xml
@@ -31,6 +31,12 @@
      <val val="&quot;!null,_,_,_-&gt;true;_,!null,_,_-&gt;true;_,_,!null,_-&gt;true;_,_,_,!null-&gt;true;_,_,_,null-&gt;true;_,_,null,_-&gt;true;_,null,_,_-&gt;true;null,_,_,_-&gt;true&quot;"/>
    </annotation>
  </item>
+  <item name="org.apache.velocity.runtime.RuntimeInstance java.lang.Object getProperty(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.velocity.runtime.RuntimeInstance java.lang.String getString(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.RuntimeInstance org.apache.velocity.app.event.EventHandler initializeSpecificEventHandler(java.lang.String, java.lang.String, java.lang.Class) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -41,6 +47,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;_,_,null-&gt;null;null,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.runtime.RuntimeInstance org.apache.velocity.runtime.parser.Parser createNewParser()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -101,9 +108,24 @@
  <item name="org.apache.velocity.runtime.VelocimacroManager boolean usingNamespaces(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.velocity.runtime.VelocimacroManager java.lang.String getLibraryName(java.lang.String, java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.velocity.runtime.VelocimacroManager java.util.Map addNamespace(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.velocity.runtime.VelocimacroManager java.util.Map getNamespace(java.lang.String, boolean)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.velocity.runtime.VelocimacroManager org.apache.velocity.runtime.directive.VelocimacroProxy get(java.lang.String, java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.VelocimacroManager org.apache.velocity.runtime.directive.VelocimacroProxy get(java.lang.String, java.lang.String, java.lang.String) 2">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.velocity.runtime.VelocimacroManager org.apache.velocity.runtime.directive.VelocimacroProxy get(java.lang.String, java.lang.String, java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.VelocimacroManager.MacroEntry MacroEntry(java.lang.String, org.apache.velocity.runtime.parser.node.Node, java.lang.String[], java.lang.String, org.apache.velocity.runtime.RuntimeServices) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/directive/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/directive/annotations.xml
@@ -11,6 +11,9 @@
  <item name="org.apache.velocity.runtime.directive.Block void init(org.apache.velocity.runtime.RuntimeServices, org.apache.velocity.context.InternalContextAdapter, org.apache.velocity.runtime.parser.node.Node) 2">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.runtime.directive.Block.Reference java.lang.String toString()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.directive.BlockMacro void init(org.apache.velocity.runtime.RuntimeServices, org.apache.velocity.context.InternalContextAdapter, org.apache.velocity.runtime.parser.node.Node) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -128,6 +131,9 @@
  <item name="org.apache.velocity.runtime.directive.Foreach.NullHolderContext NullHolderContext(java.lang.String, org.apache.velocity.context.InternalContextAdapter, org.apache.velocity.runtime.directive.Foreach.1) 2">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.velocity.runtime.directive.Foreach.NullHolderContext java.lang.Object get(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.directive.ForeachScope ForeachScope(java.lang.Object, java.lang.Object) 1">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -258,6 +264,15 @@
  <item name="org.apache.velocity.runtime.directive.Scope.Info Info(org.apache.velocity.runtime.directive.Scope, java.lang.Object) 1">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.velocity.runtime.directive.Scope.Info java.lang.String getName()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.velocity.runtime.directive.Scope.Info java.lang.String getTemplate()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.velocity.runtime.directive.Scope.Info java.lang.String getType()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.directive.Scope.Info java.lang.String toString()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/parser/node/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/parser/node/annotations.xml
@@ -14,6 +14,9 @@
  <item name="org.apache.velocity.runtime.parser.node.ASTAddNode java.lang.Object handleSpecial(java.lang.Object, java.lang.Object, org.apache.velocity.context.InternalContextAdapter) 2">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.velocity.runtime.parser.node.ASTAddNode java.lang.Object handleSpecial(java.lang.Object, java.lang.Object, org.apache.velocity.context.InternalContextAdapter)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.parser.node.ASTAndNode java.lang.Object jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -66,6 +69,9 @@
  <item name="org.apache.velocity.runtime.parser.node.ASTDivNode java.lang.Number perform(java.lang.Number, java.lang.Number, org.apache.velocity.context.InternalContextAdapter) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.runtime.parser.node.ASTDivNode java.lang.Number perform(java.lang.Number, java.lang.Number, org.apache.velocity.context.InternalContextAdapter)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.parser.node.ASTEQNode java.lang.Object jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -156,6 +162,9 @@
  <item name="org.apache.velocity.runtime.parser.node.ASTIdentifier java.lang.Object execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.runtime.parser.node.ASTIdentifier java.lang.Object execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.parser.node.ASTIdentifier java.lang.Object init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object)">
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;_,!null-&gt;!null;_,null-&gt;null&quot;"/>
@@ -189,6 +198,9 @@
  <item name="org.apache.velocity.runtime.parser.node.ASTIndex java.lang.Object execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.runtime.parser.node.ASTIndex java.lang.Object execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.parser.node.ASTIndex java.lang.Object init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object)">
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;_,!null-&gt;!null;_,null-&gt;null&quot;"/>
@@ -208,6 +220,9 @@
  <item name="org.apache.velocity.runtime.parser.node.ASTIntegerRange java.lang.Object jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.runtime.parser.node.ASTIntegerRange java.lang.Object value(org.apache.velocity.context.InternalContextAdapter)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.parser.node.ASTLENode java.lang.Object jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -230,6 +245,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null,_,_-&gt;null;_,!null,_-&gt;null;_,_,!null-&gt;null;_,_,null-&gt;null;_,null,_-&gt;null;null,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.runtime.parser.node.ASTMathNode java.lang.Object init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object)">
    <annotation name="org.jetbrains.annotations.Contract">
@@ -239,9 +255,15 @@
  <item name="org.apache.velocity.runtime.parser.node.ASTMathNode java.lang.Object jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.runtime.parser.node.ASTMathNode java.lang.Object value(org.apache.velocity.context.InternalContextAdapter)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.parser.node.ASTMethod java.lang.Object execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.runtime.parser.node.ASTMethod java.lang.Object execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.parser.node.ASTMethod java.lang.Object handleInvocationException(java.lang.Object, org.apache.velocity.context.InternalContextAdapter, java.lang.Throwable) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -276,6 +298,9 @@
  <item name="org.apache.velocity.runtime.parser.node.ASTModNode java.lang.Number perform(java.lang.Number, java.lang.Number, org.apache.velocity.context.InternalContextAdapter) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.runtime.parser.node.ASTModNode java.lang.Number perform(java.lang.Number, java.lang.Number, org.apache.velocity.context.InternalContextAdapter)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.parser.node.ASTMulNode java.lang.Number perform(java.lang.Number, java.lang.Number, org.apache.velocity.context.InternalContextAdapter) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -308,6 +333,9 @@
  <item name="org.apache.velocity.runtime.parser.node.ASTReference java.lang.Object execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.velocity.runtime.parser.node.ASTReference java.lang.Object execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.parser.node.ASTReference java.lang.Object getVariableValue(org.apache.velocity.context.Context, java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -319,6 +347,9 @@
  <item name="org.apache.velocity.runtime.parser.node.ASTReference java.lang.Object jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.runtime.parser.node.ASTReference java.lang.Object value(org.apache.velocity.context.InternalContextAdapter)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.parser.node.ASTReference java.lang.String getDollarBang()">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -452,6 +483,9 @@
  <item name="org.apache.velocity.runtime.parser.node.GetExecutor GetExecutor(org.apache.velocity.runtime.log.Log, org.apache.velocity.util.introspection.Introspector, java.lang.Class, java.lang.String) 3">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.velocity.runtime.parser.node.GetExecutor java.lang.Object execute(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.parser.node.MapGetExecutor java.lang.Object execute(java.lang.Object) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -541,9 +575,18 @@
  <item name="org.apache.velocity.runtime.parser.node.PropertyExecutor PropertyExecutor(org.apache.velocity.runtime.RuntimeLogger, org.apache.velocity.util.introspection.Introspector, java.lang.Class, java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.runtime.parser.node.PropertyExecutor java.lang.Object execute(java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.parser.node.PropertyExecutor void discover(java.lang.Class, java.lang.String) 1">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.velocity.runtime.parser.node.PutExecutor java.lang.Object execute(java.lang.Object, java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.velocity.runtime.parser.node.SetPropertyExecutor java.lang.Object execute(java.lang.Object, java.lang.Object)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.parser.node.SimpleNode boolean evaluate(org.apache.velocity.context.InternalContextAdapter) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -572,6 +615,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null,_-&gt;null;_,!null-&gt;null;_,null-&gt;null;null,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.runtime.parser.node.SimpleNode java.lang.Object init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object)">
    <annotation name="org.jetbrains.annotations.Contract">
@@ -588,6 +632,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;null;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.runtime.parser.node.SimpleNode java.lang.String getLocation(org.apache.velocity.context.InternalContextAdapter) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/resource/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/resource/annotations.xml
@@ -2,10 +2,22 @@
  <item name="org.apache.velocity.runtime.resource.ResourceFactory org.apache.velocity.runtime.resource.Resource getResource(java.lang.String, int) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.velocity.runtime.resource.ResourceFactory org.apache.velocity.runtime.resource.Resource getResource(java.lang.String, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.velocity.runtime.resource.ResourceManagerImpl java.lang.String getLoaderNameForResource(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.resource.ResourceManagerImpl org.apache.velocity.runtime.resource.Resource createResource(java.lang.String, int) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.velocity.runtime.resource.ResourceManagerImpl org.apache.velocity.runtime.resource.Resource createResource(java.lang.String, int)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.resource.ResourceManagerImpl org.apache.velocity.runtime.resource.Resource refreshResource(org.apache.velocity.runtime.resource.Resource, java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.runtime.resource.ResourceManagerImpl org.apache.velocity.runtime.resource.loader.ResourceLoader getLoaderForResource(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
 </root>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/resource/loader/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/resource/loader/annotations.xml
@@ -72,6 +72,9 @@
  <item name="org.apache.velocity.runtime.resource.loader.FileResourceLoader java.io.InputStream findTemplate(java.lang.String, java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.velocity.runtime.resource.loader.FileResourceLoader java.io.InputStream findTemplate(java.lang.String, java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.resource.loader.FileResourceLoader java.io.InputStream getResourceStream(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -87,6 +90,9 @@
  <item name="org.apache.velocity.runtime.resource.loader.JarHolder JarHolder(org.apache.velocity.runtime.RuntimeServices, java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.runtime.resource.loader.JarHolder java.io.InputStream getResource(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.runtime.resource.loader.JarResourceLoader boolean isSourceModified(org.apache.velocity.runtime.resource.Resource) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/util/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/util/annotations.xml
@@ -5,14 +5,23 @@
  <item name="org.apache.velocity.util.ClassUtils java.io.InputStream getResourceAsStream(java.lang.Class, java.lang.String) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.util.ClassUtils java.lang.Object getNewInstance(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.util.ClassUtils org.apache.velocity.util.introspection.VelMethod getMethod(java.lang.String, java.lang.Object[], java.lang.Class[], java.lang.Object, org.apache.velocity.context.InternalContextAdapter, org.apache.velocity.runtime.parser.node.SimpleNode, boolean) 4">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.util.ClassUtils org.apache.velocity.util.introspection.VelMethod getMethod(java.lang.String, java.lang.Object[], java.lang.Class[], java.lang.Object, org.apache.velocity.context.InternalContextAdapter, org.apache.velocity.runtime.parser.node.SimpleNode, boolean)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.util.ExceptionUtils java.lang.Throwable createWithCause(java.lang.Class, java.lang.String, java.lang.Throwable)">
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_,_-&gt;null&quot;"/>
    </annotation>
  </item>
+  <item name="org.apache.velocity.util.SimplePool java.lang.Object get()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.util.StringUtils boolean allEmpty(java.util.List) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -68,6 +77,9 @@
  <item name="org.apache.velocity.util.StringUtils java.lang.String normalizePath(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.util.StringUtils java.lang.String normalizePath(java.lang.String)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.util.StringUtils java.lang.String nullTrim(java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -75,6 +87,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;!null;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.util.StringUtils java.lang.String removeAndHump(java.lang.String)">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -89,6 +102,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.util.StringUtils java.lang.String sub(java.lang.String, java.lang.String, java.lang.String) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -114,5 +128,6 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;!null-&gt;!null;null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
 </root>
--- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/util/introspection/annotations.xml
+++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/util/introspection/annotations.xml
@@ -1,7 +1,22 @@
 <root>
+  <item name="org.apache.velocity.util.introspection.AbstractChainableUberspector java.util.Iterator getIterator(java.lang.Object, org.apache.velocity.util.introspection.Info)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.velocity.util.introspection.AbstractChainableUberspector org.apache.velocity.util.introspection.VelMethod getMethod(java.lang.Object, java.lang.String, java.lang.Object[], org.apache.velocity.util.introspection.Info)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.velocity.util.introspection.AbstractChainableUberspector org.apache.velocity.util.introspection.VelPropertyGet getPropertyGet(java.lang.Object, java.lang.String, org.apache.velocity.util.introspection.Info)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
+  <item name="org.apache.velocity.util.introspection.AbstractChainableUberspector org.apache.velocity.util.introspection.VelPropertySet getPropertySet(java.lang.Object, java.lang.String, java.lang.Object, org.apache.velocity.util.introspection.Info)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.util.introspection.ClassMap java.lang.reflect.Method findMethod(java.lang.String, java.lang.Object[]) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.util.introspection.ClassMap java.lang.reflect.Method findMethod(java.lang.String, java.lang.Object[])">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.util.introspection.ClassMap void populateMethodCacheWithInterface(org.apache.velocity.util.introspection.ClassMap.MethodCache, java.lang.Class) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -17,6 +32,9 @@
  <item name="org.apache.velocity.util.introspection.ClassMap.MethodCache java.lang.reflect.Method get(java.lang.String, java.lang.Object[]) 1">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.util.introspection.ClassMap.MethodCache java.lang.reflect.Method get(java.lang.String, java.lang.Object[])">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.util.introspection.ClassMap.MethodCache void access$100(org.apache.velocity.util.introspection.ClassMap.MethodCache, java.lang.reflect.Method) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
@@ -48,6 +66,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.util.introspection.IntrospectorBase java.lang.reflect.Method getMethod(java.lang.Class, java.lang.String, java.lang.Object[]) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -86,6 +105,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;_,null-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.util.introspection.MethodMap java.lang.reflect.Method getBestMatch(java.util.List, java.lang.Class[]) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -100,6 +120,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;_,_,null-&gt;null;null,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.util.introspection.SecureUberspector java.util.Iterator getIterator(java.lang.Object, org.apache.velocity.util.introspection.Info) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -111,6 +132,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.util.introspection.UberspectImpl java.util.Iterator getIterator(java.lang.Object, org.apache.velocity.util.introspection.Info) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
@@ -118,6 +140,9 @@
  <item name="org.apache.velocity.util.introspection.UberspectImpl java.util.Iterator getIterator(java.lang.Object, org.apache.velocity.util.introspection.Info) 1">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
+  <item name="org.apache.velocity.util.introspection.UberspectImpl java.util.Iterator getIterator(java.lang.Object, org.apache.velocity.util.introspection.Info)">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.util.introspection.UberspectImpl org.apache.velocity.util.introspection.VelMethod getMethod(java.lang.Object, java.lang.String, java.lang.Object[], org.apache.velocity.util.introspection.Info) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
@@ -128,6 +153,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.util.introspection.UberspectImpl org.apache.velocity.util.introspection.VelPropertyGet getPropertyGet(java.lang.Object, java.lang.String, org.apache.velocity.util.introspection.Info) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -139,6 +165,7 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.util.introspection.UberspectImpl org.apache.velocity.util.introspection.VelPropertySet getPropertySet(java.lang.Object, java.lang.String, java.lang.Object, org.apache.velocity.util.introspection.Info) 0">
    <annotation name="org.jetbrains.annotations.Nullable"/>
@@ -150,11 +177,18 @@
    <annotation name="org.jetbrains.annotations.Contract">
      <val val="&quot;null,_,_,_-&gt;null&quot;"/>
    </annotation>
+    <annotation name="org.jetbrains.annotations.Nullable"/>
  </item>
  <item name="org.apache.velocity.util.introspection.UberspectImpl void setRuntimeLogger(org.apache.velocity.runtime.RuntimeLogger) 0">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.util.introspection.UberspectImpl.VelGetterImpl java.lang.String getMethodName()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
  <item name="org.apache.velocity.util.introspection.UberspectImpl.VelMethodImpl java.lang.Object[] handleVarArg(java.lang.Class, int, java.lang.Object[]) 2">
    <annotation name="org.jetbrains.annotations.NotNull"/>
  </item>
+  <item name="org.apache.velocity.util.introspection.UberspectImpl.VelSetterImpl java.lang.String getMethodName()">
+    <annotation name="org.jetbrains.annotations.Nullable"/>
+  </item>
 </root>
--- a/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java
@@ -133,22 +133,37 @@ public class BytecodeAnalysisIntegrationTest extends JavaCodeInsightFixtureTestC
      return;
    }

-    // not null-result
-    String externalOutAnnotation =
-      myExternalAnnotationsManager.findExternalAnnotation(method, AnnotationUtil.NOT_NULL) == null ? "null" : "@NotNull";
-    String inferredOutAnnotation =
-      myInferredAnnotationsManager.findInferredAnnotation(method, AnnotationUtil.NOT_NULL) == null ? "null" : "@NotNull";
    String methodKey = PsiFormatUtil.getExternalName(method, false, Integer.MAX_VALUE);

-    if (!externalOutAnnotation.equals(inferredOutAnnotation)) {
-      diffs.add(methodKey + ": " + externalOutAnnotation + " != " + inferredOutAnnotation);
+    {
+      // @NotNull method
+      String externalNotNullMethodAnnotation =
+        myExternalAnnotationsManager.findExternalAnnotation(method, AnnotationUtil.NOT_NULL) == null ? "null" : "@NotNull";
+      String inferredNotNullMethodAnnotation =
+        myInferredAnnotationsManager.findInferredAnnotation(method, AnnotationUtil.NOT_NULL) == null ? "null" : "@NotNull";
+
+      if (!externalNotNullMethodAnnotation.equals(inferredNotNullMethodAnnotation)) {
+        diffs.add(methodKey + ": " + externalNotNullMethodAnnotation + " != " + inferredNotNullMethodAnnotation);
+      }
+    }
+
+    {
+      // @Nullable method
+      String externalNullableMethodAnnotation =
+        myExternalAnnotationsManager.findExternalAnnotation(method, AnnotationUtil.NULLABLE) == null ? "null" : "@Nullable";
+      String inferredNullableMethodAnnotation =
+        myInferredAnnotationsManager.findInferredAnnotation(method, AnnotationUtil.NULLABLE) == null ? "null" : "@Nullable";
+
+      if (!externalNullableMethodAnnotation.equals(inferredNullableMethodAnnotation)) {
+        diffs.add(methodKey + ": " + externalNullableMethodAnnotation + " != " + inferredNullableMethodAnnotation);
+      }
    }

    for (PsiParameter parameter : method.getParameterList().getParameters()) {
      String parameterKey = PsiFormatUtil.getExternalName(parameter, false, Integer.MAX_VALUE);

      {
-        // @NotNull
+        // @NotNull parameter
        String externalNotNull =
          myExternalAnnotationsManager.findExternalAnnotation(parameter, AnnotationUtil.NOT_NULL) == null ? "null" : "@NotNull";
        String inferredNotNull =
@@ -159,7 +174,7 @@ public class BytecodeAnalysisIntegrationTest extends JavaCodeInsightFixtureTestC
      }

      {
-        // @Nullable
+        // @Nullable parameter
        String externalNullable =
          myExternalAnnotationsManager.findExternalAnnotation(parameter, AnnotationUtil.NULLABLE) == null ? "null" : "@Nullable";
        String inferredNullable =
@@ -170,6 +185,7 @@ public class BytecodeAnalysisIntegrationTest extends JavaCodeInsightFixtureTestC
      }
    }

+    // @Contract
    PsiAnnotation externalContractAnnotation =
      myExternalAnnotationsManager.findExternalAnnotation(method, ORG_JETBRAINS_ANNOTATIONS_CONTRACT);
    PsiAnnotation inferredContractAnnotation =