diff --git a/examples/java-matter-controller/BUILD.gn b/examples/java-matter-controller/BUILD.gn index 491e701f2ac73b..da8e283e1272b1 100644 --- a/examples/java-matter-controller/BUILD.gn +++ b/examples/java-matter-controller/BUILD.gn @@ -57,8 +57,8 @@ kotlin_binary("java-matter-controller") { "java/src/com/matter/controller/commands/pairing/PairOnNetworkFabricCommand.kt", "java/src/com/matter/controller/commands/pairing/PairOnNetworkInstanceNameCommand.kt", "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongCommand.kt", - "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt", "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImBatchInvokeCommand.kt", + "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt", "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImReadCommand.kt", "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImSubscribeCommand.kt", "java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt", diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImBatchInvokeCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImBatchInvokeCommand.kt index 490f86d432b9ca..5407e6e5d09116 100644 --- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImBatchInvokeCommand.kt +++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImBatchInvokeCommand.kt @@ -17,9 +17,9 @@ */ package com.matter.controller.commands.pairing +import chip.devicecontroller.BatchInvokeCallback import chip.devicecontroller.ChipDeviceController import chip.devicecontroller.GetConnectedDeviceCallbackJni.GetConnectedDeviceCallback -import chip.devicecontroller.BatchInvokeCallback import chip.devicecontroller.model.InvokeElement import chip.devicecontroller.model.InvokeResponseData import chip.devicecontroller.model.NoInvokeResponseData @@ -50,7 +50,8 @@ class PairOnNetworkLongImBatchInvokeCommand( } private inner class InternalInvokeCallback : BatchInvokeCallback { - private var responseCount = 0; + private var responseCount = 0 + override fun onError(e: Exception) { logger.log(Level.INFO, "Invoke receive onError" + e.message) setFailure("invoke failure") @@ -58,22 +59,19 @@ class PairOnNetworkLongImBatchInvokeCommand( override fun onResponse(invokeResponseData: InvokeResponseData) { logger.log(Level.INFO, "Invoke receive OnResponse on $invokeResponseData") - responseCount ++; + responseCount++ setSuccess() } - override fun onNoResponse(invokeResponseData: InvokeResponseData) { - logger.log(Level.INFO, "Invoke receive OnResponse on $invokeResponseData") - responseCount --; + override fun onNoResponse(noInvokeResponseData: NoInvokeResponseData) { + logger.log(Level.INFO, "Invoke receive OnResponse on $noInvokeResponseData") + responseCount-- } - override fun onDone() { - if (responseCount == TEST_COMMONDS_NUM) - { + override fun onDone() { + if (responseCount == TEST_COMMONDS_NUM) { setSuccess() - } - else - { + } else { setFailure("invoke failure") } } @@ -130,12 +128,7 @@ class PairOnNetworkLongImBatchInvokeCommand( """{"0:UINT":1}""" ) - val invokeList = - listOf( - element1, - element2, - element3 - ) + val invokeList = listOf(element1, element2, element3) currentCommissioner() .pairDeviceWithAddress( getNodeId(),