From 3fd61edcd5bb153572448e08411fec472a61b4b0 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 14 Sep 2012 16:32:47 +0400 Subject: [PATCH] Replaced sure() invocations with '!!' operator in examples code. --- examples/example-vfs/src/FileSystem.kt | 2 +- examples/example-vfs/src/RefreshQueue.kt | 2 +- examples/example-vfs/src/VirtualFile.kt | 4 ++-- .../src/main/java/hello/KotlinHello.kt | 2 +- examples/src/actors/src/Actors.kt | 2 +- examples/src/actors/src/Main.kt | 2 +- examples/src/actors/src/StatCalculator.kt | 2 +- examples/src/actors/src/StockServer.kt | 2 +- .../src/benchmarks/src/lockperf/LockPerf.kt | 2 +- .../src/spectralnorm/SpectralNorm.kt | 2 +- .../benchmarks/src/threadring/ThreadRing.kt | 8 +++---- examples/src/guice-kotlin/src/GuiceDsl.kt | 18 +++++++------- examples/src/guice-kotlin/src/GuiceExample.kt | 2 +- examples/src/luhny/solution.kt | 2 +- examples/src/luhny/test.kt | 24 +++++++++---------- examples/src/nettyserver/src/Main.kt | 2 +- examples/src/nettyserver/src/Netty.kt | 2 +- examples/src/nettyserver/src/Request.kt | 8 +++---- examples/src/nettyserver/src/RestProcessor.kt | 4 ++-- examples/src/swing/SwingBuilder.kt | 10 ++++---- 20 files changed, 51 insertions(+), 51 deletions(-) diff --git a/examples/example-vfs/src/FileSystem.kt b/examples/example-vfs/src/FileSystem.kt index f51edd33b74..1f27aaadca9 100644 --- a/examples/example-vfs/src/FileSystem.kt +++ b/examples/example-vfs/src/FileSystem.kt @@ -36,7 +36,7 @@ public object FileSystem { */ public fun getFileByIoFile(ioFile : File) : VirtualFile { FileSystem.assertCanRead() - return PhysicalVirtualFile(ioFile.getAbsolutePath().sure().toSystemIndependentPath()) + return PhysicalVirtualFile(ioFile.getAbsolutePath()!!.toSystemIndependentPath()) } /** diff --git a/examples/example-vfs/src/RefreshQueue.kt b/examples/example-vfs/src/RefreshQueue.kt index 4fe52a47a3c..d757d285c89 100644 --- a/examples/example-vfs/src/RefreshQueue.kt +++ b/examples/example-vfs/src/RefreshQueue.kt @@ -95,7 +95,7 @@ internal object RefreshQueue { /* Deletes file from file system recursively, notifying listeners */ private fun deleteRecursively(file : VirtualFile) { val fileInfoMaybe : VirtualFileInfo? = FileSystem.fileToInfo[file.path] - val fileInfo = fileInfoMaybe.sure() + val fileInfo = fileInfoMaybe!! fileInfo.children.forEach{ deleteRecursively(it) } FileSystem.notifyEventHappened(VirtualFileDeletedEvent(file)) FileSystem.fileToInfo.remove(file) diff --git a/examples/example-vfs/src/VirtualFile.kt b/examples/example-vfs/src/VirtualFile.kt index 3088cd81dc4..dded4e1d2ef 100644 --- a/examples/example-vfs/src/VirtualFile.kt +++ b/examples/example-vfs/src/VirtualFile.kt @@ -94,7 +94,7 @@ public class PhysicalVirtualFile(path : String) : VirtualFile(path) { get() { FileSystem.assertCanRead() return (ioFile.listFiles() ?: array()). - map{ FileSystem.getFileByIoFile(it.sure()) }?.toList() + map{ FileSystem.getFileByIoFile(it!!) }?.toList() } override public fun openInputStream(): InputStream { @@ -106,7 +106,7 @@ public class PhysicalVirtualFile(path : String) : VirtualFile(path) { } } -private val OS_SEPARATOR = java.io.File.separator.sure() +private val OS_SEPARATOR = java.io.File.separator!! private val VFS_SEPARATOR = "/" private fun String.toSystemDependentPath() : String { diff --git a/examples/maven/mixed-code-hello-world/src/main/java/hello/KotlinHello.kt b/examples/maven/mixed-code-hello-world/src/main/java/hello/KotlinHello.kt index 27a00b5ad1b..2c5eac28b49 100644 --- a/examples/maven/mixed-code-hello-world/src/main/java/hello/KotlinHello.kt +++ b/examples/maven/mixed-code-hello-world/src/main/java/hello/KotlinHello.kt @@ -3,5 +3,5 @@ package hello public val KotlinHelloString : String = "Hello from Kotlin!" public fun getHelloStringFromJava() : String { - return JavaHello.JavaHelloString.sure(); + return JavaHello.JavaHelloString!!; } diff --git a/examples/src/actors/src/Actors.kt b/examples/src/actors/src/Actors.kt index d2327791fbf..b7c5ad69f3a 100644 --- a/examples/src/actors/src/Actors.kt +++ b/examples/src/actors/src/Actors.kt @@ -181,4 +181,4 @@ fun Executor.actor(handler: (Any)->Any?) : Actor = object: Actor(this) { } } -fun singleThreadActor(handler: (Any)->Any?) : Actor = Executors.newSingleThreadExecutor().sure().actor(handler) +fun singleThreadActor(handler: (Any)->Any?) : Actor = Executors.newSingleThreadExecutor()!!.actor(handler) diff --git a/examples/src/actors/src/Main.kt b/examples/src/actors/src/Main.kt index 04def387d69..44ae975a68f 100644 --- a/examples/src/actors/src/Main.kt +++ b/examples/src/actors/src/Main.kt @@ -15,7 +15,7 @@ fun main(args: Array) { println("Stock server started") - val executor = Executors.newFixedThreadPool(4*Runtime.getRuntime().sure().availableProcessors()).sure() + val executor = Executors.newFixedThreadPool(4*Runtime.getRuntime()!!.availableProcessors())!! for(i in 0..numberOfClients) { val client = executor.actor{ message -> diff --git a/examples/src/actors/src/StatCalculator.kt b/examples/src/actors/src/StatCalculator.kt index e0871d7dd3c..ade9ede32f7 100644 --- a/examples/src/actors/src/StatCalculator.kt +++ b/examples/src/actors/src/StatCalculator.kt @@ -5,7 +5,7 @@ import org.jetbrains.kotlin.examples.actors.Actor import java.util.concurrent.Executors import java.util.LinkedList -class StatCalculator() : Actor(Executors.newSingleThreadExecutor().sure()) { +class StatCalculator() : Actor(Executors.newSingleThreadExecutor()!!) { val list = LinkedList () var average = 0.toLong() var sum = 0.toLong() diff --git a/examples/src/actors/src/StockServer.kt b/examples/src/actors/src/StockServer.kt index 58ba36aefed..50c7e8d0098 100644 --- a/examples/src/actors/src/StockServer.kt +++ b/examples/src/actors/src/StockServer.kt @@ -7,7 +7,7 @@ import java.util.concurrent.Executors import java.util.HashMap import java.util.HashSet -class StockServer(val numberOfShards : Int) : Actor(Executors.newFixedThreadPool(numberOfShards+1).sure()) { +class StockServer(val numberOfShards : Int) : Actor(Executors.newFixedThreadPool(numberOfShards+1)!!) { private val stockToServer = HashMap () private val statCalculator = StatCalculator() diff --git a/examples/src/benchmarks/src/lockperf/LockPerf.kt b/examples/src/benchmarks/src/lockperf/LockPerf.kt index 862e04f253d..08b6a29d502 100644 --- a/examples/src/benchmarks/src/lockperf/LockPerf.kt +++ b/examples/src/benchmarks/src/lockperf/LockPerf.kt @@ -32,7 +32,7 @@ fun Int.latch(op: CountDownLatch.() -> T) : T { } fun main(args: Array) { - val processors = Runtime.getRuntime().sure().availableProcessors() + val processors = Runtime.getRuntime()!!.availableProcessors() var threadNum = 1 while(threadNum <= 1024) { val counter = AtomicInteger() diff --git a/examples/src/benchmarks/src/spectralnorm/SpectralNorm.kt b/examples/src/benchmarks/src/spectralnorm/SpectralNorm.kt index 2be52f27411..2e7aed8727d 100644 --- a/examples/src/benchmarks/src/spectralnorm/SpectralNorm.kt +++ b/examples/src/benchmarks/src/spectralnorm/SpectralNorm.kt @@ -26,7 +26,7 @@ fun spectralnormGame(n: Int) : Double { u[i] = 1.0 } - val nthread = Runtime.getRuntime ().sure().availableProcessors (); + val nthread = Runtime.getRuntime ()!!.availableProcessors (); barrier = CyclicBarrier (nthread); val chunk = n / nthread diff --git a/examples/src/benchmarks/src/threadring/ThreadRing.kt b/examples/src/benchmarks/src/threadring/ThreadRing.kt index 8a722e70441..98deb6a72c6 100644 --- a/examples/src/benchmarks/src/threadring/ThreadRing.kt +++ b/examples/src/benchmarks/src/threadring/ThreadRing.kt @@ -43,7 +43,7 @@ fun main(args: Array) { class TokenMessage(val nodeId : Int, value: Int, val isStop: Boolean) : AtomicInteger(value) class ThreadRing(val N: Int) { - val executor = Executors.newFixedThreadPool(MAX_THREADS).sure() + val executor = Executors.newFixedThreadPool(MAX_THREADS)!! val nodes : Array = Array(MAX_NODES+1, { (it : Int) -> Node(it+1) }); @@ -84,17 +84,17 @@ class ThreadRing(val N: Int) { cdl.countDown() } else { m.set(nextValue) - nextNode.sure().sendMessage(m) + nextNode!!.sendMessage(m) } isActive = false } else { if (m.get() == N) { System.out?.println(nodeId); - nextNode.sure().sendMessage(TokenMessage(nodeId, 0, true)); + nextNode!!.sendMessage(TokenMessage(nodeId, 0, true)); } else { m.incrementAndGet() - nextNode.sure().sendMessage(m); + nextNode!!.sendMessage(m); } } } diff --git a/examples/src/guice-kotlin/src/GuiceDsl.kt b/examples/src/guice-kotlin/src/GuiceDsl.kt index 1e285e275c3..1811296f77c 100644 --- a/examples/src/guice-kotlin/src/GuiceDsl.kt +++ b/examples/src/guice-kotlin/src/GuiceDsl.kt @@ -10,7 +10,7 @@ class GuiceInjectorBuilder() { fun module (config: Binder.()->Any?) : Module = object: Module { override fun configure(binder: Binder?) { - binder.sure().config() + binder!!.config() } } @@ -22,29 +22,29 @@ class GuiceInjectorBuilder() { fun injector(config: GuiceInjectorBuilder.() -> Any?) : Injector { val collector = GuiceInjectorBuilder() collector.config() - return Guice.createInjector(collector.collected).sure() + return Guice.createInjector(collector.collected)!! } } } -inline fun Binder.bind() = bind(javaClass()).sure() +inline fun Binder.bind() = bind(javaClass())!! inline fun ScopedBindingBuilder.asSingleton() = `in`(javaClass()) -inline fun AnnotatedBindingBuilder.to() = to(javaClass()).sure() +inline fun AnnotatedBindingBuilder.to() = to(javaClass())!! -inline fun AnnotatedBindingBuilder.toSingleton() = to(javaClass()).sure().asSingleton() +inline fun AnnotatedBindingBuilder.toSingleton() = to(javaClass())!!.asSingleton() -inline fun Injector.getInstance() = getInstance(javaClass()).sure() +inline fun Injector.getInstance() = getInstance(javaClass())!! -inline fun Injector.getProvider() = getProvider(javaClass()).sure() +inline fun Injector.getProvider() = getProvider(javaClass())!! inline fun > LinkedBindingBuilder.toProvider() = toProvider(javaClass()) fun AnnotatedBindingBuilder.toProvider(provider: Injector.()->T) = toProvider(object: Provider { [Inject] val injector : Injector? = null - override fun get(): T = injector.sure().provider() -}).sure() + override fun get(): T = injector!!.provider() +})!! fun AnnotatedBindingBuilder.toSingletonProvider(provider: Injector.()->T) = toProvider(provider).asSingleton() diff --git a/examples/src/guice-kotlin/src/GuiceExample.kt b/examples/src/guice-kotlin/src/GuiceExample.kt index 90307c1d4df..5c9f4de57bf 100644 --- a/examples/src/guice-kotlin/src/GuiceExample.kt +++ b/examples/src/guice-kotlin/src/GuiceExample.kt @@ -17,7 +17,7 @@ class StdoutLoggingService() : LoggingService(){ class JdkLoggingService () : LoggingService() { protected [Inject] var jdkLogger: Logger? = null - override fun info(message: String) = jdkLogger.sure().info(message) + override fun info(message: String) = jdkLogger!!.info(message) } abstract class AppService(protected val mode: String) { diff --git a/examples/src/luhny/solution.kt b/examples/src/luhny/solution.kt index 230530551c9..ceb0061f3c8 100644 --- a/examples/src/luhny/solution.kt +++ b/examples/src/luhny/solution.kt @@ -13,7 +13,7 @@ fun applyMask(a : String) : String { } luhny.processEnd() - return luhny.output.toString().sure() + return luhny.output.toString()!! } class Luhny() { diff --git a/examples/src/luhny/test.kt b/examples/src/luhny/test.kt index a5261ed00ab..b4ca55f9721 100644 --- a/examples/src/luhny/test.kt +++ b/examples/src/luhny/test.kt @@ -147,7 +147,7 @@ fun computeLast(allButLast : String) : Char { return if (remainder == 0) '0' else ('0' + (10 - remainder)).toChar() } -fun computeLast(allButLast : CharSequence) : Char = computeLast(allButLast.toString().sure()) +fun computeLast(allButLast : CharSequence) : Char = computeLast(allButLast.toString()!!) fun setRandomDigits(builder : StringBuilder, start : Int, end : Int) { for (i in start..end-1) @@ -161,7 +161,7 @@ fun nonDigits() : String { val nonDigits = StringBuilder() for (i in 0..999) nonDigits.append((random.nextInt(68) + ':').toChar()) - return nonDigits.toString().sure() + return nonDigits.toString()!! } fun testFormatted(delimiter : Char) { @@ -179,7 +179,7 @@ fun formattedMask(delimiter : Char) : String { mask.append(delimiter) } - return mask.toString().sure() + return mask.toString()!! } /** Computes a random, valid card # with the specified number of digits. */ @@ -187,7 +187,7 @@ fun randomNumber(digits : Int) : String { val number = StringBuilder(digits) number.setLength(digits) setRandomDigits(number, 0, digits - 1) - number.setCharAt(digits - 1, computeLast(number.subSequence(0, digits - 1).sure())) + number.setCharAt(digits - 1, computeLast(number.subSequence(0, digits - 1)!!)) return number.toString() ?: "" } @@ -196,9 +196,9 @@ fun nestedNumber() : String { val number = StringBuilder(16) number.setLength(16); setRandomDigits(number, 0, 14); - number.setCharAt(14, computeLast(number.subSequence(1, 14).sure())) - number.setCharAt(15, computeLast(number.subSequence(0, 15).sure())) - return number.toString().sure() + number.setCharAt(14, computeLast(number.subSequence(1, 14)!!)) + number.setCharAt(15, computeLast(number.subSequence(0, 15)!!)) + return number.toString()!! } /** Creates a sequence of mask characters with the given length. */ @@ -211,7 +211,7 @@ fun repeatingSequence(c : Char, length : Int) : String { val sb = StringBuilder() for (i in 1..length) sb.append(c) - return sb.toString().sure() + return sb.toString()!! } class DigitSet() { @@ -225,10 +225,10 @@ class DigitSet() { fun testOverlappingMatches() { val output = StringBuilder(randomNumber(MAX_LENGTH)) for (i in 0..1000 - MAX_LENGTH - 1) - output.append(computeLast(output.subSequence(i + 1, i + MAX_LENGTH).sure())) + output.append(computeLast(output.subSequence(i + 1, i + MAX_LENGTH)!!)) test("long sequence of overlapping, valid #s") - .send(output.toString().sure()) + .send(output.toString()!!) .expect(mask(output.length())); } @@ -245,7 +245,7 @@ fun nonMatchingSequence(length : Int) : String { val start = lastIndex - (subLength - 1); if (start < 0) break; - excluded.add(computeLast(builder.subSequence(start, lastIndex).sure())); + excluded.add(computeLast(builder.subSequence(start, lastIndex)!!)); } // Find a digit that doesn't result in a valid card #. @@ -256,5 +256,5 @@ fun nonMatchingSequence(length : Int) : String { builder.append(digit); } - return builder.toString().sure() + return builder.toString()!! } diff --git a/examples/src/nettyserver/src/Main.kt b/examples/src/nettyserver/src/Main.kt index b0ca453fcd5..3d104f90524 100644 --- a/examples/src/nettyserver/src/Main.kt +++ b/examples/src/nettyserver/src/Main.kt @@ -23,7 +23,7 @@ fun main(args : Array) { response.content = "Hello, World!" } POST { - response.content = "You said: ${request.getContent().sure().toString(Charset.defaultCharset())}" + response.content = "You said: ${request.getContent()!!.toString(Charset.defaultCharset())}" } } diff --git a/examples/src/nettyserver/src/Netty.kt b/examples/src/nettyserver/src/Netty.kt index 04d5ac3bb0f..eacc2ca9d7e 100644 --- a/examples/src/nettyserver/src/Netty.kt +++ b/examples/src/nettyserver/src/Netty.kt @@ -35,7 +35,7 @@ fun HttpResponse.set(header: String, value: Any?) : Unit { var HttpResponse.content : Any? get() = throw UnsupportedOperationException() set(c: Any?) { - val buffer = ChannelBuffers.copiedBuffer(c.toString(), CharsetUtil.UTF_8).sure() + val buffer = ChannelBuffers.copiedBuffer(c.toString(), CharsetUtil.UTF_8)!! setContent(buffer) setHeader("Content-Length", buffer.readableBytes()) } diff --git a/examples/src/nettyserver/src/Request.kt b/examples/src/nettyserver/src/Request.kt index 865be4455ef..e1a80f8843b 100644 --- a/examples/src/nettyserver/src/Request.kt +++ b/examples/src/nettyserver/src/Request.kt @@ -21,8 +21,8 @@ import org.jboss.netty.channel.ChannelFuture class RequestResponse(e: MessageEvent) { val request = e.getMessage() as HttpRequest val response = DefaultHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.FORBIDDEN) - val channel = e.getChannel().sure() - val path = request.getUri().sure().sanitizeUri() + val channel = e.getChannel()!! + val path = request.getUri()!!.sanitizeUri() fun setError(status: HttpResponseStatus?) { response.setStatus(status) @@ -43,8 +43,8 @@ class RequestResponse(e: MessageEvent) { } fun write() = - if(response.getStatus().sure().getCode() >= 400) { - channel.write(response).sure().addListener(ChannelFutureListener.CLOSE) + if(response.getStatus()!!.getCode() >= 400) { + channel.write(response)!!.addListener(ChannelFutureListener.CLOSE) } else { channel.write(response) diff --git a/examples/src/nettyserver/src/RestProcessor.kt b/examples/src/nettyserver/src/RestProcessor.kt index a2ff84c76d6..d9a401a9873 100644 --- a/examples/src/nettyserver/src/RestProcessor.kt +++ b/examples/src/nettyserver/src/RestProcessor.kt @@ -21,11 +21,11 @@ class RestProcessor(val prefix: String, val builder: RestBuilder) : Processor { if(request.path.startsWith(prefix)) { if(request.request.getMethod() == HttpMethod.GET && builder.onGet != null) { request.ok() - request.(builder.onGet.sure())() + request.(builder.onGet!!)() } else if(request.request.getMethod() == HttpMethod.POST && builder.onPost != null) { request.ok() - request.(builder.onPost.sure())() + request.(builder.onPost!!)() } else { request.setError(HttpResponseStatus.METHOD_NOT_ALLOWED) diff --git a/examples/src/swing/SwingBuilder.kt b/examples/src/swing/SwingBuilder.kt index af437b7bf9a..75e213fa5a6 100644 --- a/examples/src/swing/SwingBuilder.kt +++ b/examples/src/swing/SwingBuilder.kt @@ -52,26 +52,26 @@ fun JButton(text : String, action : (ActionEvent) -> Unit) : JButton { val result = JButton(text) result.addActionListener(object : ActionListener { override fun actionPerformed(e: ActionEvent?) { - action(e.sure()) + action(e!!) } }) return result } var JFrame.title : String - get() = getTitle().sure() + get() = getTitle()!! set(t) {setTitle(t)} var JFrame.size : #(Int, Int) - get() = #(getSize().sure().getWidth().toInt(), getSize().sure().getHeight().toInt()) + get() = #(getSize()!!.getWidth().toInt(), getSize()!!.getHeight().toInt()) set(dim) {setSize(Dimension(dim._1, dim._2))} var JFrame.height : Int - get() = getSize().sure().getHeight().toInt() + get() = getSize()!!.getHeight().toInt() set(h) {setSize(width, h)} var JFrame.width : Int - get() = getSize().sure().getWidth().toInt() + get() = getSize()!!.getWidth().toInt() set(w) {setSize(height, w)} var JFrame.defaultCloseOperation : Int