From 1b37f13a34f920d2af91c6ccfc94b226cb035cf1 Mon Sep 17 00:00:00 2001
From: Alex Tkachman <alex.tkachman@gmail.com>
Date: Thu, 27 Sep 2012 06:43:13 +0200
Subject: [PATCH] annotations for java.util.ServiceLoader remove some
 unnecessary !! from stdlib

---
 jdk-annotations/java/util/annotations.xml   | 22 +++++++++++++++++++++
 libraries/stdlib/src/kotlin/test/TestJVM.kt |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/jdk-annotations/java/util/annotations.xml b/jdk-annotations/java/util/annotations.xml
index b3c1bcfbff6..faed13aea7b 100644
--- a/jdk-annotations/java/util/annotations.xml
+++ b/jdk-annotations/java/util/annotations.xml
@@ -1708,4 +1708,26 @@
   <item name='java.util.Locale boolean equals(java.lang.Object) 0'>
     <annotation name='org.jetbrains.annotations.Nullable'/>
   </item>
+  <item name='java.util.ServiceLoader java.util.Iterator&lt;S&gt; iterator()'>
+      <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
+  <!-- java.util.ServiceLoader -->
+  <item name='java.util.ServiceLoader java.util.ServiceLoader&lt;S&gt; load(java.lang.Class&lt;S&gt;, java.lang.ClassLoader)'>
+      <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
+  <item name='java.util.ServiceLoader java.util.ServiceLoader&lt;S&gt; load(java.lang.Class&lt;S&gt;, java.lang.ClassLoader) 0'>
+      <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
+  <item name='java.util.ServiceLoader java.util.ServiceLoader&lt;S&gt; load(java.lang.Class&lt;S&gt;)'>
+      <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
+  <item name='java.util.ServiceLoader java.util.ServiceLoader&lt;S&gt; load(java.lang.Class&lt;S&gt;) 0'>
+      <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
+  <item name='java.util.ServiceLoader java.util.ServiceLoader&lt;S&gt; loadInstalled(java.lang.Class&lt;S&gt;)'>
+      <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
+  <item name='java.util.ServiceLoader java.util.ServiceLoader&lt;S&gt; loadInstalled(java.lang.Class&lt;S&gt;) 0'>
+      <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
 </root>
diff --git a/libraries/stdlib/src/kotlin/test/TestJVM.kt b/libraries/stdlib/src/kotlin/test/TestJVM.kt
index d305028609e..0d8dbcf5b50 100644
--- a/libraries/stdlib/src/kotlin/test/TestJVM.kt
+++ b/libraries/stdlib/src/kotlin/test/TestJVM.kt
@@ -16,8 +16,8 @@ public var asserter: Asserter
     get() {
         if (_asserter == null) {
             val klass = javaClass<Asserter>()
-            val loader = ServiceLoader.load(klass)!!
-            for (a in loader.iterator()!!) {
+            val loader = ServiceLoader.load(klass)
+            for (a in loader.iterator()) {
                 if (a != null) {
                     _asserter = a
                     break