Use for loop for kotlin Channels in examples (#76)

Co-authored-by: Giovanni Barbaro <[email protected]>
eclipse-zenoh · May 15, 2024 · f890fb0 · f890fb0
1 parent ea3987e
commit f890fb0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 26 deletions.
diff --git a/examples/src/main/kotlin/io.zenoh/ZGet.kt b/examples/src/main/kotlin/io.zenoh/ZGet.kt
@@ -89,16 +89,12 @@ class ZGet(private val emptyArgs: Boolean) : CliktCommand(
                                 }
                             }
                             .res()
-                            .onSuccess {
+                            .onSuccess { receiver ->
                                 runBlocking {
-                                    val iterator = it!!.iterator()
-                                    while (iterator.hasNext()) {
-                                        val reply = iterator.next()
-                                        if (reply is Reply.Success) {
-                                            println("Received ('${reply.sample.keyExpr}': '${reply.sample.value}')")
-                                        } else {
-                                            reply as Reply.Error
-                                            println("Received (ERROR: '${reply.error}')")
+                                    for (reply in receiver!!) {
+                                        when (reply) {
+                                            is Reply.Success -> {println("Received ('${reply.sample.keyExpr}': '${reply.sample.value}')")}
+                                            is Reply.Error -> println("Received (ERROR: '${reply.error}')")
                                         }
                                     }
                                 }

diff --git a/examples/src/main/kotlin/io.zenoh/ZQueryable.kt b/examples/src/main/kotlin/io.zenoh/ZQueryable.kt
@@ -55,7 +55,7 @@ class ZQueryable(private val emptyArgs: Boolean) : CliktCommand(
     ).flag(default = false)
 
     override fun run() {
-        val config = loadConfig(emptyArgs, configFile, connect, listen, noMulticastScouting,mode)
+        val config = loadConfig(emptyArgs, configFile, connect, listen, noMulticastScouting, mode)
 
         Session.open(config).onSuccess { session ->
             session.use {
@@ -81,14 +81,11 @@ class ZQueryable(private val emptyArgs: Boolean) : CliktCommand(
     private suspend fun handleRequests(
         receiverChannel: Channel<Query>, keyExpr: KeyExpr
     ) {
-        val iterator = receiverChannel.iterator()
-        while (iterator.hasNext()) {
-            iterator.next().use { query ->
-                val valueInfo = query.value?.let { value -> " with value '$value'" } ?: ""
-                println(">> [Queryable] Received Query '${query.selector}' $valueInfo")
-                query.reply(keyExpr).success(value).withKind(SampleKind.PUT).withTimeStamp(TimeStamp.getCurrentTime())
-                    .res().onFailure { println(">> [Queryable ] Error sending reply: $it") }
-            }
+        for (query in receiverChannel) {
+            val valueInfo = query.value?.let { value -> " with value '$value'" } ?: ""
+            println(">> [Queryable] Received Query '${query.selector}' $valueInfo")
+            query.reply(keyExpr).success(value).withKind(SampleKind.PUT).withTimeStamp(TimeStamp.getCurrentTime())
+                .res().onFailure { println(">> [Queryable ] Error sending reply: $it") }
         }
     }
 }

diff --git a/examples/src/main/kotlin/io.zenoh/ZSub.kt b/examples/src/main/kotlin/io.zenoh/ZSub.kt
@@ -56,10 +56,7 @@ class ZSub(private val emptyArgs: Boolean) : CliktCommand(
                             subscriber.use {
                                 println("Press CTRL-C to quit...")
                                 runBlocking {
-                                    val receiver = subscriber.receiver!!
-                                    val iterator = receiver.iterator()
-                                    while (iterator.hasNext()) {
-                                        val sample = iterator.next()
+                                    for (sample in subscriber.receiver!!) {
                                         println(">> [Subscriber] Received ${sample.kind} ('${sample.keyExpr}': '${sample.value}'" + "${
                                             sample.attachment?.let {
                                                 ", with attachment: " + "${

diff --git a/examples/src/main/kotlin/io.zenoh/ZSubThr.kt b/examples/src/main/kotlin/io.zenoh/ZSubThr.kt
@@ -99,11 +99,11 @@ class ZSubThr(private val emptyArgs: Boolean) : CliktCommand(
     override fun run() {
         val config = loadConfig(emptyArgs, configFile, connect, listen, noMulticastScouting, mode)
 
-        "test/thr".intoKeyExpr().onSuccess {
-            it.use { keyExpr ->
+        "test/thr".intoKeyExpr().onSuccess { keyExpr ->
+            keyExpr.use {
                 println("Opening Session")
-                Session.open(config).onSuccess {
-                    it.use { session ->
+                Session.open(config).onSuccess { session ->
+                    session.use {
                         println("Press CTRL-C to quit...")
                         subscriber =
                             session.declareSubscriber(keyExpr).reliable().with { listener(number) }.res().getOrThrow()