Remove pair step before calling any cluster API (#30968)

* Remove pair step before calling any cluster API * Address review comments
project-chip · Jun 27, 2024 · 1471086 · 1471086
1 parent 9123697
commit 1471086
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 33 deletions.
diff --git a/...oller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt b/...oller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt
@@ -37,21 +37,13 @@ class PairOnNetworkLongImInvokeCommand(
     DiscoveryFilterType.LONG_DISCRIMINATOR
   ) {
   override fun runCommand() {
-    currentCommissioner()
-      .pairDevice(
-        getNodeId(),
-        getRemoteAddr().address.hostAddress,
-        MATTER_PORT,
-        getDiscriminator(),
-        getSetupPINCode(),
-      )
-    currentCommissioner().setCompletionListener(this)
-    waitCompleteMs(getTimeoutMillis())
-
     runBlocking {
       try {
         val identifyTime: UShort = 1u
         val identifyCluster = IdentifyCluster(controller = currentCommissioner(), endpointId = 0u)
+
+        // By running command identify, we are implicitly requesting CASE to be established if it's
+        // not already present.
         identifyCluster.identify(identifyTime)
         logger.log(Level.INFO, "Invoke command succeeded")
       } catch (ex: Exception) {

diff --git a/...troller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImReadCommand.kt b/...troller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImReadCommand.kt
@@ -17,22 +17,14 @@ class PairOnNetworkLongImReadCommand(controller: MatterController, credsIssue: C
     DiscoveryFilterType.LONG_DISCRIMINATOR
   ) {
   override fun runCommand() {
-    currentCommissioner()
-      .pairDevice(
-        getNodeId(),
-        getRemoteAddr().address.hostAddress,
-        MATTER_PORT,
-        getDiscriminator(),
-        getSetupPINCode(),
-      )
-    currentCommissioner().setCompletionListener(this)
-    waitCompleteMs(getTimeoutMillis())
-
     runBlocking {
       try {
         val basicInformationCluster =
           BasicInformationCluster(controller = currentCommissioner(), endpointId = DEFAULT_ENDPOINT)
         val vendorName = basicInformationCluster.readVendorNameAttribute()
+
+        // By running command readVendorIDAttribute, we are implicitly requesting CASE to be
+        // established if it's not already present.
         val vendorId = basicInformationCluster.readVendorIDAttribute()
         logger.log(Level.INFO, "Read command succeeded, Verdor Name:${vendorName} (ID:${vendorId})")
       } catch (ex: Exception) {

diff --git a/...roller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt b/...roller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt
@@ -37,21 +37,13 @@ class PairOnNetworkLongImWriteCommand(
     DiscoveryFilterType.LONG_DISCRIMINATOR
   ) {
   override fun runCommand() {
-    currentCommissioner()
-      .pairDevice(
-        getNodeId(),
-        getRemoteAddr().address.hostAddress,
-        MATTER_PORT,
-        getDiscriminator(),
-        getSetupPINCode(),
-      )
-    currentCommissioner().setCompletionListener(this)
-    waitCompleteMs(getTimeoutMillis())
-
     runBlocking {
       try {
         val basicInformationCluster =
           BasicInformationCluster(controller = currentCommissioner(), endpointId = DEFAULT_ENDPOINT)
+
+        // By running command writeNodeLabelAttribute, we are implicitly requesting CASE to be
+        // established if it's not already present.
         basicInformationCluster.writeNodeLabelAttribute("Test Node Label")
         logger.log(Level.INFO, "Write command succeeded")