From 804e3769ff3c69f5070eda94cb1c2b5dfd0984f2 Mon Sep 17 00:00:00 2001 From: Alex Tkachman Date: Wed, 26 Sep 2012 19:19:44 +0200 Subject: [PATCH] remove some unnecessary !! from stdlib --- jdk-annotations/java/util/concurrent/annotations.xml | 3 +++ libraries/stdlib/src/kotlin/concurrent/Thread.kt | 6 +++--- libraries/stdlib/src/kotlin/nullable/Nullables.kt | 2 +- libraries/stdlib/src/kotlin/support/AbstractIterator.kt | 2 +- libraries/stdlib/src/kotlin/template/Templates.kt | 2 +- libraries/stdlib/test/CollectionTest.kt | 2 +- libraries/stdlib/test/IoTest.kt | 4 ++-- libraries/stdlib/test/concurrent/ThreadTest.kt | 4 ++-- libraries/stdlib/test/regressions/Kt2495Test.kt | 2 +- libraries/stdlib/test/regressions/kt1202.kt | 2 +- libraries/stdlib/test/template/LocaleTemplateTest.kt | 4 ++-- 11 files changed, 18 insertions(+), 15 deletions(-) diff --git a/jdk-annotations/java/util/concurrent/annotations.xml b/jdk-annotations/java/util/concurrent/annotations.xml index eecdf0a216c..2771242f49d 100644 --- a/jdk-annotations/java/util/concurrent/annotations.xml +++ b/jdk-annotations/java/util/concurrent/annotations.xml @@ -100,6 +100,9 @@ + + + diff --git a/libraries/stdlib/src/kotlin/concurrent/Thread.kt b/libraries/stdlib/src/kotlin/concurrent/Thread.kt index 6d2bcb95103..5441bf74759 100644 --- a/libraries/stdlib/src/kotlin/concurrent/Thread.kt +++ b/libraries/stdlib/src/kotlin/concurrent/Thread.kt @@ -6,10 +6,10 @@ import java.util.concurrent.Future import java.util.concurrent.Callable inline val currentThread : Thread - get() = Thread.currentThread()!! + get() = Thread.currentThread() inline var Thread.name : String - get() = getName()!! + get() = getName() set(name: String) { setName(name) } inline var Thread.daemon : Boolean @@ -66,7 +66,7 @@ public inline fun Executor.invoke(action: ()->Unit) { */ public inline fun ExecutorService.submit(action: ()->T):Future { val c:Callable = callable(action) - return submit(c)!!; + return submit(c); } /** diff --git a/libraries/stdlib/src/kotlin/nullable/Nullables.kt b/libraries/stdlib/src/kotlin/nullable/Nullables.kt index ee1a3ba11a0..9a1ef16a495 100644 --- a/libraries/stdlib/src/kotlin/nullable/Nullables.kt +++ b/libraries/stdlib/src/kotlin/nullable/Nullables.kt @@ -129,7 +129,7 @@ public inline fun T?.makeString(separator: String = ", ", prefix: String = " buffer.append(this) } buffer.append(postfix) - return buffer.toString()!! + return buffer.toString() } diff --git a/libraries/stdlib/src/kotlin/support/AbstractIterator.kt b/libraries/stdlib/src/kotlin/support/AbstractIterator.kt index 4530e41c55a..83d8510954d 100644 --- a/libraries/stdlib/src/kotlin/support/AbstractIterator.kt +++ b/libraries/stdlib/src/kotlin/support/AbstractIterator.kt @@ -108,7 +108,7 @@ class CompositeIterator(vararg iterators: Iterator): AbstractIterator() val iter = currentIter if (iter != null) { if (iter.hasNext()) { - setNext(iter.next()!!) + setNext(iter.next()) return } else { currentIter = null diff --git a/libraries/stdlib/src/kotlin/template/Templates.kt b/libraries/stdlib/src/kotlin/template/Templates.kt index c97e66e9002..6126ecc604f 100644 --- a/libraries/stdlib/src/kotlin/template/Templates.kt +++ b/libraries/stdlib/src/kotlin/template/Templates.kt @@ -116,7 +116,7 @@ public open class ToStringFormatter : Formatter { } } -public val defaultLocale : Locale = Locale.getDefault()!! +public val defaultLocale : Locale = Locale.getDefault() /** * Formats values using a given [[Locale]] for internationalisation diff --git a/libraries/stdlib/test/CollectionTest.kt b/libraries/stdlib/test/CollectionTest.kt index b911275c423..bee7d40570a 100644 --- a/libraries/stdlib/test/CollectionTest.kt +++ b/libraries/stdlib/test/CollectionTest.kt @@ -409,7 +409,7 @@ class CollectionTest { private val collection = collection override fun iterator(): Iterator { - return collection.iterator()!! + return collection.iterator() } } } diff --git a/libraries/stdlib/test/IoTest.kt b/libraries/stdlib/test/IoTest.kt index 98591f67527..60ab5a51180 100644 --- a/libraries/stdlib/test/IoTest.kt +++ b/libraries/stdlib/test/IoTest.kt @@ -73,7 +73,7 @@ class IoTest() : TestCase() { } fun testListFiles() { - val dir = File.createTempFile("temp", System.nanoTime().toString())!! + val dir = File.createTempFile("temp", System.nanoTime().toString()) dir.delete() dir.mkdir() @@ -81,7 +81,7 @@ class IoTest() : TestCase() { File.createTempFile("temp", "2.java", dir) File.createTempFile("temp", "3.kt", dir) - val result = dir.listFiles { it.getName()!!.endsWith(".kt") } + val result = dir.listFiles { it.getName().endsWith(".kt") } assertNotNull(result) assertEquals(result!!.size, 2) diff --git a/libraries/stdlib/test/concurrent/ThreadTest.kt b/libraries/stdlib/test/concurrent/ThreadTest.kt index a0530e8f4a4..20fa607f72a 100644 --- a/libraries/stdlib/test/concurrent/ThreadTest.kt +++ b/libraries/stdlib/test/concurrent/ThreadTest.kt @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit.* class ThreadTest { test fun scheduledTask() { - val pool = Executors.newFixedThreadPool(1)!! + val pool = Executors.newFixedThreadPool(1) val countDown = CountDownLatch(1) pool { countDown.countDown() @@ -21,7 +21,7 @@ class ThreadTest { test fun callableInvoke() { - val pool = Executors.newFixedThreadPool(1)!! + val pool = Executors.newFixedThreadPool(1) val future = pool { "Hello" } diff --git a/libraries/stdlib/test/regressions/Kt2495Test.kt b/libraries/stdlib/test/regressions/Kt2495Test.kt index 25da409eb36..4df76d699da 100644 --- a/libraries/stdlib/test/regressions/Kt2495Test.kt +++ b/libraries/stdlib/test/regressions/Kt2495Test.kt @@ -14,7 +14,7 @@ fun f(xs: Iterator): Int { class Kt2495Test { test fun duplicateIteratorsBug() { val list = arrayList(1, 2, 3) - val result = f(list.iterator()!!) + val result = f(list.iterator()) assertEquals(6, result) } } \ No newline at end of file diff --git a/libraries/stdlib/test/regressions/kt1202.kt b/libraries/stdlib/test/regressions/kt1202.kt index e7c1101c872..40b810791e2 100644 --- a/libraries/stdlib/test/regressions/kt1202.kt +++ b/libraries/stdlib/test/regressions/kt1202.kt @@ -99,7 +99,7 @@ fun parseAtomic(tokens : Deque) : ParseResult { else Failure("Expecting ')'") } - is Number -> Success(Num(Integer.parseInt((token as Token).text)!!)) + is Number -> Success(Num(Integer.parseInt((token as Token).text))) else -> Failure("Unexpected EOF") } } diff --git a/libraries/stdlib/test/template/LocaleTemplateTest.kt b/libraries/stdlib/test/template/LocaleTemplateTest.kt index 9761e770575..fe995b1c363 100644 --- a/libraries/stdlib/test/template/LocaleTemplateTest.kt +++ b/libraries/stdlib/test/template/LocaleTemplateTest.kt @@ -13,11 +13,11 @@ class LocaleTemplateTest : TestCase() { } fun testFrance() : Unit { - format(LocaleFormatter(Locale.FRANCE!!)) + format(LocaleFormatter(Locale.FRANCE)) } fun testGermany() : Unit { - format(LocaleFormatter(Locale.GERMANY!!)) + format(LocaleFormatter(Locale.GERMANY)) } fun format(formatter: LocaleFormatter): Unit {