diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/java15api/api1.8.txt b/java/java-analysis-impl/src/com/intellij/codeInspection/java15api/api1.8.txt
index c2fbfdfd93f8..488f4469e7bd 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/java15api/api1.8.txt
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/java15api/api1.8.txt
@@ -5,7 +5,7 @@ com.sun.source.tree.MemberReferenceTree
 com.sun.source.tree.IntersectionTypeTree
 com.sun.source.util.Plugin
 com.sun.source.util.DocTrees
-com.sun.source.util.JavacTask#instance(ProcessingEnvironment;)
+com.sun.source.util.JavacTask#instance(javax.annotation.processing.ProcessingEnvironment;)
 com.sun.source.util.JavacTask#addTaskListener(TaskListener;)
 com.sun.source.util.JavacTask#removeTaskListener(TaskListener;)
 com.sun.source.util.DocTreePath
@@ -57,70 +57,70 @@ java.awt.event.InvocationEvent#listener
 java.awt.KeyboardFocusManager#clearFocusOwner()
 java.net.URLPermission
 java.net.HttpConnectSocketImpl
-java.nio.file.attribute.FileTime#from(Instant;)
+java.nio.file.attribute.FileTime#from(java.time.Instant;)
 java.nio.file.attribute.FileTime#toInstant()
-java.nio.file.Files#newBufferedReader(Path;)
-java.nio.file.Files#newBufferedWriter(Path;OpenOption[];)
-java.nio.file.Files#readAllLines(Path;)
-java.nio.file.Files#write(Path;Iterable<? extends CharSequence>;OpenOption[];)
-java.nio.file.Files#list(Path;)
-java.nio.file.Files#walk(Path;int;FileVisitOption[];)
-java.nio.file.Files#walk(Path;FileVisitOption[];)
-java.nio.file.Files#find(Path;int;BiPredicate<Path,BasicFileAttributes>;FileVisitOption[];)
-java.nio.file.Files#lines(Path;Charset;)
-java.nio.file.Files#lines(Path;)
-java.sql.Date#valueOf(LocalDate;)
+java.nio.file.Files#newBufferedReader(java.nio.file.Path;)
+java.nio.file.Files#newBufferedWriter(java.nio.file.Path;java.nio.file.OpenOption[];)
+java.nio.file.Files#readAllLines(java.nio.file.Path;)
+java.nio.file.Files#write(java.nio.file.Path;java.lang.Iterable<? extends java.lang.CharSequence>;java.nio.file.OpenOption[];)
+java.nio.file.Files#list(java.nio.file.Path;)
+java.nio.file.Files#walk(java.nio.file.Path;int;java.nio.file.FileVisitOption[];)
+java.nio.file.Files#walk(java.nio.file.Path;java.nio.file.FileVisitOption[];)
+java.nio.file.Files#find(java.nio.file.Path;int;java.util.function.BiPredicate<java.nio.file.Path,java.nio.file.attribute.BasicFileAttributes>;java.nio.file.FileVisitOption[];)
+java.nio.file.Files#lines(java.nio.file.Path;java.nio.charset.Charset;)
+java.nio.file.Files#lines(java.nio.file.Path;)
+java.sql.Date#valueOf(java.time.LocalDate;)
 java.sql.Date#toLocalDate()
-java.sql.Time#valueOf(LocalTime;)
+java.sql.Time#valueOf(java.time.LocalTime;)
 java.sql.Time#toLocalTime()
 java.sql.Types#REF_CURSOR
 java.sql.Types#TIME_WITH_TIMEZONE
 java.sql.Types#TIMESTAMP_WITH_TIMEZONE
 java.sql.SQLType
 java.sql.JDBCType
-java.sql.SQLInput#readObject(Class<T>;)
-java.sql.ResultSet#updateObject(int;Object;SQLType;int;)
-java.sql.ResultSet#updateObject(String;Object;SQLType;int;)
-java.sql.ResultSet#updateObject(int;Object;SQLType;)
-java.sql.ResultSet#updateObject(String;Object;SQLType;)
-java.sql.SQLOutput#writeObject(Object;SQLType;)
+java.sql.SQLInput#readObject(java.lang.Class<T>;)
+java.sql.ResultSet#updateObject(int;java.lang.Object;java.sql.SQLType;int;)
+java.sql.ResultSet#updateObject(java.lang.String;java.lang.Object;java.sql.SQLType;int;)
+java.sql.ResultSet#updateObject(int;java.lang.Object;java.sql.SQLType;)
+java.sql.ResultSet#updateObject(java.lang.String;java.lang.Object;java.sql.SQLType;)
+java.sql.SQLOutput#writeObject(java.lang.Object;java.sql.SQLType;)
 java.sql.Statement#getLargeUpdateCount()
 java.sql.Statement#setLargeMaxRows(long;)
 java.sql.Statement#getLargeMaxRows()
 java.sql.Statement#executeLargeBatch()
-java.sql.Statement#executeLargeUpdate(String;)
-java.sql.Statement#executeLargeUpdate(String;int;)
-java.sql.Statement#executeLargeUpdate(String;int[];)
-java.sql.Statement#executeLargeUpdate(String;String[];)
-java.sql.Timestamp#valueOf(LocalDateTime;)
+java.sql.Statement#executeLargeUpdate(java.lang.String;)
+java.sql.Statement#executeLargeUpdate(java.lang.String;int;)
+java.sql.Statement#executeLargeUpdate(java.lang.String;int[];)
+java.sql.Statement#executeLargeUpdate(java.lang.String;java.lang.String[];)
+java.sql.Timestamp#valueOf(java.time.LocalDateTime;)
 java.sql.Timestamp#toLocalDateTime()
-java.sql.Timestamp#from(Instant;)
+java.sql.Timestamp#from(java.time.Instant;)
 java.sql.Timestamp#toInstant()
 java.sql.DriverAction#deregister()
 java.sql.DriverAction
 java.sql.DriverManager#DEREGISTER_DRIVER_PERMISSION
-java.sql.DriverManager#registerDriver(java.sql.Driver;DriverAction;)
+java.sql.DriverManager#registerDriver(java.sql.Driver;java.sql.DriverAction;)
 java.sql.DatabaseMetaData#getMaxLogicalLobSize()
 java.sql.DatabaseMetaData#supportsRefCursors()
-java.sql.CallableStatement#setObject(String;Object;SQLType;int;)
-java.sql.CallableStatement#setObject(String;Object;SQLType;)
-java.sql.CallableStatement#registerOutParameter(int;SQLType;)
-java.sql.CallableStatement#registerOutParameter(int;SQLType;int;)
-java.sql.CallableStatement#registerOutParameter(int;SQLType;String;)
-java.sql.CallableStatement#registerOutParameter(String;SQLType;)
-java.sql.CallableStatement#registerOutParameter(String;SQLType;int;)
-java.sql.CallableStatement#registerOutParameter(String;SQLType;String;)
-java.sql.PreparedStatement#setObject(int;Object;SQLType;int;)
-java.sql.PreparedStatement#setObject(int;Object;SQLType;)
+java.sql.CallableStatement#setObject(java.lang.String;java.lang.Object;java.sql.SQLType;int;)
+java.sql.CallableStatement#setObject(java.lang.String;java.lang.Object;java.sql.SQLType;)
+java.sql.CallableStatement#registerOutParameter(int;java.sql.SQLType;)
+java.sql.CallableStatement#registerOutParameter(int;java.sql.SQLType;int;)
+java.sql.CallableStatement#registerOutParameter(int;java.sql.SQLType;java.lang.String;)
+java.sql.CallableStatement#registerOutParameter(java.lang.String;java.sql.SQLType;)
+java.sql.CallableStatement#registerOutParameter(java.lang.String;java.sql.SQLType;int;)
+java.sql.CallableStatement#registerOutParameter(java.lang.String;java.sql.SQLType;java.lang.String;)
+java.sql.PreparedStatement#setObject(int;java.lang.Object;java.sql.SQLType;int;)
+java.sql.PreparedStatement#setObject(int;java.lang.Object;java.sql.SQLType;)
 java.sql.PreparedStatement#executeLargeUpdate()
-java.sql.BatchUpdateException#BatchUpdateException(String;String;int;long[];Throwable;)
+java.sql.BatchUpdateException#BatchUpdateException(java.lang.String;java.lang.String;int;long[];java.lang.Throwable;)
 java.sql.BatchUpdateException#getLargeUpdateCounts()
 java.sql.BatchUpdateException#longUpdateCounts
-java.lang.invoke.MethodHandles#reflectAs(Class<T>;MethodHandle;)
-java.lang.invoke.MethodHandles.Lookup#revealDirect(MethodHandle;)
+java.lang.invoke.MethodHandles#reflectAs(java.lang.Class<T>;java.lang.invoke.MethodHandle;)
+java.lang.invoke.MethodHandles.Lookup#revealDirect(java.lang.invoke.MethodHandle;)
 java.lang.invoke.MethodHandleInfo
 java.lang.reflect.Type#getTypeName()
-java.lang.reflect.Field#getAnnotationsByType(Class<T>;)
+java.lang.reflect.Field#getAnnotationsByType(java.lang.Class<T>;)
 java.lang.reflect.Field#getAnnotatedType()
 java.lang.reflect.Method#isDefault()
 java.lang.reflect.Method#getAnnotatedReturnType()
@@ -128,7 +128,7 @@ java.lang.reflect.Modifier#parameterModifiers()
 java.lang.reflect.Parameter
 java.lang.reflect.Executable#getParameterCount()
 java.lang.reflect.Executable#getParameters()
-java.lang.reflect.Executable#getAnnotationsByType(Class<T>;)
+java.lang.reflect.Executable#getAnnotationsByType(java.lang.Class<T>;)
 java.lang.reflect.Executable#getAnnotatedReturnType()
 java.lang.reflect.Executable#getAnnotatedReceiverType()
 java.lang.reflect.Executable#getAnnotatedParameterTypes()
@@ -138,12 +138,12 @@ java.lang.reflect.Constructor#getAnnotatedReturnType()
 java.lang.reflect.Constructor#getAnnotatedReceiverType()
 java.lang.reflect.TypeVariable#getAnnotatedBounds()
 java.lang.reflect.AnnotatedType
-java.lang.reflect.AccessibleObject#getAnnotationsByType(Class<T>;)
-java.lang.reflect.AccessibleObject#getDeclaredAnnotation(Class<T>;)
-java.lang.reflect.AccessibleObject#getDeclaredAnnotationsByType(Class<T>;)
-java.lang.reflect.AnnotatedElement#getAnnotationsByType(Class<T>;)
-java.lang.reflect.AnnotatedElement#getDeclaredAnnotation(Class<T>;)
-java.lang.reflect.AnnotatedElement#getDeclaredAnnotationsByType(Class<T>;)
+java.lang.reflect.AccessibleObject#getAnnotationsByType(java.lang.Class<T>;)
+java.lang.reflect.AccessibleObject#getDeclaredAnnotation(java.lang.Class<T>;)
+java.lang.reflect.AccessibleObject#getDeclaredAnnotationsByType(java.lang.Class<T>;)
+java.lang.reflect.AnnotatedElement#getAnnotationsByType(java.lang.Class<T>;)
+java.lang.reflect.AnnotatedElement#getDeclaredAnnotation(java.lang.Class<T>;)
+java.lang.reflect.AnnotatedElement#getDeclaredAnnotationsByType(java.lang.Class<T>;)
 java.lang.reflect.AnnotatedArrayType
 java.lang.reflect.AnnotatedTypeVariable
 java.lang.reflect.AnnotatedWildcardType
@@ -155,8 +155,8 @@ java.lang.Byte#toUnsignedLong(byte;)
 java.lang.Byte#BYTES
 java.lang.Long#toUnsignedString(long;int;)
 java.lang.Long#toUnsignedString(long;)
-java.lang.Long#parseUnsignedLong(String;int;)
-java.lang.Long#parseUnsignedLong(String;)
+java.lang.Long#parseUnsignedLong(java.lang.String;int;)
+java.lang.Long#parseUnsignedLong(java.lang.String;)
 java.lang.Long#hashCode(long;)
 java.lang.Long#compareUnsigned(long;long;)
 java.lang.Long#divideUnsigned(long;long;)
@@ -205,23 +205,23 @@ java.lang.annotation.Native
 java.lang.annotation.Repeatable
 java.lang.annotation.ElementType#TYPE_PARAMETER
 java.lang.annotation.ElementType#TYPE_USE
-java.lang.management.LockInfo#from(CompositeData;)
+java.lang.management.LockInfo#from(javax.management.openmbean.CompositeData;)
 java.lang.Double#BYTES
 java.lang.Double#isFinite(double;)
 java.lang.Double#hashCode(double;)
 java.lang.Double#sum(double;double;)
 java.lang.Double#max(double;double;)
 java.lang.Double#min(double;double;)
-java.lang.String#join(CharSequence;CharSequence[];)
-java.lang.String#join(CharSequence;Iterable<? extends CharSequence>;)
+java.lang.String#join(java.lang.CharSequence;java.lang.CharSequence[];)
+java.lang.String#join(java.lang.CharSequence;java.lang.Iterable<? extends java.lang.CharSequence>;)
 java.lang.Boolean#hashCode(boolean;)
 java.lang.Boolean#logicalAnd(boolean;boolean;)
 java.lang.Boolean#logicalOr(boolean;boolean;)
 java.lang.Boolean#logicalXor(boolean;boolean;)
 java.lang.Integer#toUnsignedString(int;int;)
 java.lang.Integer#toUnsignedString(int;)
-java.lang.Integer#parseUnsignedInt(String;int;)
-java.lang.Integer#parseUnsignedInt(String;)
+java.lang.Integer#parseUnsignedInt(java.lang.String;int;)
+java.lang.Integer#parseUnsignedInt(java.lang.String;)
 java.lang.Integer#hashCode(int;)
 java.lang.Integer#compareUnsigned(int;int;)
 java.lang.Integer#toUnsignedLong(int;)
@@ -231,13 +231,13 @@ java.lang.Integer#BYTES
 java.lang.Integer#sum(int;int;)
 java.lang.Integer#max(int;int;)
 java.lang.Integer#min(int;int;)
-java.lang.Package#getAnnotationsByType(Class<A>;)
-java.lang.Package#getDeclaredAnnotation(Class<A>;)
-java.lang.Package#getDeclaredAnnotationsByType(Class<A>;)
-java.lang.Process#waitFor(long;TimeUnit;)
+java.lang.Package#getAnnotationsByType(java.lang.Class<A>;)
+java.lang.Package#getDeclaredAnnotation(java.lang.Class<A>;)
+java.lang.Package#getDeclaredAnnotationsByType(java.lang.Class<A>;)
+java.lang.Process#waitFor(long;java.util.concurrent.TimeUnit;)
 java.lang.Process#destroyForcibly()
 java.lang.Process#isAlive()
-java.lang.Iterable#forEach(Consumer<? super T>;)
+java.lang.Iterable#forEach(java.util.function.Consumer<? super T>;)
 java.lang.Iterable#spliterator()
 java.lang.Character.UnicodeBlock#ARABIC_EXTENDED_A
 java.lang.Character.UnicodeBlock#SUNDANESE_SUPPLEMENT
@@ -265,15 +265,15 @@ java.lang.StrictMath#floorMod(int;int;)
 java.lang.StrictMath#floorMod(long;long;)
 java.lang.StrictMath#nextDown(double;)
 java.lang.StrictMath#nextDown(float;)
-java.lang.ThreadLocal#withInitial(Supplier<? extends S>;)
+java.lang.ThreadLocal#withInitial(java.util.function.Supplier<? extends S>;)
 java.lang.CharSequence#chars()
 java.lang.CharSequence#codePoints()
-java.lang.StringBuffer#append(AbstractStringBuilder;)
-java.lang.InternalError#InternalError(String;Throwable;)
-java.lang.InternalError#InternalError(Throwable;)
+java.lang.StringBuffer#append(java.lang.AbstractStringBuilder;)
+java.lang.InternalError#InternalError(java.lang.String;java.lang.Throwable;)
+java.lang.InternalError#InternalError(java.lang.Throwable;)
 java.lang.FunctionalInterface
-java.lang.VirtualMachineError#VirtualMachineError(String;Throwable;)
-java.lang.VirtualMachineError#VirtualMachineError(Throwable;)
+java.lang.VirtualMachineError#VirtualMachineError(java.lang.String;java.lang.Throwable;)
+java.lang.VirtualMachineError#VirtualMachineError(java.lang.Throwable;)
 java.lang.AbstractStringBuilder#append(java.lang.AbstractStringBuilder;)
 java.math.BigInteger#longValueExact()
 java.math.BigInteger#intValueExact()
@@ -361,22 +361,22 @@ java.time.OffsetDateTime
 java.time.DateTimeException
 java.util.spi.CalendarDataProvider
 java.util.spi.CalendarNameProvider
-java.util.spi.TimeZoneNameProvider#getGenericDisplayName(String;int;Locale;)
-java.util.spi.LocaleServiceProvider#isSupportedLocale(Locale;)
+java.util.spi.TimeZoneNameProvider#getGenericDisplayName(java.lang.String;int;java.util.Locale;)
+java.util.spi.LocaleServiceProvider#isSupportedLocale(java.util.Locale;)
 java.util.spi.ResourceBundleControlProvider
-java.util.zip.CRC32#update(ByteBuffer;)
-java.util.zip.Adler32#update(ByteBuffer;)
+java.util.zip.CRC32#update(java.nio.ByteBuffer;)
+java.util.zip.Adler32#update(java.nio.ByteBuffer;)
 java.util.zip.ZipFile#stream()
-java.util.zip.ZipEntry#setLastModifiedTime(FileTime;)
+java.util.zip.ZipEntry#setLastModifiedTime(java.nio.file.attribute.FileTime;)
 java.util.zip.ZipEntry#getLastModifiedTime()
-java.util.zip.ZipEntry#setLastAccessTime(FileTime;)
+java.util.zip.ZipEntry#setLastAccessTime(java.nio.file.attribute.FileTime;)
 java.util.zip.ZipEntry#getLastAccessTime()
-java.util.zip.ZipEntry#setCreationTime(FileTime;)
+java.util.zip.ZipEntry#setCreationTime(java.nio.file.attribute.FileTime;)
 java.util.zip.ZipEntry#getCreationTime()
-java.util.regex.Matcher#start(String;)
-java.util.regex.Matcher#end(String;)
+java.util.regex.Matcher#start(java.lang.String;)
+java.util.regex.Matcher#end(java.lang.String;)
 java.util.regex.Pattern#asPredicate()
-java.util.regex.Pattern#splitAsStream(CharSequence;)
+java.util.regex.Pattern#splitAsStream(java.lang.CharSequence;)
 java.util.stream.Node
 java.util.stream.Sink
 java.util.stream.Nodes
@@ -427,34 +427,34 @@ java.util.stream.ReferencePipeline
 java.util.stream.StreamSpliterators
 java.util.stream.AbstractSpinedBuffer
 java.util.stream.AbstractShortCircuitTask
-java.util.logging.Logger#log(Level;Throwable;Supplier<String>;)
-java.util.logging.Logger#logp(Level;String;String;Supplier<String>;)
-java.util.logging.Logger#logp(Level;String;String;Throwable;Supplier<String>;)
-java.util.logging.Logger#logrb(Level;String;String;ResourceBundle;String;Object[];)
-java.util.logging.Logger#logrb(Level;String;String;ResourceBundle;String;Throwable;)
-java.util.logging.Logger#severe(Supplier<String>;)
-java.util.logging.Logger#warning(Supplier<String>;)
-java.util.logging.Logger#info(Supplier<String>;)
-java.util.logging.Logger#config(Supplier<String>;)
-java.util.logging.Logger#fine(Supplier<String>;)
-java.util.logging.Logger#finer(Supplier<String>;)
-java.util.logging.Logger#finest(Supplier<String>;)
-java.util.logging.Logger#setResourceBundle(ResourceBundle;)
+java.util.logging.Logger#log(java.util.logging.Level;java.lang.Throwable;java.util.function.Supplier<java.lang.String>;)
+java.util.logging.Logger#logp(java.util.logging.Level;java.lang.String;java.lang.String;java.util.function.Supplier<java.lang.String>;)
+java.util.logging.Logger#logp(java.util.logging.Level;java.lang.String;java.lang.String;java.lang.Throwable;java.util.function.Supplier<java.lang.String>;)
+java.util.logging.Logger#logrb(java.util.logging.Level;java.lang.String;java.lang.String;java.util.ResourceBundle;java.lang.String;java.lang.Object[];)
+java.util.logging.Logger#logrb(java.util.logging.Level;java.lang.String;java.lang.String;java.util.ResourceBundle;java.lang.String;java.lang.Throwable;)
+java.util.logging.Logger#severe(java.util.function.Supplier<java.lang.String>;)
+java.util.logging.Logger#warning(java.util.function.Supplier<java.lang.String>;)
+java.util.logging.Logger#info(java.util.function.Supplier<java.lang.String>;)
+java.util.logging.Logger#config(java.util.function.Supplier<java.lang.String>;)
+java.util.logging.Logger#fine(java.util.function.Supplier<java.lang.String>;)
+java.util.logging.Logger#finer(java.util.function.Supplier<java.lang.String>;)
+java.util.logging.Logger#finest(java.util.function.Supplier<java.lang.String>;)
+java.util.logging.Logger#setResourceBundle(java.util.ResourceBundle;)
 java.util.Map.Entry#comparingByKey()
 java.util.Map.Entry#comparingByValue()
-java.util.Map.Entry#comparingByKey(Comparator<? super K>;)
-java.util.Map.Entry#comparingByValue(Comparator<? super V>;)
-java.util.Map#getOrDefault(Object;V;)
-java.util.Map#forEach(BiConsumer<? super K,? super V>;)
-java.util.Map#replaceAll(BiFunction<? super K,? super V,? extends V>;)
+java.util.Map.Entry#comparingByKey(java.util.Comparator<? super K>;)
+java.util.Map.Entry#comparingByValue(java.util.Comparator<? super V>;)
+java.util.Map#getOrDefault(java.lang.Object;V;)
+java.util.Map#forEach(java.util.function.BiConsumer<? super K,? super V>;)
+java.util.Map#replaceAll(java.util.function.BiFunction<? super K,? super V,? extends V>;)
 java.util.Map#putIfAbsent(K;V;)
-java.util.Map#remove(Object;Object;)
+java.util.Map#remove(java.lang.Object;java.lang.Object;)
 java.util.Map#replace(K;V;V;)
 java.util.Map#replace(K;V;)
-java.util.Map#computeIfAbsent(K;Function<? super K,? extends V>;)
-java.util.Map#computeIfPresent(K;BiFunction<? super K,? super V,? extends V>;)
-java.util.Map#compute(K;BiFunction<? super K,? super V,? extends V>;)
-java.util.Map#merge(K;V;BiFunction<? super V,? super V,? extends V>;)
+java.util.Map#computeIfAbsent(K;java.util.function.Function<? super K,? extends V>;)
+java.util.Map#computeIfPresent(K;java.util.function.BiFunction<? super K,? super V,? extends V>;)
+java.util.Map#compute(K;java.util.function.BiFunction<? super K,? super V,? extends V>;)
+java.util.Map#merge(K;V;java.util.function.BiFunction<? super V,? super V,? extends V>;)
 java.util.Set#spliterator()
 java.util.function.Consumer
 java.util.function.Function
@@ -499,52 +499,52 @@ java.util.function.IntToDoubleFunction
 java.util.function.DoubleBinaryOperator
 java.util.function.DoubleToLongFunction
 java.util.function.LongToDoubleFunction
-java.util.Date#from(Instant;)
+java.util.Date#from(java.time.Instant;)
 java.util.Date#toInstant()
-java.util.List#replaceAll(UnaryOperator<E>;)
-java.util.List#sort(Comparator<? super E>;)
+java.util.List#replaceAll(java.util.function.UnaryOperator<E>;)
+java.util.List#sort(java.util.Comparator<? super E>;)
 java.util.List#spliterator()
 java.util.concurrent.locks.StampedLock
 java.util.concurrent.atomic.LongAdder
-java.util.concurrent.atomic.AtomicLong#getAndUpdate(LongUnaryOperator;)
-java.util.concurrent.atomic.AtomicLong#updateAndGet(LongUnaryOperator;)
-java.util.concurrent.atomic.AtomicLong#getAndAccumulate(long;LongBinaryOperator;)
-java.util.concurrent.atomic.AtomicLong#accumulateAndGet(long;LongBinaryOperator;)
+java.util.concurrent.atomic.AtomicLong#getAndUpdate(java.util.function.LongUnaryOperator;)
+java.util.concurrent.atomic.AtomicLong#updateAndGet(java.util.function.LongUnaryOperator;)
+java.util.concurrent.atomic.AtomicLong#getAndAccumulate(long;java.util.function.LongBinaryOperator;)
+java.util.concurrent.atomic.AtomicLong#accumulateAndGet(long;java.util.function.LongBinaryOperator;)
 java.util.concurrent.atomic.DoubleAdder
-java.util.concurrent.atomic.AtomicInteger#getAndUpdate(IntUnaryOperator;)
-java.util.concurrent.atomic.AtomicInteger#updateAndGet(IntUnaryOperator;)
-java.util.concurrent.atomic.AtomicInteger#getAndAccumulate(int;IntBinaryOperator;)
-java.util.concurrent.atomic.AtomicInteger#accumulateAndGet(int;IntBinaryOperator;)
-java.util.concurrent.atomic.AtomicLongArray#getAndUpdate(int;LongUnaryOperator;)
-java.util.concurrent.atomic.AtomicLongArray#updateAndGet(int;LongUnaryOperator;)
-java.util.concurrent.atomic.AtomicLongArray#getAndAccumulate(int;long;LongBinaryOperator;)
-java.util.concurrent.atomic.AtomicLongArray#accumulateAndGet(int;long;LongBinaryOperator;)
-java.util.concurrent.atomic.AtomicReference#getAndUpdate(UnaryOperator<V>;)
-java.util.concurrent.atomic.AtomicReference#updateAndGet(UnaryOperator<V>;)
-java.util.concurrent.atomic.AtomicReference#getAndAccumulate(V;BinaryOperator<V>;)
-java.util.concurrent.atomic.AtomicReference#accumulateAndGet(V;BinaryOperator<V>;)
+java.util.concurrent.atomic.AtomicInteger#getAndUpdate(java.util.function.IntUnaryOperator;)
+java.util.concurrent.atomic.AtomicInteger#updateAndGet(java.util.function.IntUnaryOperator;)
+java.util.concurrent.atomic.AtomicInteger#getAndAccumulate(int;java.util.function.IntBinaryOperator;)
+java.util.concurrent.atomic.AtomicInteger#accumulateAndGet(int;java.util.function.IntBinaryOperator;)
+java.util.concurrent.atomic.AtomicLongArray#getAndUpdate(int;java.util.function.LongUnaryOperator;)
+java.util.concurrent.atomic.AtomicLongArray#updateAndGet(int;java.util.function.LongUnaryOperator;)
+java.util.concurrent.atomic.AtomicLongArray#getAndAccumulate(int;long;java.util.function.LongBinaryOperator;)
+java.util.concurrent.atomic.AtomicLongArray#accumulateAndGet(int;long;java.util.function.LongBinaryOperator;)
+java.util.concurrent.atomic.AtomicReference#getAndUpdate(java.util.function.UnaryOperator<V>;)
+java.util.concurrent.atomic.AtomicReference#updateAndGet(java.util.function.UnaryOperator<V>;)
+java.util.concurrent.atomic.AtomicReference#getAndAccumulate(V;java.util.function.BinaryOperator<V>;)
+java.util.concurrent.atomic.AtomicReference#accumulateAndGet(V;java.util.function.BinaryOperator<V>;)
 java.util.concurrent.atomic.LongAccumulator
 java.util.concurrent.atomic.DoubleAccumulator
-java.util.concurrent.atomic.AtomicIntegerArray#getAndUpdate(int;IntUnaryOperator;)
-java.util.concurrent.atomic.AtomicIntegerArray#updateAndGet(int;IntUnaryOperator;)
-java.util.concurrent.atomic.AtomicIntegerArray#getAndAccumulate(int;int;IntBinaryOperator;)
-java.util.concurrent.atomic.AtomicIntegerArray#accumulateAndGet(int;int;IntBinaryOperator;)
-java.util.concurrent.atomic.AtomicReferenceArray#getAndUpdate(int;UnaryOperator<E>;)
-java.util.concurrent.atomic.AtomicReferenceArray#updateAndGet(int;UnaryOperator<E>;)
-java.util.concurrent.atomic.AtomicReferenceArray#getAndAccumulate(int;E;BinaryOperator<E>;)
-java.util.concurrent.atomic.AtomicReferenceArray#accumulateAndGet(int;E;BinaryOperator<E>;)
-java.util.concurrent.atomic.AtomicLongFieldUpdater#getAndUpdate(T;LongUnaryOperator;)
-java.util.concurrent.atomic.AtomicLongFieldUpdater#updateAndGet(T;LongUnaryOperator;)
-java.util.concurrent.atomic.AtomicLongFieldUpdater#getAndAccumulate(T;long;LongBinaryOperator;)
-java.util.concurrent.atomic.AtomicLongFieldUpdater#accumulateAndGet(T;long;LongBinaryOperator;)
-java.util.concurrent.atomic.AtomicIntegerFieldUpdater#getAndUpdate(T;IntUnaryOperator;)
-java.util.concurrent.atomic.AtomicIntegerFieldUpdater#updateAndGet(T;IntUnaryOperator;)
-java.util.concurrent.atomic.AtomicIntegerFieldUpdater#getAndAccumulate(T;int;IntBinaryOperator;)
-java.util.concurrent.atomic.AtomicIntegerFieldUpdater#accumulateAndGet(T;int;IntBinaryOperator;)
-java.util.concurrent.atomic.AtomicReferenceFieldUpdater#getAndUpdate(T;UnaryOperator<V>;)
-java.util.concurrent.atomic.AtomicReferenceFieldUpdater#updateAndGet(T;UnaryOperator<V>;)
-java.util.concurrent.atomic.AtomicReferenceFieldUpdater#getAndAccumulate(T;V;BinaryOperator<V>;)
-java.util.concurrent.atomic.AtomicReferenceFieldUpdater#accumulateAndGet(T;V;BinaryOperator<V>;)
+java.util.concurrent.atomic.AtomicIntegerArray#getAndUpdate(int;java.util.function.IntUnaryOperator;)
+java.util.concurrent.atomic.AtomicIntegerArray#updateAndGet(int;java.util.function.IntUnaryOperator;)
+java.util.concurrent.atomic.AtomicIntegerArray#getAndAccumulate(int;int;java.util.function.IntBinaryOperator;)
+java.util.concurrent.atomic.AtomicIntegerArray#accumulateAndGet(int;int;java.util.function.IntBinaryOperator;)
+java.util.concurrent.atomic.AtomicReferenceArray#getAndUpdate(int;java.util.function.UnaryOperator<E>;)
+java.util.concurrent.atomic.AtomicReferenceArray#updateAndGet(int;java.util.function.UnaryOperator<E>;)
+java.util.concurrent.atomic.AtomicReferenceArray#getAndAccumulate(int;E;java.util.function.BinaryOperator<E>;)
+java.util.concurrent.atomic.AtomicReferenceArray#accumulateAndGet(int;E;java.util.function.BinaryOperator<E>;)
+java.util.concurrent.atomic.AtomicLongFieldUpdater#getAndUpdate(T;java.util.function.LongUnaryOperator;)
+java.util.concurrent.atomic.AtomicLongFieldUpdater#updateAndGet(T;java.util.function.LongUnaryOperator;)
+java.util.concurrent.atomic.AtomicLongFieldUpdater#getAndAccumulate(T;long;java.util.function.LongBinaryOperator;)
+java.util.concurrent.atomic.AtomicLongFieldUpdater#accumulateAndGet(T;long;java.util.function.LongBinaryOperator;)
+java.util.concurrent.atomic.AtomicIntegerFieldUpdater#getAndUpdate(T;java.util.function.IntUnaryOperator;)
+java.util.concurrent.atomic.AtomicIntegerFieldUpdater#updateAndGet(T;java.util.function.IntUnaryOperator;)
+java.util.concurrent.atomic.AtomicIntegerFieldUpdater#getAndAccumulate(T;int;java.util.function.IntBinaryOperator;)
+java.util.concurrent.atomic.AtomicIntegerFieldUpdater#accumulateAndGet(T;int;java.util.function.IntBinaryOperator;)
+java.util.concurrent.atomic.AtomicReferenceFieldUpdater#getAndUpdate(T;java.util.function.UnaryOperator<V>;)
+java.util.concurrent.atomic.AtomicReferenceFieldUpdater#updateAndGet(T;java.util.function.UnaryOperator<V>;)
+java.util.concurrent.atomic.AtomicReferenceFieldUpdater#getAndAccumulate(T;V;java.util.function.BinaryOperator<V>;)
+java.util.concurrent.atomic.AtomicReferenceFieldUpdater#accumulateAndGet(T;V;java.util.function.BinaryOperator<V>;)
 java.util.concurrent.Executors#newWorkStealingPool(int;)
 java.util.concurrent.Executors#newWorkStealingPool()
 java.util.concurrent.ForkJoinPool#commonPool()
@@ -553,13 +553,13 @@ java.util.concurrent.ForkJoinTask#quietlyComplete()
 java.util.concurrent.ForkJoinTask#getForkJoinTaskTag()
 java.util.concurrent.ForkJoinTask#setForkJoinTaskTag(short;)
 java.util.concurrent.ForkJoinTask#compareAndSetForkJoinTaskTag(short;short;)
-java.util.concurrent.ConcurrentMap#getOrDefault(Object;V;)
-java.util.concurrent.ConcurrentMap#forEach(BiConsumer<? super K,? super V>;)
-java.util.concurrent.ConcurrentMap#replaceAll(BiFunction<? super K,? super V,? extends V>;)
-java.util.concurrent.ConcurrentMap#computeIfAbsent(K;Function<? super K,? extends V>;)
-java.util.concurrent.ConcurrentMap#computeIfPresent(K;BiFunction<? super K,? super V,? extends V>;)
-java.util.concurrent.ConcurrentMap#compute(K;BiFunction<? super K,? super V,? extends V>;)
-java.util.concurrent.ConcurrentMap#merge(K;V;BiFunction<? super V,? super V,? extends V>;)
+java.util.concurrent.ConcurrentMap#getOrDefault(java.lang.Object;V;)
+java.util.concurrent.ConcurrentMap#forEach(java.util.function.BiConsumer<? super K,? super V>;)
+java.util.concurrent.ConcurrentMap#replaceAll(java.util.function.BiFunction<? super K,? super V,? extends V>;)
+java.util.concurrent.ConcurrentMap#computeIfAbsent(K;java.util.function.Function<? super K,? extends V>;)
+java.util.concurrent.ConcurrentMap#computeIfPresent(K;java.util.function.BiFunction<? super K,? super V,? extends V>;)
+java.util.concurrent.ConcurrentMap#compute(K;java.util.function.BiFunction<? super K,? super V,? extends V>;)
+java.util.concurrent.ConcurrentMap#merge(K;V;java.util.function.BiFunction<? super V,? super V,? extends V>;)
 java.util.concurrent.CompletionStage
 java.util.concurrent.CountedCompleter
 java.util.concurrent.SynchronousQueue#spliterator()
@@ -568,37 +568,37 @@ java.util.concurrent.CompletableFuture
 java.util.concurrent.ConcurrentHashMap#mappingCount()
 java.util.concurrent.ConcurrentHashMap#newKeySet()
 java.util.concurrent.ConcurrentHashMap#newKeySet(int;)
-java.util.concurrent.ConcurrentHashMap#forEach(long;BiConsumer<? super K,? super V>;)
-java.util.concurrent.ConcurrentHashMap#forEach(long;BiFunction<? super K,? super V,? extends U>;Consumer<? super U>;)
-java.util.concurrent.ConcurrentHashMap#search(long;BiFunction<? super K,? super V,? extends U>;)
-java.util.concurrent.ConcurrentHashMap#reduce(long;BiFunction<? super K,? super V,? extends U>;BiFunction<? super U,? super U,? extends U>;)
-java.util.concurrent.ConcurrentHashMap#reduceToDouble(long;ToDoubleBiFunction<? super K,? super V>;double;DoubleBinaryOperator;)
-java.util.concurrent.ConcurrentHashMap#reduceToLong(long;ToLongBiFunction<? super K,? super V>;long;LongBinaryOperator;)
-java.util.concurrent.ConcurrentHashMap#reduceToInt(long;ToIntBiFunction<? super K,? super V>;int;IntBinaryOperator;)
-java.util.concurrent.ConcurrentHashMap#forEachKey(long;Consumer<? super K>;)
-java.util.concurrent.ConcurrentHashMap#forEachKey(long;Function<? super K,? extends U>;Consumer<? super U>;)
-java.util.concurrent.ConcurrentHashMap#searchKeys(long;Function<? super K,? extends U>;)
-java.util.concurrent.ConcurrentHashMap#reduceKeys(long;BiFunction<? super K,? super K,? extends K>;)
-java.util.concurrent.ConcurrentHashMap#reduceKeys(long;Function<? super K,? extends U>;BiFunction<? super U,? super U,? extends U>;)
-java.util.concurrent.ConcurrentHashMap#reduceKeysToDouble(long;ToDoubleFunction<? super K>;double;DoubleBinaryOperator;)
-java.util.concurrent.ConcurrentHashMap#reduceKeysToLong(long;ToLongFunction<? super K>;long;LongBinaryOperator;)
-java.util.concurrent.ConcurrentHashMap#reduceKeysToInt(long;ToIntFunction<? super K>;int;IntBinaryOperator;)
-java.util.concurrent.ConcurrentHashMap#forEachValue(long;Consumer<? super V>;)
-java.util.concurrent.ConcurrentHashMap#forEachValue(long;Function<? super V,? extends U>;Consumer<? super U>;)
-java.util.concurrent.ConcurrentHashMap#searchValues(long;Function<? super V,? extends U>;)
-java.util.concurrent.ConcurrentHashMap#reduceValues(long;BiFunction<? super V,? super V,? extends V>;)
-java.util.concurrent.ConcurrentHashMap#reduceValues(long;Function<? super V,? extends U>;BiFunction<? super U,? super U,? extends U>;)
-java.util.concurrent.ConcurrentHashMap#reduceValuesToDouble(long;ToDoubleFunction<? super V>;double;DoubleBinaryOperator;)
-java.util.concurrent.ConcurrentHashMap#reduceValuesToLong(long;ToLongFunction<? super V>;long;LongBinaryOperator;)
-java.util.concurrent.ConcurrentHashMap#reduceValuesToInt(long;ToIntFunction<? super V>;int;IntBinaryOperator;)
-java.util.concurrent.ConcurrentHashMap#forEachEntry(long;Consumer<? super Map.Entry<K,V>>;)
-java.util.concurrent.ConcurrentHashMap#forEachEntry(long;Function<Map.Entry<K,V>,? extends U>;Consumer<? super U>;)
-java.util.concurrent.ConcurrentHashMap#searchEntries(long;Function<Map.Entry<K,V>,? extends U>;)
-java.util.concurrent.ConcurrentHashMap#reduceEntries(long;BiFunction<Map.Entry<K,V>,Map.Entry<K,V>,? extends Map.Entry<K,V>>;)
-java.util.concurrent.ConcurrentHashMap#reduceEntries(long;Function<Map.Entry<K,V>,? extends U>;BiFunction<? super U,? super U,? extends U>;)
-java.util.concurrent.ConcurrentHashMap#reduceEntriesToDouble(long;ToDoubleFunction<Map.Entry<K,V>>;double;DoubleBinaryOperator;)
-java.util.concurrent.ConcurrentHashMap#reduceEntriesToLong(long;ToLongFunction<Map.Entry<K,V>>;long;LongBinaryOperator;)
-java.util.concurrent.ConcurrentHashMap#reduceEntriesToInt(long;ToIntFunction<Map.Entry<K,V>>;int;IntBinaryOperator;)
+java.util.concurrent.ConcurrentHashMap#forEach(long;java.util.function.BiConsumer<? super K,? super V>;)
+java.util.concurrent.ConcurrentHashMap#forEach(long;java.util.function.BiFunction<? super K,? super V,? extends U>;java.util.function.Consumer<? super U>;)
+java.util.concurrent.ConcurrentHashMap#search(long;java.util.function.BiFunction<? super K,? super V,? extends U>;)
+java.util.concurrent.ConcurrentHashMap#reduce(long;java.util.function.BiFunction<? super K,? super V,? extends U>;java.util.function.BiFunction<? super U,? super U,? extends U>;)
+java.util.concurrent.ConcurrentHashMap#reduceToDouble(long;java.util.function.ToDoubleBiFunction<? super K,? super V>;double;java.util.function.DoubleBinaryOperator;)
+java.util.concurrent.ConcurrentHashMap#reduceToLong(long;java.util.function.ToLongBiFunction<? super K,? super V>;long;java.util.function.LongBinaryOperator;)
+java.util.concurrent.ConcurrentHashMap#reduceToInt(long;java.util.function.ToIntBiFunction<? super K,? super V>;int;java.util.function.IntBinaryOperator;)
+java.util.concurrent.ConcurrentHashMap#forEachKey(long;java.util.function.Consumer<? super K>;)
+java.util.concurrent.ConcurrentHashMap#forEachKey(long;java.util.function.Function<? super K,? extends U>;java.util.function.Consumer<? super U>;)
+java.util.concurrent.ConcurrentHashMap#searchKeys(long;java.util.function.Function<? super K,? extends U>;)
+java.util.concurrent.ConcurrentHashMap#reduceKeys(long;java.util.function.BiFunction<? super K,? super K,? extends K>;)
+java.util.concurrent.ConcurrentHashMap#reduceKeys(long;java.util.function.Function<? super K,? extends U>;java.util.function.BiFunction<? super U,? super U,? extends U>;)
+java.util.concurrent.ConcurrentHashMap#reduceKeysToDouble(long;java.util.function.ToDoubleFunction<? super K>;double;java.util.function.DoubleBinaryOperator;)
+java.util.concurrent.ConcurrentHashMap#reduceKeysToLong(long;java.util.function.ToLongFunction<? super K>;long;java.util.function.LongBinaryOperator;)
+java.util.concurrent.ConcurrentHashMap#reduceKeysToInt(long;java.util.function.ToIntFunction<? super K>;int;java.util.function.IntBinaryOperator;)
+java.util.concurrent.ConcurrentHashMap#forEachValue(long;java.util.function.Consumer<? super V>;)
+java.util.concurrent.ConcurrentHashMap#forEachValue(long;java.util.function.Function<? super V,? extends U>;java.util.function.Consumer<? super U>;)
+java.util.concurrent.ConcurrentHashMap#searchValues(long;java.util.function.Function<? super V,? extends U>;)
+java.util.concurrent.ConcurrentHashMap#reduceValues(long;java.util.function.BiFunction<? super V,? super V,? extends V>;)
+java.util.concurrent.ConcurrentHashMap#reduceValues(long;java.util.function.Function<? super V,? extends U>;java.util.function.BiFunction<? super U,? super U,? extends U>;)
+java.util.concurrent.ConcurrentHashMap#reduceValuesToDouble(long;java.util.function.ToDoubleFunction<? super V>;double;java.util.function.DoubleBinaryOperator;)
+java.util.concurrent.ConcurrentHashMap#reduceValuesToLong(long;java.util.function.ToLongFunction<? super V>;long;java.util.function.LongBinaryOperator;)
+java.util.concurrent.ConcurrentHashMap#reduceValuesToInt(long;java.util.function.ToIntFunction<? super V>;int;java.util.function.IntBinaryOperator;)
+java.util.concurrent.ConcurrentHashMap#forEachEntry(long;java.util.function.Consumer<? super java.util.Map.Entry<K,V>>;)
+java.util.concurrent.ConcurrentHashMap#forEachEntry(long;java.util.function.Function<java.util.Map.Entry<K,V>,? extends U>;java.util.function.Consumer<? super U>;)
+java.util.concurrent.ConcurrentHashMap#searchEntries(long;java.util.function.Function<java.util.Map.Entry<K,V>,? extends U>;)
+java.util.concurrent.ConcurrentHashMap#reduceEntries(long;java.util.function.BiFunction<java.util.Map.Entry<K,V>,java.util.Map.Entry<K,V>,? extends java.util.Map.Entry<K,V>>;)
+java.util.concurrent.ConcurrentHashMap#reduceEntries(long;java.util.function.Function<java.util.Map.Entry<K,V>,? extends U>;java.util.function.BiFunction<? super U,? super U,? extends U>;)
+java.util.concurrent.ConcurrentHashMap#reduceEntriesToDouble(long;java.util.function.ToDoubleFunction<java.util.Map.Entry<K,V>>;double;java.util.function.DoubleBinaryOperator;)
+java.util.concurrent.ConcurrentHashMap#reduceEntriesToLong(long;java.util.function.ToLongFunction<java.util.Map.Entry<K,V>>;long;java.util.function.LongBinaryOperator;)
+java.util.concurrent.ConcurrentHashMap#reduceEntriesToInt(long;java.util.function.ToIntFunction<java.util.Map.Entry<K,V>>;int;java.util.function.IntBinaryOperator;)
 java.util.concurrent.ConcurrentHashMap.KeySetView
 java.util.concurrent.ThreadLocalRandom#ints(long;)
 java.util.concurrent.ThreadLocalRandom#ints()
@@ -621,11 +621,11 @@ java.util.concurrent.LinkedTransferQueue#spliterator()
 java.util.concurrent.CopyOnWriteArrayList#spliterator()
 java.util.concurrent.ConcurrentLinkedDeque#spliterator()
 java.util.concurrent.ConcurrentLinkedQueue#spliterator()
-java.util.concurrent.ConcurrentSkipListMap#getOrDefault(Object;V;)
-java.util.concurrent.ConcurrentSkipListMap#computeIfAbsent(K;Function<? super K,? extends V>;)
-java.util.concurrent.ConcurrentSkipListMap#computeIfPresent(K;BiFunction<? super K,? super V,? extends V>;)
-java.util.concurrent.ConcurrentSkipListMap#compute(K;BiFunction<? super K,? super V,? extends V>;)
-java.util.concurrent.ConcurrentSkipListMap#merge(K;V;BiFunction<? super V,? super V,? extends V>;)
+java.util.concurrent.ConcurrentSkipListMap#getOrDefault(java.lang.Object;V;)
+java.util.concurrent.ConcurrentSkipListMap#computeIfAbsent(K;java.util.function.Function<? super K,? extends V>;)
+java.util.concurrent.ConcurrentSkipListMap#computeIfPresent(K;java.util.function.BiFunction<? super K,? super V,? extends V>;)
+java.util.concurrent.ConcurrentSkipListMap#compute(K;java.util.function.BiFunction<? super K,? super V,? extends V>;)
+java.util.concurrent.ConcurrentSkipListMap#merge(K;V;java.util.function.BiFunction<? super V,? super V,? extends V>;)
 java.util.concurrent.ConcurrentSkipListSet#spliterator()
 java.util.concurrent.PriorityBlockingQueue#spliterator()
 java.util.Arrays#parallelSort(byte[];)
@@ -644,24 +644,24 @@ java.util.Arrays#parallelSort(double[];)
 java.util.Arrays#parallelSort(double[];int;int;)
 java.util.Arrays#parallelSort(T[];)
 java.util.Arrays#parallelSort(T[];int;int;)
-java.util.Arrays#parallelSort(T[];Comparator<? super T>;)
-java.util.Arrays#parallelSort(T[];int;int;Comparator<? super T>;)
-java.util.Arrays#parallelPrefix(T[];BinaryOperator<T>;)
-java.util.Arrays#parallelPrefix(T[];int;int;BinaryOperator<T>;)
-java.util.Arrays#parallelPrefix(long[];LongBinaryOperator;)
-java.util.Arrays#parallelPrefix(long[];int;int;LongBinaryOperator;)
-java.util.Arrays#parallelPrefix(double[];DoubleBinaryOperator;)
-java.util.Arrays#parallelPrefix(double[];int;int;DoubleBinaryOperator;)
-java.util.Arrays#parallelPrefix(int[];IntBinaryOperator;)
-java.util.Arrays#parallelPrefix(int[];int;int;IntBinaryOperator;)
-java.util.Arrays#setAll(T[];IntFunction<? extends T>;)
-java.util.Arrays#parallelSetAll(T[];IntFunction<? extends T>;)
-java.util.Arrays#setAll(int[];IntUnaryOperator;)
-java.util.Arrays#parallelSetAll(int[];IntUnaryOperator;)
-java.util.Arrays#setAll(long[];IntToLongFunction;)
-java.util.Arrays#parallelSetAll(long[];IntToLongFunction;)
-java.util.Arrays#setAll(double[];IntToDoubleFunction;)
-java.util.Arrays#parallelSetAll(double[];IntToDoubleFunction;)
+java.util.Arrays#parallelSort(T[];java.util.Comparator<? super T>;)
+java.util.Arrays#parallelSort(T[];int;int;java.util.Comparator<? super T>;)
+java.util.Arrays#parallelPrefix(T[];java.util.function.BinaryOperator<T>;)
+java.util.Arrays#parallelPrefix(T[];int;int;java.util.function.BinaryOperator<T>;)
+java.util.Arrays#parallelPrefix(long[];java.util.function.LongBinaryOperator;)
+java.util.Arrays#parallelPrefix(long[];int;int;java.util.function.LongBinaryOperator;)
+java.util.Arrays#parallelPrefix(double[];java.util.function.DoubleBinaryOperator;)
+java.util.Arrays#parallelPrefix(double[];int;int;java.util.function.DoubleBinaryOperator;)
+java.util.Arrays#parallelPrefix(int[];java.util.function.IntBinaryOperator;)
+java.util.Arrays#parallelPrefix(int[];int;int;java.util.function.IntBinaryOperator;)
+java.util.Arrays#setAll(T[];java.util.function.IntFunction<? extends T>;)
+java.util.Arrays#parallelSetAll(T[];java.util.function.IntFunction<? extends T>;)
+java.util.Arrays#setAll(int[];java.util.function.IntUnaryOperator;)
+java.util.Arrays#parallelSetAll(int[];java.util.function.IntUnaryOperator;)
+java.util.Arrays#setAll(long[];java.util.function.IntToLongFunction;)
+java.util.Arrays#parallelSetAll(long[];java.util.function.IntToLongFunction;)
+java.util.Arrays#setAll(double[];java.util.function.IntToDoubleFunction;)
+java.util.Arrays#parallelSetAll(double[];java.util.function.IntToDoubleFunction;)
 java.util.Arrays#spliterator(T[];)
 java.util.Arrays#spliterator(T[];int;int;)
 java.util.Arrays#spliterator(int[];)
@@ -686,12 +686,12 @@ java.util.Locale#hasExtensions()
 java.util.Locale#stripExtensions()
 java.util.Locale.FilteringMode
 java.util.Locale.LanguageRange
-java.util.Locale#filter(List<LanguageRange>;Collection<Locale>;java.util.Locale.FilteringMode;)
-java.util.Locale#filter(List<LanguageRange>;Collection<Locale>;)
-java.util.Locale#filterTags(List<LanguageRange>;Collection<String>;java.util.Locale.FilteringMode;)
-java.util.Locale#filterTags(List<LanguageRange>;Collection<String>;)
-java.util.Locale#lookup(List<LanguageRange>;Collection<Locale>;)
-java.util.Locale#lookupTag(List<LanguageRange>;Collection<String>;)
+java.util.Locale#filter(java.util.List<java.util.Locale.LanguageRange>;java.util.Collection<java.util.Locale>;java.util.Locale.FilteringMode;)
+java.util.Locale#filter(java.util.List<java.util.Locale.LanguageRange>;java.util.Collection<java.util.Locale>;)
+java.util.Locale#filterTags(java.util.List<java.util.Locale.LanguageRange>;java.util.Collection<java.lang.String>;java.util.Locale.FilteringMode;)
+java.util.Locale#filterTags(java.util.List<java.util.Locale.LanguageRange>;java.util.Collection<java.lang.String>;)
+java.util.Locale#lookup(java.util.List<java.util.Locale.LanguageRange>;java.util.Collection<java.util.Locale>;)
+java.util.Locale#lookupTag(java.util.List<java.util.Locale.LanguageRange>;java.util.Collection<java.lang.String>;)
 java.util.Random#ints(long;)
 java.util.Random#ints()
 java.util.Random#ints(long;int;int;)
@@ -706,10 +706,10 @@ java.util.Random#doubles(long;double;double;)
 java.util.Random#doubles(double;double;)
 java.util.Vector#spliterator()
 java.util.HashSet#spliterator()
-java.util.Objects#isNull(Object;)
-java.util.Objects#nonNull(Object;)
-java.util.Objects#requireNonNull(T;Supplier<String>;)
-java.util.TimSort#sort(T[];int;int;Comparator<? super T>;T[];int;int;)
+java.util.Objects#isNull(java.lang.Object;)
+java.util.Objects#nonNull(java.lang.Object;)
+java.util.Objects#requireNonNull(T;java.util.function.Supplier<java.lang.String>;)
+java.util.TimSort#sort(T[];int;int;java.util.Comparator<? super T>;T[];int;int;)
 java.util.TreeSet#spliterator()
 java.util.Calendar#NARROW_FORMAT
 java.util.Calendar#NARROW_STANDALONE
@@ -721,42 +721,42 @@ java.util.Calendar.Builder
 java.util.Calendar#getAvailableCalendarTypes()
 java.util.Calendar#getCalendarType()
 java.util.Calendar#toInstant()
-java.util.Iterator#forEachRemaining(Consumer<? super E>;)
+java.util.Iterator#forEachRemaining(java.util.function.Consumer<? super E>;)
 java.util.Optional
-java.util.TimeZone#getTimeZone(ZoneId;)
+java.util.TimeZone#getTimeZone(java.time.ZoneId;)
 java.util.TimeZone#toZoneId()
 java.util.Tripwire
 java.util.ArrayList#spliterator()
 java.util.SortedSet#spliterator()
 java.util.ArrayDeque#spliterator()
-java.util.Collection#removeIf(Predicate<? super E>;)
+java.util.Collection#removeIf(java.util.function.Predicate<? super E>;)
 java.util.Collection#spliterator()
 java.util.Collection#stream()
 java.util.Collection#parallelStream()
 java.util.Comparator#reversed()
 java.util.Comparator#thenComparing(java.util.Comparator<? super T>;)
-java.util.Comparator#thenComparing(Function<? super T,? extends U>;java.util.Comparator<? super U>;)
-java.util.Comparator#thenComparing(Function<? super T,? extends U>;)
-java.util.Comparator#thenComparingInt(ToIntFunction<? super T>;)
-java.util.Comparator#thenComparingLong(ToLongFunction<? super T>;)
-java.util.Comparator#thenComparingDouble(ToDoubleFunction<? super T>;)
+java.util.Comparator#thenComparing(java.util.function.Function<? super T,? extends U>;java.util.Comparator<? super U>;)
+java.util.Comparator#thenComparing(java.util.function.Function<? super T,? extends U>;)
+java.util.Comparator#thenComparingInt(java.util.function.ToIntFunction<? super T>;)
+java.util.Comparator#thenComparingLong(java.util.function.ToLongFunction<? super T>;)
+java.util.Comparator#thenComparingDouble(java.util.function.ToDoubleFunction<? super T>;)
 java.util.Comparator#reverseOrder()
 java.util.Comparator#naturalOrder()
 java.util.Comparator#nullsFirst(java.util.Comparator<? super T>;)
 java.util.Comparator#nullsLast(java.util.Comparator<? super T>;)
-java.util.Comparator#comparing(Function<? super T,? extends U>;java.util.Comparator<? super U>;)
-java.util.Comparator#comparing(Function<? super T,? extends U>;)
-java.util.Comparator#comparingInt(ToIntFunction<? super T>;)
-java.util.Comparator#comparingLong(ToLongFunction<? super T>;)
-java.util.Comparator#comparingDouble(ToDoubleFunction<? super T>;)
+java.util.Comparator#comparing(java.util.function.Function<? super T,? extends U>;java.util.Comparator<? super U>;)
+java.util.Comparator#comparing(java.util.function.Function<? super T,? extends U>;)
+java.util.Comparator#comparingInt(java.util.function.ToIntFunction<? super T>;)
+java.util.Comparator#comparingLong(java.util.function.ToLongFunction<? super T>;)
+java.util.Comparator#comparingDouble(java.util.function.ToDoubleFunction<? super T>;)
 java.util.LinkedList#spliterator()
-java.util.Collections#unmodifiableNavigableSet(NavigableSet<T>;)
-java.util.Collections#unmodifiableNavigableMap(NavigableMap<K,? extends V>;)
-java.util.Collections#synchronizedNavigableSet(NavigableSet<T>;)
-java.util.Collections#synchronizedNavigableMap(NavigableMap<K,V>;)
-java.util.Collections#checkedQueue(Queue<E>;Class<E>;)
-java.util.Collections#checkedNavigableSet(NavigableSet<E>;Class<E>;)
-java.util.Collections#checkedNavigableMap(NavigableMap<K,V>;Class<K>;Class<V>;)
+java.util.Collections#unmodifiableNavigableSet(java.util.NavigableSet<T>;)
+java.util.Collections#unmodifiableNavigableMap(java.util.NavigableMap<K,? extends V>;)
+java.util.Collections#synchronizedNavigableSet(java.util.NavigableSet<T>;)
+java.util.Collections#synchronizedNavigableMap(java.util.NavigableMap<K,V>;)
+java.util.Collections#checkedQueue(java.util.Queue<E>;java.lang.Class<E>;)
+java.util.Collections#checkedNavigableSet(java.util.NavigableSet<E>;java.lang.Class<E>;)
+java.util.Collections#checkedNavigableMap(java.util.NavigableMap<K,V>;java.lang.Class<K>;java.lang.Class<V>;)
 java.util.Collections#emptySortedSet()
 java.util.Collections#emptyNavigableSet()
 java.util.Collections#emptySortedMap()
@@ -775,15 +775,15 @@ java.util.Spliterators.AbstractDoubleSpliterator
 java.util.Spliterators
 java.util.StringJoiner
 java.util.LinkedHashSet#spliterator()
-java.util.PriorityQueue#PriorityQueue(Comparator<? super E>;)
+java.util.PriorityQueue#PriorityQueue(java.util.Comparator<? super E>;)
 java.util.PriorityQueue#spliterator()
 java.util.OptionalDouble
 java.util.ResourceBundle#getBaseBundleName()
 java.util.SplittableRandom
-java.util.ComparableTimSort#sort(Object[];int;int;Object[];int;int;)
+java.util.ComparableTimSort#sort(java.lang.Object[];int;int;java.lang.Object[];int;int;)
 java.util.GregorianCalendar#getCalendarType()
 java.util.GregorianCalendar#toZonedDateTime()
-java.util.GregorianCalendar#from(ZonedDateTime;)
+java.util.GregorianCalendar#from(java.time.ZonedDateTime;)
 java.util.PrimitiveIterator.OfInt
 java.util.PrimitiveIterator.OfLong
 java.util.PrimitiveIterator.OfDouble
@@ -792,56 +792,56 @@ java.util.ArrayPrefixHelpers
 java.util.IntSummaryStatistics
 java.util.LongSummaryStatistics
 java.util.DoubleSummaryStatistics
-java.security.cert.X509CRL#verify(PublicKey;Provider;)
-java.security.cert.Certificate#verify(PublicKey;Provider;)
+java.security.cert.X509CRL#verify(java.security.PublicKey;java.security.Provider;)
+java.security.cert.Certificate#verify(java.security.PublicKey;java.security.Provider;)
 java.security.cert.CertPathBuilder#getRevocationChecker()
 java.security.cert.CertPathChecker
-java.security.cert.X509Certificate#verify(PublicKey;Provider;)
+java.security.cert.X509Certificate#verify(java.security.PublicKey;java.security.Provider;)
 java.security.cert.CertPathValidator#getRevocationChecker()
 java.security.cert.CertPathBuilderSpi#engineGetRevocationChecker()
 java.security.cert.CertPathValidatorSpi#engineGetRevocationChecker()
 java.security.cert.PKIXRevocationChecker
-java.security.KeyStore.PasswordProtection#PasswordProtection(char[];String;AlgorithmParameterSpec;)
+java.security.KeyStore.PasswordProtection#PasswordProtection(char[];java.lang.String;java.security.spec.AlgorithmParameterSpec;)
 java.security.KeyStore.PasswordProtection#getProtectionAlgorithm()
 java.security.KeyStore.PasswordProtection#getProtectionParameters()
 java.security.KeyStore.Entry#getAttributes()
 java.security.KeyStore.Entry.Attribute
-java.security.KeyStore.PrivateKeyEntry#PrivateKeyEntry(PrivateKey;Certificate[];Set<Attribute>;)
+java.security.KeyStore.PrivateKeyEntry#PrivateKeyEntry(java.security.PrivateKey;java.security.cert.Certificate[];java.util.Set<java.security.KeyStore.Entry.Attribute>;)
 java.security.KeyStore.PrivateKeyEntry#getAttributes()
-java.security.KeyStore.SecretKeyEntry#SecretKeyEntry(SecretKey;Set<Attribute>;)
+java.security.KeyStore.SecretKeyEntry#SecretKeyEntry(javax.crypto.SecretKey;java.util.Set<java.security.KeyStore.Entry.Attribute>;)
 java.security.KeyStore.SecretKeyEntry#getAttributes()
-java.security.KeyStore.TrustedCertificateEntry#TrustedCertificateEntry(Certificate;Set<Attribute>;)
+java.security.KeyStore.TrustedCertificateEntry#TrustedCertificateEntry(java.security.cert.Certificate;java.util.Set<java.security.KeyStore.Entry.Attribute>;)
 java.security.KeyStore.TrustedCertificateEntry#getAttributes()
-java.security.Provider#putIfAbsent(Object;Object;)
-java.security.Provider#remove(Object;Object;)
-java.security.Provider#replace(Object;Object;Object;)
-java.security.Provider#replace(Object;Object;)
-java.security.Provider#replaceAll(BiFunction<? super Object,? super Object,? extends Object>;)
-java.security.Provider#compute(Object;BiFunction<? super Object,? super Object,? extends Object>;)
-java.security.Provider#computeIfAbsent(Object;Function<? super Object,? extends Object>;)
-java.security.Provider#computeIfPresent(Object;BiFunction<? super Object,? super Object,? extends Object>;)
-java.security.Provider#merge(Object;Object;BiFunction<? super Object,? super Object,? extends Object>;)
-java.security.Provider#getOrDefault(Object;Object;)
-java.security.Provider#forEach(BiConsumer<? super Object,? super Object>;)
-java.security.Principal#implies(Subject;)
+java.security.Provider#putIfAbsent(java.lang.Object;java.lang.Object;)
+java.security.Provider#remove(java.lang.Object;java.lang.Object;)
+java.security.Provider#replace(java.lang.Object;java.lang.Object;java.lang.Object;)
+java.security.Provider#replace(java.lang.Object;java.lang.Object;)
+java.security.Provider#replaceAll(java.util.function.BiFunction<? super java.lang.Object,? super java.lang.Object,? extends java.lang.Object>;)
+java.security.Provider#compute(java.lang.Object;java.util.function.BiFunction<? super java.lang.Object,? super java.lang.Object,? extends java.lang.Object>;)
+java.security.Provider#computeIfAbsent(java.lang.Object;java.util.function.Function<? super java.lang.Object,? extends java.lang.Object>;)
+java.security.Provider#computeIfPresent(java.lang.Object;java.util.function.BiFunction<? super java.lang.Object,? super java.lang.Object,? extends java.lang.Object>;)
+java.security.Provider#merge(java.lang.Object;java.lang.Object;java.util.function.BiFunction<? super java.lang.Object,? super java.lang.Object,? extends java.lang.Object>;)
+java.security.Provider#getOrDefault(java.lang.Object;java.lang.Object;)
+java.security.Provider#forEach(java.util.function.BiConsumer<? super java.lang.Object,? super java.lang.Object>;)
+java.security.Principal#implies(javax.security.auth.Subject;)
 java.security.SecureRandom#getInstanceStrong()
 java.security.PKCS12Attribute
-java.security.AccessController#doPrivileged(PrivilegedAction<T>;AccessControlContext;Permission[];)
-java.security.AccessController#doPrivilegedWithCombiner(PrivilegedAction<T>;AccessControlContext;Permission[];)
-java.security.AccessController#doPrivileged(PrivilegedExceptionAction<T>;AccessControlContext;Permission[];)
-java.security.AccessController#doPrivilegedWithCombiner(PrivilegedExceptionAction<T>;AccessControlContext;Permission[];)
+java.security.AccessController#doPrivileged(java.security.PrivilegedAction<T>;java.security.AccessControlContext;java.security.Permission[];)
+java.security.AccessController#doPrivilegedWithCombiner(java.security.PrivilegedAction<T>;java.security.AccessControlContext;java.security.Permission[];)
+java.security.AccessController#doPrivileged(java.security.PrivilegedExceptionAction<T>;java.security.AccessControlContext;java.security.Permission[];)
+java.security.AccessController#doPrivilegedWithCombiner(java.security.PrivilegedExceptionAction<T>;java.security.AccessControlContext;java.security.Permission[];)
 java.security.DomainLoadStoreParameter
 javax.xml.validation.SchemaFactoryConfigurationError
 javax.lang.model.type.TypeKind#INTERSECTION
-javax.lang.model.type.TypeVisitor#visitIntersection(IntersectionType;P;)
+javax.lang.model.type.TypeVisitor#visitIntersection(javax.lang.model.type.IntersectionType;P;)
 javax.lang.model.type.ExecutableType#getReceiverType()
 javax.lang.model.type.IntersectionType
-javax.lang.model.util.Elements#isFunctionalInterface(TypeElement;)
+javax.lang.model.util.Elements#isFunctionalInterface(javax.lang.model.element.TypeElement;)
 javax.lang.model.util.ElementScanner8
 javax.lang.model.util.TypeKindVisitor8
 javax.lang.model.util.SimpleTypeVisitor8
 javax.lang.model.util.ElementKindVisitor8
-javax.lang.model.util.AbstractTypeVisitor6#visitIntersection(IntersectionType;P;)
+javax.lang.model.util.AbstractTypeVisitor6#visitIntersection(javax.lang.model.type.IntersectionType;P;)
 javax.lang.model.util.AbstractTypeVisitor8
 javax.lang.model.util.SimpleElementVisitor8
 javax.lang.model.util.AbstractElementVisitor8
@@ -853,9 +853,9 @@ javax.lang.model.element.ExecutableElement#isDefault()
 javax.lang.model.SourceVersion#RELEASE_8
 javax.lang.model.AnnotatedConstruct
 javax.tools.StandardLocation#NATIVE_HEADER_OUTPUT
-javax.security.auth.kerberos.KeyTab#getUnboundInstance(File;)
-javax.security.auth.kerberos.KeyTab#getInstance(KerberosPrincipal;File;)
+javax.security.auth.kerberos.KeyTab#getUnboundInstance(java.io.File;)
+javax.security.auth.kerberos.KeyTab#getInstance(javax.security.auth.kerberos.KerberosPrincipal;java.io.File;)
 javax.security.auth.kerberos.KeyTab#getUnboundInstance()
-javax.security.auth.kerberos.KeyTab#getInstance(KerberosPrincipal;)
+javax.security.auth.kerberos.KeyTab#getInstance(javax.security.auth.kerberos.KerberosPrincipal;)
 javax.security.auth.kerberos.KeyTab#getPrincipal()
 javax.security.auth.kerberos.KeyTab#isBound()
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java
index 8414b7fdd0fd..18b96564cc61 100644
--- a/java/java-tests/testSrc/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java
@@ -23,17 +23,7 @@ package com.intellij.codeInspection;
 import com.intellij.JavaTestUtil;
 import com.intellij.codeInspection.ex.LocalInspectionToolWrapper;
 import com.intellij.codeInspection.java15api.Java15APIUsageInspection;
-import com.intellij.openapi.roots.ContentIterator;
-import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.vfs.JarFileSystem;
-import com.intellij.openapi.vfs.VfsUtilCore;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.VirtualFileFilter;
 import com.intellij.pom.java.LanguageLevel;
-import com.intellij.psi.*;
-import com.intellij.psi.javadoc.PsiDocComment;
-import com.intellij.psi.javadoc.PsiDocTag;
-import com.intellij.psi.javadoc.PsiDocTagValue;
 import com.intellij.testFramework.IdeaTestUtil;
 import com.intellij.testFramework.InspectionTestCase;
 
@@ -70,9 +60,10 @@ public class JavaAPIUsagesInspectionTest extends InspectionTestCase {
     });
   }
 
-  @SuppressWarnings("UnusedDeclaration")
-  public void _testCollectSinceApiUsages() {
-    final String version = "1.7";
+  //generate apiXXX.txt
+  /*
+  public void testCollectSinceApiUsages() {
+    final String version = "1.8";
     final ContentIterator contentIterator = new ContentIterator() {
       @Override
       public boolean processFile(VirtualFile fileOrDir) {
@@ -102,15 +93,15 @@ public class JavaAPIUsagesInspectionTest extends InspectionTestCase {
         return true;
       }
     };
-    final VirtualFile srcFile = JarFileSystem.getInstance().findFileByPath("c:/program files/java/jdk1.6.0_12/src.zip!/");
+    final VirtualFile srcFile = JarFileSystem.getInstance().findFileByPath("c:/tools/jdk8/src.zip!/");
     assert srcFile != null;
     VfsUtilCore.iterateChildrenRecursively(srcFile, VirtualFileFilter.ALL, contentIterator);
   }
-/*
+
   @Override
   protected void setUpJdk() {
     Module[] modules = ModuleManager.getInstance(myProject).getModules();
-    final Sdk sdk = JavaSdk.getInstance().createJdk("1.7", "c:/program files (x86)/java/jdk1.7.0_09/", false);
+    final Sdk sdk = JavaSdk.getInstance().createJdk("1.8", "c:/tools/jdk8/", false);
     for (Module module : modules) {
       ModuleRootModificationUtil.setModuleSdk(module, sdk);
     }