diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml index 99d279c20970c6..01f041cdd0a506 100644 --- a/.github/workflows/bloat_check.yaml +++ b/.github/workflows/bloat_check.yaml @@ -41,7 +41,6 @@ jobs: with: action: actions/checkout@v3 with: | - submodules: true token: ${{ github.token }} attempt_limit: 3 attempt_delay: 2000 diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f659f10b5a76e8..8dfc7086417d2d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -26,6 +26,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: build_linux_gcc_debug: diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml index f6f8c4c6076986..42dba7ca4485aa 100644 --- a/.github/workflows/chef.yaml +++ b/.github/workflows/chef.yaml @@ -23,6 +23,11 @@ concurrency: group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }} cancel-in-progress: true +env: + CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 + jobs: chef_linux: name: Chef - Linux CI Examples diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml index 6b2dfa7372ed6b..ba6938efb7e19e 100644 --- a/.github/workflows/cirque.yaml +++ b/.github/workflows/cirque.yaml @@ -24,6 +24,11 @@ concurrency: group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }} cancel-in-progress: true +env: + CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 + jobs: cirque: name: Cirque diff --git a/.github/workflows/darwin-tests.yaml b/.github/workflows/darwin-tests.yaml index face48a25e88e0..02c4f58af64b89 100644 --- a/.github/workflows/darwin-tests.yaml +++ b/.github/workflows/darwin-tests.yaml @@ -28,6 +28,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: test_suites_chip_tool_darwin: diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml index 00c669eb81a4ce..53ea74716dd028 100644 --- a/.github/workflows/darwin.yaml +++ b/.github/workflows/darwin.yaml @@ -24,6 +24,11 @@ concurrency: group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }} cancel-in-progress: true +env: + CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 + jobs: darwin: name: Build Darwin diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml index 438df5c863a991..175261cef97618 100644 --- a/.github/workflows/examples-ameba.yaml +++ b/.github/workflows/examples-ameba.yaml @@ -25,6 +25,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: ameba: diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml index b0216522bde2c0..e548aa4259b929 100644 --- a/.github/workflows/examples-bouffalolab.yaml +++ b/.github/workflows/examples-bouffalolab.yaml @@ -26,6 +26,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: bouffalolab: diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml index ee76323463763b..aaeaf094910373 100644 --- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml +++ b/.github/workflows/examples-cc13x2x7_26x2x7.yaml @@ -25,6 +25,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: cc26x2x7: diff --git a/.github/workflows/examples-cc32xx.yaml b/.github/workflows/examples-cc32xx.yaml index c2b86972a294ae..f31cf1e8a20c28 100644 --- a/.github/workflows/examples-cc32xx.yaml +++ b/.github/workflows/examples-cc32xx.yaml @@ -23,6 +23,11 @@ concurrency: group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }} cancel-in-progress: true +env: + CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 + jobs: cc32xx: name: cc32xx diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml index 4954d9c9af8930..ee4f04e8143846 100644 --- a/.github/workflows/examples-efr32.yaml +++ b/.github/workflows/examples-efr32.yaml @@ -25,6 +25,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: efr32: diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml index 67872b2f186a79..637c797fe5ad90 100644 --- a/.github/workflows/examples-esp32.yaml +++ b/.github/workflows/examples-esp32.yaml @@ -25,6 +25,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: esp32: diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml index f270017b796cdf..b48aafbf4937da 100644 --- a/.github/workflows/examples-infineon.yaml +++ b/.github/workflows/examples-infineon.yaml @@ -26,6 +26,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: infineon: diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml index cea556dbb51dc2..f71f3f26f1ae61 100644 --- a/.github/workflows/examples-k32w.yaml +++ b/.github/workflows/examples-k32w.yaml @@ -25,6 +25,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: k32w: diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml index 17e9562baecb31..b8af253b4923aa 100644 --- a/.github/workflows/examples-linux-arm.yaml +++ b/.github/workflows/examples-linux-arm.yaml @@ -25,6 +25,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: arm_crosscompile: diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml index 2f9d0a26a297aa..3dd30ed119a7a0 100644 --- a/.github/workflows/examples-linux-imx.yaml +++ b/.github/workflows/examples-linux-imx.yaml @@ -25,6 +25,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: imx: diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml index 6a18a1ab872ff2..f80a4691a7d56f 100644 --- a/.github/workflows/examples-linux-standalone.yaml +++ b/.github/workflows/examples-linux-standalone.yaml @@ -25,6 +25,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: linux_standalone: diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml index a00d7d3a463f97..5f04e7eac1a26d 100644 --- a/.github/workflows/examples-mbed.yaml +++ b/.github/workflows/examples-mbed.yaml @@ -26,6 +26,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: mbedos: diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml index 8d7c59bbdc0408..9d64805bcb3b64 100755 --- a/.github/workflows/examples-mw320.yaml +++ b/.github/workflows/examples-mw320.yaml @@ -25,6 +25,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: mw320: diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml index df8204cb89903e..7f66809a2d9138 100644 --- a/.github/workflows/examples-nrfconnect.yaml +++ b/.github/workflows/examples-nrfconnect.yaml @@ -25,6 +25,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: nrfconnect: diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml index 91503e37be7e41..e34b079f2b81d7 100644 --- a/.github/workflows/examples-openiotsdk.yaml +++ b/.github/workflows/examples-openiotsdk.yaml @@ -24,6 +24,11 @@ concurrency: group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }} cancel-in-progress: true +env: + CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 + jobs: openiotsdk: name: Open IoT SDK examples building diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml index b61da7a91ce0e7..4d929fb36c6b3e 100644 --- a/.github/workflows/examples-qpg.yaml +++ b/.github/workflows/examples-qpg.yaml @@ -25,6 +25,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: qpg: diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml index f5f1b58a5fbe5b..cf0317c61c190c 100644 --- a/.github/workflows/examples-telink.yaml +++ b/.github/workflows/examples-telink.yaml @@ -25,6 +25,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: telink: diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml index 5f254879850215..dc6240fe45cbd6 100644 --- a/.github/workflows/examples-tizen.yaml +++ b/.github/workflows/examples-tizen.yaml @@ -25,6 +25,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: tizen: diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index 6b79e4fa1917a9..57160e210dbc84 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -24,6 +24,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: full_android: diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml index 9e7b4a4ba76a45..68b62b88d87e12 100644 --- a/.github/workflows/fuzzing-build.yaml +++ b/.github/workflows/fuzzing-build.yaml @@ -24,6 +24,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: build_linux_fuzzing: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 85af069b51d8f6..fef2d3e1c8dabf 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -23,6 +23,10 @@ concurrency: group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }} cancel-in-progress: true +env: + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 + jobs: code-lints: runs-on: ubuntu-latest @@ -210,4 +214,3 @@ jobs: if: always() run: | git grep -n 'SuccessOrExit(CHIP_ERROR' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0 - diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml index 2be27598801d6a..b8d68f4a3a243e 100644 --- a/.github/workflows/qemu.yaml +++ b/.github/workflows/qemu.yaml @@ -25,6 +25,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml index c19ccaca595ff5..314600d3e588ff 100644 --- a/.github/workflows/release_artifacts.yaml +++ b/.github/workflows/release_artifacts.yaml @@ -21,6 +21,11 @@ on: description: Release Tag required: true +env: + CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 + jobs: esp32: name: ESP32 diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index c962d705f29627..de1d5ab89e8cfb 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -25,6 +25,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: android: diff --git a/.github/workflows/smoketest-darwin.yaml b/.github/workflows/smoketest-darwin.yaml index 55271cdef05c53..0ab19f6dd92d44 100644 --- a/.github/workflows/smoketest-darwin.yaml +++ b/.github/workflows/smoketest-darwin.yaml @@ -24,6 +24,11 @@ concurrency: group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }} cancel-in-progress: true +env: + CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 + jobs: darwin: name: Smoke Run - Darwin diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index b882cce8330dff..4266a3abe945dc 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -28,6 +28,8 @@ concurrency: env: CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 jobs: test_suites_linux: diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml index 4be57110756b43..22cdb0430bc494 100644 --- a/.github/workflows/zap_regeneration.yaml +++ b/.github/workflows/zap_regeneration.yaml @@ -21,6 +21,11 @@ concurrency: group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }} cancel-in-progress: true +env: + CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 + jobs: zap_regeneration: name: ZAP Regeneration diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml index 9eb38e03a8a7e0..60513c863eec92 100644 --- a/.github/workflows/zap_templates.yaml +++ b/.github/workflows/zap_templates.yaml @@ -23,6 +23,11 @@ concurrency: group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }} cancel-in-progress: true +env: + CHIP_NO_LOG_TIMESTAMPS: true + # XXX: Workaround for https://github.com/actions/cache/issues/1141 + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 3 + jobs: zap_templates: name: ZAP templates generation diff --git a/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp b/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp index 8aff2a6f268bd3..cd16efd4a3f054 100644 --- a/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp +++ b/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp @@ -17,17 +17,17 @@ #include "binding-handler.h" -#include "app-common/zap-generated/ids/Clusters.h" -#include "app-common/zap-generated/ids/Commands.h" -#include "app/CommandSender.h" -#include "app/clusters/bindings/BindingManager.h" -#include "app/server/Server.h" -#include "controller/InvokeInteraction.h" -#include "lib/core/CHIPError.h" -#include "platform/CHIPDeviceLayer.h" +#include +#include +#include +#include +#include +#include +#include +#include #if defined(ENABLE_CHIP_SHELL) -#include "lib/shell/Engine.h" +#include // nogncheck using chip::Shell::Engine; using chip::Shell::shell_command_t; diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/ChipClient.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/ChipClient.kt index add408b7af9693..84a14de4714e13 100644 --- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/ChipClient.kt +++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/ChipClient.kt @@ -61,7 +61,7 @@ object ChipClient { if (!this::androidPlatform.isInitialized && context != null) { //force ChipDeviceController load jni ChipDeviceController.loadJni() - androidPlatform = AndroidChipPlatform(AndroidBleManager(), PreferencesKeyValueStoreManager(context), PreferencesConfigurationManager(context), NsdManagerServiceResolver(context), NsdManagerServiceBrowser(context), ChipMdnsCallbackImpl(), DiagnosticDataProviderImpl(context)) + androidPlatform = AndroidChipPlatform(AndroidBleManager(context), PreferencesKeyValueStoreManager(context), PreferencesConfigurationManager(context), NsdManagerServiceResolver(context), NsdManagerServiceBrowser(context), ChipMdnsCallbackImpl(), DiagnosticDataProviderImpl(context)) } return androidPlatform diff --git a/examples/contact-sensor-app/contact-sensor-common/BUILD.gn b/examples/contact-sensor-app/contact-sensor-common/BUILD.gn index ddae4d2d0defc5..d95af40a21a3ff 100755 --- a/examples/contact-sensor-app/contact-sensor-common/BUILD.gn +++ b/examples/contact-sensor-app/contact-sensor-common/BUILD.gn @@ -13,7 +13,6 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni") import("${chip_root}/src/app/chip_data_model.gni") chip_data_model("contact-sensor-common") { diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Argument.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Argument.kt index 76e633a82a144a..77aa91a89aa31d 100644 --- a/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Argument.kt +++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/common/Argument.kt @@ -141,6 +141,23 @@ class Argument { isValidArgument = numLong.toInt() >= minValue && numLong.toInt() <= maxValue } + ArgumentType.STRING -> { + val stringBuffer = this.value as StringBuffer + stringBuffer.append(value) + val str = stringBuffer.toString() + isValidArgument = value == str + } + + ArgumentType.BOOL -> { + val atomicBoolean = this.value as AtomicBoolean + try { + atomicBoolean.set(value.toBoolean()) + isValidArgument = true + } catch (e: Exception) { + isValidArgument = false + } + } + ArgumentType.ADDRESS -> isValidArgument = try { val ipAddress = this.value as IPAddress ipAddress.setAddress(InetAddress.getByName(value)) diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeCommand.kt index 7f2bc51e5ffb4a..bf6e18cceedafd 100644 --- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeCommand.kt +++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeCommand.kt @@ -22,5 +22,15 @@ import com.matter.controller.commands.common.CredentialsIssuer class PairCodeCommand(controller: ChipDeviceController, credsIssue: CredentialsIssuer?) : PairingCommand(controller, "code", credsIssue, PairingModeType.CODE, PairingNetworkType.NONE) { - override fun runCommand() {} + override fun runCommand() { + currentCommissioner() + .pairDeviceWithCode( + getNodeId(), + getOnboardingPayload(), + null, + getWifiNetworkCredentials(), + ) + currentCommissioner().setCompletionListener(this) + waitCompleteMs(getTimeoutMillis()) + } } \ No newline at end of file diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeThreadCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeThreadCommand.kt index 2cd822e32d467f..419525733c496a 100644 --- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeThreadCommand.kt +++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeThreadCommand.kt @@ -22,5 +22,15 @@ import com.matter.controller.commands.common.CredentialsIssuer class PairCodeThreadCommand(controller: ChipDeviceController, credsIssue: CredentialsIssuer?) : PairingCommand(controller, "code-thread", credsIssue, PairingModeType.CODE, PairingNetworkType.THREAD) { - override fun runCommand() {} + override fun runCommand() { + currentCommissioner() + .pairDeviceWithCode( + getNodeId(), + getOnboardingPayload(), + null, + getThreadNetworkCredentials(), + ) + currentCommissioner().setCompletionListener(this) + waitCompleteMs(getTimeoutMillis()) + } } \ No newline at end of file diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeWifiCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeWifiCommand.kt index 66f90fd7214cf9..ffecb2e9529df8 100644 --- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeWifiCommand.kt +++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairCodeWifiCommand.kt @@ -22,5 +22,15 @@ import com.matter.controller.commands.common.CredentialsIssuer class PairCodeWifiCommand(controller: ChipDeviceController, credsIssue: CredentialsIssuer?) : PairingCommand(controller, "code-wifi", credsIssue, PairingModeType.CODE, PairingNetworkType.WIFI) { - override fun runCommand() {} + override fun runCommand() { + currentCommissioner() + .pairDeviceWithCode( + getNodeId(), + getOnboardingPayload(), + null, + getWifiNetworkCredentials(), + ) + currentCommissioner().setCompletionListener(this) + waitCompleteMs(getTimeoutMillis()) + } } \ No newline at end of file diff --git a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.kt b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.kt index a6df1b0b450f6a..e7f90832d0c25c 100644 --- a/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.kt +++ b/examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.kt @@ -18,6 +18,7 @@ package com.matter.controller.commands.pairing import chip.devicecontroller.ChipDeviceController +import chip.devicecontroller.NetworkCredentials import com.matter.controller.commands.common.CredentialsIssuer import com.matter.controller.commands.common.IPAddress import com.matter.controller.commands.common.MatterCommand @@ -227,6 +228,22 @@ abstract class PairingCommand( return timeoutMillis.get() } + fun getOnboardingPayload(): String { + return onboardingPayload.toString() + } + + fun getWifiNetworkCredentials(): NetworkCredentials { + return NetworkCredentials.forWiFi(NetworkCredentials.WiFiCredentials(ssid.toString(), password.toString())) + } + + fun getThreadNetworkCredentials(): NetworkCredentials { + return NetworkCredentials.forThread(NetworkCredentials.ThreadCredentials(operationalDataset.toString().hexToByteArray())) + } + + private fun String.hexToByteArray(): ByteArray { + return chunked(2).map { byteStr -> byteStr.toUByte(16).toByte() }.toByteArray() + } + companion object { private val logger = Logger.getLogger(PairingCommand::class.java.name) } diff --git a/examples/light-switch-app/light-switch-common/BUILD.gn b/examples/light-switch-app/light-switch-common/BUILD.gn index 15552d97dcad54..163e841678101a 100644 --- a/examples/light-switch-app/light-switch-common/BUILD.gn +++ b/examples/light-switch-app/light-switch-common/BUILD.gn @@ -13,7 +13,6 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni") import("${chip_root}/src/app/chip_data_model.gni") chip_data_model("light-switch-common") { diff --git a/examples/lighting-app/lighting-common/BUILD.gn b/examples/lighting-app/lighting-common/BUILD.gn index a7e00eabe34b56..e983b3e0e0f11c 100644 --- a/examples/lighting-app/lighting-common/BUILD.gn +++ b/examples/lighting-app/lighting-common/BUILD.gn @@ -13,7 +13,6 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni") import("${chip_root}/src/app/chip_data_model.gni") config("config") { diff --git a/examples/lighting-app/qpg/zap/BUILD.gn b/examples/lighting-app/qpg/zap/BUILD.gn index b62bf14bf03859..ec69db0b412a8c 100644 --- a/examples/lighting-app/qpg/zap/BUILD.gn +++ b/examples/lighting-app/qpg/zap/BUILD.gn @@ -13,7 +13,6 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni") import("${chip_root}/src/app/chip_data_model.gni") chip_data_model("zap") { diff --git a/examples/lock-app/lock-common/BUILD.gn b/examples/lock-app/lock-common/BUILD.gn index 4237883f3fb2b0..bb01a5185f80f7 100644 --- a/examples/lock-app/lock-common/BUILD.gn +++ b/examples/lock-app/lock-common/BUILD.gn @@ -13,7 +13,6 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni") import("${chip_root}/src/app/chip_data_model.gni") chip_data_model("lock-common") { diff --git a/examples/lock-app/nxp/zap/BUILD.gn b/examples/lock-app/nxp/zap/BUILD.gn index ebb03aadd5a2ab..cc5fe9361c32a3 100644 --- a/examples/lock-app/nxp/zap/BUILD.gn +++ b/examples/lock-app/nxp/zap/BUILD.gn @@ -13,7 +13,6 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni") import("${chip_root}/src/app/chip_data_model.gni") chip_data_model("zap") { diff --git a/examples/lock-app/qpg/zap/BUILD.gn b/examples/lock-app/qpg/zap/BUILD.gn index a0eb662971f4ed..67e29db5f3f249 100644 --- a/examples/lock-app/qpg/zap/BUILD.gn +++ b/examples/lock-app/qpg/zap/BUILD.gn @@ -13,7 +13,6 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni") import("${chip_root}/src/app/chip_data_model.gni") chip_data_model("zap") { diff --git a/examples/platform/linux/AppMain.cpp b/examples/platform/linux/AppMain.cpp index d9bdbd5f87bdb2..bdfa8eba2f428e 100644 --- a/examples/platform/linux/AppMain.cpp +++ b/examples/platform/linux/AppMain.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include #include @@ -53,12 +52,12 @@ #if defined(ENABLE_CHIP_SHELL) #include -#include +#include // nogncheck #include #endif #if defined(PW_RPC_ENABLED) -#include +#include #endif #if CHIP_CONFIG_TRANSPORT_TRACE_ENABLED diff --git a/examples/platform/linux/BUILD.gn b/examples/platform/linux/BUILD.gn index 08580aad33c1f5..284a6c6116c579 100644 --- a/examples/platform/linux/BUILD.gn +++ b/examples/platform/linux/BUILD.gn @@ -35,12 +35,8 @@ source_set("app-main") { "AppMain.h", "CommissionableInit.cpp", "CommissionableInit.h", - "CommissioneeShellCommands.cpp", - "CommissioneeShellCommands.h", "CommissionerMain.cpp", "CommissionerMain.h", - "ControllerShellCommands.cpp", - "ControllerShellCommands.h", "LinuxCommissionableDataProvider.cpp", "LinuxCommissionableDataProvider.h", "NamedPipeCommands.cpp", @@ -53,29 +49,32 @@ source_set("app-main") { "testing/CustomCSRResponseOperationalKeyStore.h", ] - defines = [] + public_deps = [ + "${chip_root}/src/lib", + "${chip_root}/src/platform/logging:force_stdio", + ] + deps = [ + ":ota-test-event-trigger", + "${chip_root}/examples/providers:device_info_provider", + "${chip_root}/src/app/server", + ] if (chip_enable_pw_rpc) { defines += [ "PW_RPC_ENABLED" ] } + if (chip_build_libshell) { defines += [ "ENABLE_CHIP_SHELL" ] + sources += [ + "CommissioneeShellCommands.cpp", + "CommissioneeShellCommands.h", + "ControllerShellCommands.cpp", + "ControllerShellCommands.h", + ] } - public_deps = [ - ":ota-test-event-trigger", - "${chip_root}/examples/providers:device_info_provider", - "${chip_root}/src/app/server", - "${chip_root}/src/credentials:default_attestation_verifier", - "${chip_root}/src/lib", - "${chip_root}/src/lib/shell", - "${chip_root}/src/lib/shell:shell_core", - "${chip_root}/src/platform/logging:force_stdio", - ] - if (chip_enable_transport_trace) { - public_deps += - [ "${chip_root}/examples/common/tracing:trace_handlers_decoder" ] + deps += [ "${chip_root}/examples/common/tracing:trace_handlers_decoder" ] } public_configs = [ ":app-main-config" ] @@ -88,25 +87,15 @@ source_set("commissioner-main") { "CommissionerMain.h", ] - defines = [] - - if (chip_enable_pw_rpc) { - defines += [ "PW_RPC_ENABLED" ] - } if (chip_build_libshell) { defines += [ "ENABLE_CHIP_SHELL" ] } - public_deps = [ - "${chip_root}/src/app/server", - "${chip_root}/src/credentials:default_attestation_verifier", - "${chip_root}/src/lib", - "${chip_root}/src/lib/shell", - "${chip_root}/src/lib/shell:shell_core", - ] + public_deps = [ "${chip_root}/src/lib" ] + deps = [ "${chip_root}/src/app/server" ] if (chip_enable_transport_trace) { - public_deps += [ "${chip_root}/examples/common/tracing:trace_handlers" ] + deps += [ "${chip_root}/examples/common/tracing:trace_handlers" ] } public_configs = [ ":app-main-config" ] diff --git a/examples/platform/linux/CommissionerMain.cpp b/examples/platform/linux/CommissionerMain.cpp index c2a4e8292455a8..d9c1b5557ebd50 100644 --- a/examples/platform/linux/CommissionerMain.cpp +++ b/examples/platform/linux/CommissionerMain.cpp @@ -55,10 +55,6 @@ #include #include -#if defined(PW_RPC_ENABLED) -#include -#endif - #if CHIP_CONFIG_TRANSPORT_TRACE_ENABLED #include "TraceHandlers.h" #endif // CHIP_CONFIG_TRANSPORT_TRACE_ENABLED diff --git a/examples/platform/linux/CommonRpc.h b/examples/platform/linux/CommonRpc.h deleted file mode 100644 index 85495b2bf8fbaf..00000000000000 --- a/examples/platform/linux/CommonRpc.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * - * Copyright (c) 2021 Project CHIP Authors - * All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -namespace chip { -namespace rpc { - -int Init(); - -} // namespace rpc -} // namespace chip diff --git a/examples/platform/nxp/se05x/linux/AppMain.cpp b/examples/platform/nxp/se05x/linux/AppMain.cpp index 1ecf8052100a54..5ae726604a4c8a 100644 --- a/examples/platform/nxp/se05x/linux/AppMain.cpp +++ b/examples/platform/nxp/se05x/linux/AppMain.cpp @@ -60,7 +60,7 @@ #endif #if defined(PW_RPC_ENABLED) -#include +#include #endif #if CHIP_CONFIG_TRANSPORT_TRACE_ENABLED diff --git a/examples/platform/nxp/se05x/linux/BUILD.gn b/examples/platform/nxp/se05x/linux/BUILD.gn index 4956883bcec584..52ce3d417617e5 100644 --- a/examples/platform/nxp/se05x/linux/BUILD.gn +++ b/examples/platform/nxp/se05x/linux/BUILD.gn @@ -108,8 +108,6 @@ source_set("commissioner-main") { "${chip_root}/src/app/server", "${chip_root}/src/credentials:default_attestation_verifier", "${chip_root}/src/lib", - "${chip_root}/src/lib/shell", - "${chip_root}/src/lib/shell:shell_core", ] if (chip_enable_transport_trace) { diff --git a/examples/tv-app/linux/AppImpl.cpp b/examples/tv-app/linux/AppImpl.cpp index 9ecb9bcb39d0c4..a07eeadaeb029a 100644 --- a/examples/tv-app/linux/AppImpl.cpp +++ b/examples/tv-app/linux/AppImpl.cpp @@ -32,9 +32,6 @@ #include #include #include -#include -#include -#include #include #include #include diff --git a/examples/tv-app/linux/BUILD.gn b/examples/tv-app/linux/BUILD.gn index 35f4af6c4542d7..c77a4feb75407d 100644 --- a/examples/tv-app/linux/BUILD.gn +++ b/examples/tv-app/linux/BUILD.gn @@ -14,28 +14,16 @@ import("//build_overrides/build.gni") import("//build_overrides/chip.gni") -import("args.gni") - import("${chip_root}/build/chip/tools.gni") +import("${chip_root}/src/lib/lib.gni") assert(chip_build_tools) -config("config") { - include_dirs = [ - ".", - "${chip_root}/zzz_generated/chip-tv-app", - "${chip_root}/src/lib", - ] - - cflags = [ "-Wconversion" ] -} - executable("chip-tv-app") { sources = [ "${chip_root}/examples/tv-app/tv-common/include/CHIPProjectAppConfig.h", "AppImpl.cpp", "AppImpl.h", - "AppPlatformShellCommands.cpp", "ZclCallbacks.cpp", "include/account-login/AccountLoginManager.cpp", "include/account-login/AccountLoginManager.h", @@ -74,11 +62,16 @@ executable("chip-tv-app") { ] cflags = [ "-Wconversion" ] - - public_configs = [ ":config" ] + defines = [] + include_dirs = [ + ".", + "${chip_root}/zzz_generated/chip-tv-app", + "${chip_root}/src/lib", + ] if (chip_build_libshell) { - cflags += [ "-DENABLE_CHIP_SHELL" ] + defines += [ "ENABLE_CHIP_SHELL" ] + sources += [ "AppPlatformShellCommands.cpp" ] } output_dir = root_out_dir diff --git a/examples/tv-app/linux/main.cpp b/examples/tv-app/linux/main.cpp index 31d15a41a8421e..2609d9a2f3c6f4 100644 --- a/examples/tv-app/linux/main.cpp +++ b/examples/tv-app/linux/main.cpp @@ -41,7 +41,7 @@ #include "include/wake-on-lan/WakeOnLanManager.h" #if defined(ENABLE_CHIP_SHELL) -#include +#include // nogncheck #endif using namespace chip; diff --git a/examples/tv-casting-app/linux/BUILD.gn b/examples/tv-casting-app/linux/BUILD.gn index 0f6f12c50dd022..52d8f77cca6f65 100644 --- a/examples/tv-casting-app/linux/BUILD.gn +++ b/examples/tv-casting-app/linux/BUILD.gn @@ -14,17 +14,14 @@ import("//build_overrides/build.gni") import("//build_overrides/chip.gni") -import("args.gni") - import("${chip_root}/build/chip/tools.gni") +import("${chip_root}/src/lib/lib.gni") assert(chip_build_tools) executable("chip-tv-casting-app") { sources = [ "${chip_root}/examples/tv-casting-app/tv-casting-common/include/CHIPProjectAppConfig.h", - "CastingShellCommands.cpp", - "CastingShellCommands.h", "CastingUtils.cpp", "CastingUtils.h", "main.cpp", @@ -39,13 +36,18 @@ executable("chip-tv-casting-app") { "${chip_root}/third_party/jsoncpp", ] + defines = [] include_dirs = [ "${chip_root}/examples/tv-casting-app/tv-casting-common/include" ] cflags = [ "-Wconversion" ] if (chip_build_libshell) { - cflags += [ "-DENABLE_CHIP_SHELL" ] + defines += [ "ENABLE_CHIP_SHELL" ] + sources += [ + "CastingShellCommands.cpp", + "CastingShellCommands.h", + ] } output_dir = root_out_dir diff --git a/examples/tv-casting-app/linux/main.cpp b/examples/tv-casting-app/linux/main.cpp index 6fa224518bedd1..45c53c842568f8 100644 --- a/examples/tv-casting-app/linux/main.cpp +++ b/examples/tv-casting-app/linux/main.cpp @@ -25,7 +25,7 @@ #include "CastingUtils.h" #if defined(ENABLE_CHIP_SHELL) #include "CastingShellCommands.h" -#include +#include // nogncheck #include #endif diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml index 411ae1825f67a5..5c1d09c5f555ad 100644 --- a/integrations/cloudbuild/smoke-test.yaml +++ b/integrations/cloudbuild/smoke-test.yaml @@ -29,6 +29,7 @@ steps: args: - >- ./scripts/build/build_examples.py --enable-flashbundle --target + esp32-devkitc-light-rpc --target esp32-m5stack-all-clusters-ipv6only --target esp32-m5stack-all-clusters-rpc --target esp32-m5stack-light --target diff --git a/integrations/docker/images/chip-build-ameba/Dockerfile b/integrations/docker/images/chip-build-ameba/Dockerfile index bead6e74382730..fbd1f9747c58bb 100644 --- a/integrations/docker/images/chip-build-ameba/Dockerfile +++ b/integrations/docker/images/chip-build-ameba/Dockerfile @@ -3,7 +3,7 @@ FROM connectedhomeip/chip-build:${VERSION} # Setup Ameba ARG AMEBA_DIR=/opt/ameba -ARG TAG_NAME=ameba_update_2023_05_05 +ARG TAG_NAME=ameba_update_2023_05_12 RUN set -x \ && apt-get update \ && mkdir ${AMEBA_DIR} \ diff --git a/integrations/docker/images/chip-build-asr/Dockerfile b/integrations/docker/images/chip-build-asr/Dockerfile new file mode 100644 index 00000000000000..c03a5533856241 --- /dev/null +++ b/integrations/docker/images/chip-build-asr/Dockerfile @@ -0,0 +1,20 @@ +ARG VERSION=latest +FROM connectedhomeip/chip-build:${VERSION} + +# Setup ASR +ARG ASR_DIR=/opt/asr +RUN set -x \ + && apt-get update \ + && apt-get install -y git git-lfs \ + && mkdir ${ASR_DIR} \ + && cd ${ASR_DIR} \ + && git clone --depth=1 https://github.com/asriot/Tools.git \ + && cd Tools \ + && git lfs pull \ + && cd toolchain \ + && tar -jxvf gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 \ + && mkdir -p asr_riscv_gnu_toolchain_10.2_ubuntu-16.04 \ + && tar -jxvf asr_riscv_gnu_toolchain_10.2_ubuntu-16.04.tar.bz2 -C asr_riscv_gnu_toolchain_10.2_ubuntu-16.04/ \ + && : # last line + +ENV ASR_TOOLCHAIN_PATH=${ASR_DIR}/Tools/toolchain/gcc-arm-none-eabi-9-2019-q4-major/bin/ diff --git a/integrations/docker/images/chip-build-asr/build.sh b/integrations/docker/images/chip-build-asr/build.sh new file mode 120000 index 00000000000000..fcb4d4ee75d531 --- /dev/null +++ b/integrations/docker/images/chip-build-asr/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-asr/run.sh b/integrations/docker/images/chip-build-asr/run.sh new file mode 120000 index 00000000000000..ccbd3501b330d9 --- /dev/null +++ b/integrations/docker/images/chip-build-asr/run.sh @@ -0,0 +1 @@ +../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-asr/version b/integrations/docker/images/chip-build-asr/version new file mode 120000 index 00000000000000..a4280acd348e7f --- /dev/null +++ b/integrations/docker/images/chip-build-asr/version @@ -0,0 +1 @@ +../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-crosscompile/Dockerfile b/integrations/docker/images/chip-build-crosscompile/Dockerfile index 59e023ea16f688..0dfb3328b79798 100644 --- a/integrations/docker/images/chip-build-crosscompile/Dockerfile +++ b/integrations/docker/images/chip-build-crosscompile/Dockerfile @@ -15,19 +15,19 @@ WORKDIR /opt RUN set -x \ && git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git /opt/depot_tools \ # TODO: Remove experimental solution to create the sysroot file in cross-compile image - && echo 'experimental/matter/sysroot/ubuntu-21.04-aarch64 latest' > ensure_file.txt \ + && echo 'experimental/matter/sysroot/ubuntu-22.04.1-aarch64 latest' > ensure_file.txt \ && ./depot_tools/cipd ensure -ensure-file ensure_file.txt -root ./ \ - && tar xfvJ ubuntu-21.04-aarch64-sysroot.tar.xz \ - && rm -rf /opt/ubuntu-21.04-aarch64-sysroot/usr/lib/firmware \ - && rm -rf /opt/ubuntu-21.04-aarch64-sysroot/usr/lib/git-core \ - && rm -rf /opt/ubuntu-21.04-aarch64-sysroot/usr/lib/modules \ - && rm -rf /opt/ubuntu-21.04-aarch64-sysroot/lib/firmware \ - && rm -rf /opt/ubuntu-21.04-aarch64-sysroot/lib/git-core \ - && rm -rf /opt/ubuntu-21.04-aarch64-sysroot/lib/modules \ + && tar xfvJ ubuntu-22.04.1-aarch64-sysroot.tar.xz \ + && rm -rf /opt/ubuntu-22.04.1-aarch64-sysroot/usr/lib/firmware \ + && rm -rf /opt/ubuntu-22.04.1-aarch64-sysroot/usr/lib/git-core \ + && rm -rf /opt/ubuntu-22.04.1-aarch64-sysroot/usr/lib/modules \ + && rm -rf /opt/ubuntu-22.04.1-aarch64-sysroot/lib/firmware \ + && rm -rf /opt/ubuntu-22.04.1-aarch64-sysroot/lib/git-core \ + && rm -rf /opt/ubuntu-22.04.1-aarch64-sysroot/lib/modules \ && : # last line FROM connectedhomeip/chip-build:${VERSION} -COPY --from=build /opt/ubuntu-21.04-aarch64-sysroot/ /opt/ubuntu-21.04-aarch64-sysroot/ +COPY --from=build /opt/ubuntu-22.04.1-aarch64-sysroot/ /opt/ubuntu-22.04.1-aarch64-sysroot/ -ENV SYSROOT_AARCH64=/opt/ubuntu-21.04-aarch64-sysroot +ENV SYSROOT_AARCH64=/opt/ubuntu-22.04.1-aarch64-sysroot diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile index d0e45d41b41b75..276c5959f8e812 100644 --- a/integrations/docker/images/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/chip-build-vscode/Dockerfile @@ -14,6 +14,7 @@ FROM connectedhomeip/chip-build-imx:${VERSION} AS imx FROM connectedhomeip/chip-build-ti:${VERSION} AS ti FROM connectedhomeip/chip-build-openiotsdk:${VERSION} AS openiotsdk FROM connectedhomeip/chip-build-bouffalolab:${VERSION} AS bouffalolab +FROM connectedhomeip/chip-build-asr:${VERSION} AS asr FROM connectedhomeip/chip-build:${VERSION} # qemu-src copied over because qemu directory contains symlinks to the src @@ -39,7 +40,7 @@ COPY --from=telink /opt/telink/zephyr-sdk-0.15.2 /opt/telink/zephyr-sdk-0.15.2 COPY --from=tizen /opt/tizen-sdk /opt/tizen-sdk -COPY --from=crosscompile /opt/ubuntu-21.04-aarch64-sysroot /opt/ubuntu-21.04-aarch64-sysroot +COPY --from=crosscompile /opt/ubuntu-22.04.1-aarch64-sysroot /opt/ubuntu-22.04.1-aarch64-sysroot COPY --from=ameba /opt/ameba /opt/ameba @@ -49,11 +50,12 @@ COPY --from=imx /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland COPY --from=ti /opt/ti/sysconfig_1.13.0 /opt/ti/sysconfig_1.13.0 -COPY --from=openiotsdk /opt/gcc-arm-none-eabi-10.3-2021.10/ /opt/gcc-arm-none-eabi-10.3-2021.10/ COPY --from=openiotsdk /opt/FVP_Corstone_SSE-300/ /opt/FVP_Corstone_SSE-300/ COPY --from=bouffalolab /opt/bouffalolab_sdk /opt/bouffalolab_sdk +COPY --from=asr /opt/asr /opt/asr + # Android license file "acceping" is done by writing license hashes # into the 'licenses' subfolder. This allows any user (in particular # 'vscode' to accept licenses) @@ -102,7 +104,7 @@ ENV OPENOCD_PATH=/opt/openocd/ ENV PW_ENVIRONMENT_ROOT=/home/vscode/pigweed/env ENV QEMU_ESP32=/opt/espressif/qemu/xtensa-softmmu/qemu-system-xtensa ENV QEMU_ESP32_DIR=/opt/espressif/qemu -ENV SYSROOT_AARCH64=/opt/ubuntu-21.04-aarch64-sysroot +ENV SYSROOT_AARCH64=/opt/ubuntu-22.04.1-aarch64-sysroot ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.15.2 ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.13.0 @@ -116,3 +118,4 @@ ENV TIZEN_SDK_SYSROOT $TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/mobile/root ENV FVP_CORSTONE_300_PATH=/opt/FVP_Corstone_SSE-300 ENV BOUFFALOLAB_SDK_ROOT=/opt/bouffalolab_sdk +ENV ASR_TOOLCHAIN_PATH=/opt/asr/Tools/toolchain/gcc-arm-none-eabi-9-2019-q4-major/bin/ diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version index 4930e0379db757..e330c9368becf5 100644 --- a/integrations/docker/images/chip-build/version +++ b/integrations/docker/images/chip-build/version @@ -1 +1 @@ -0.7.5 Version bump reason: [OIS] Remove GCC toolchain +0.7.9 Version bump reason: Fix path for sysroot for crosscompile image diff --git a/scripts/py_matter_idl/matter_idl/generators/java/ClusterReadMapping.jinja b/scripts/py_matter_idl/matter_idl/generators/java/ClusterReadMapping.jinja index 4d65cbad1b5413..05bab57d3c88fc 100644 --- a/scripts/py_matter_idl/matter_idl/generators/java/ClusterReadMapping.jinja +++ b/scripts/py_matter_idl/matter_idl/generators/java/ClusterReadMapping.jinja @@ -23,13 +23,12 @@ import java.util.LinkedHashMap; import java.util.Map; public class ClusterReadMapping { - public Map> getReadAttributeMap() { - Map> readAttributeMap = new HashMap<>(); - {%- for cluster in clientClusters | sort(attribute='code') %} - {%- set typeLookup = idl | createLookupContext(cluster) %} - Map read{{cluster.name}}InteractionInfo = new LinkedHashMap<>(); - {%- for attribute in cluster.attributes | sort(attribute='name') | attributesWithCallback(typeLookup) %} +{% for cluster in clientClusters | sort(attribute='code') %} + {%- set typeLookup = idl | createLookupContext(cluster) %} + private static Map read{{cluster.name}}InteractionInfo() { + Map result = new LinkedHashMap<>(); + {%- for attribute in cluster.attributes | sort(attribute='name') | attributesWithCallback(typeLookup) %} {#- TODO: add support for struct-typed attributes -#} Map read{{cluster.name}}{{attribute.definition.name | upfirst}}CommandParams = new LinkedHashMap(); InteractionInfo read{{cluster.name}}{{attribute.definition.name | upfirst}}AttributeInteractionInfo = new InteractionInfo( @@ -41,11 +40,20 @@ public class ClusterReadMapping { () -> new ClusterInfoMapping.{{ attribute | delegatedCallbackName(typeLookup)}}(), read{{cluster.name}}{{attribute.definition.name | upfirst}}CommandParams ); - read{{cluster.name}}InteractionInfo.put("read{{attribute.definition.name | upfirst}}Attribute", read{{cluster.name}}{{attribute.definition.name | upfirst}}AttributeInteractionInfo); - {%- endfor %} - readAttributeMap.put("{{cluster.name | lowfirst_except_acronym}}", read{{cluster.name}}InteractionInfo); + result.put("read{{attribute.definition.name | upfirst}}Attribute", read{{cluster.name}}{{attribute.definition.name | upfirst}}AttributeInteractionInfo); + {% endfor %} + return result; + } + +{%- endfor %} + @SuppressWarnings("serial") + public Map> getReadAttributeMap() { + + return new HashMap>(){% raw %}{{{% endraw %} + {%- for cluster in clientClusters | sort(attribute='code') %} + put("{{cluster.name | lowfirst_except_acronym}}", read{{cluster.name}}InteractionInfo()); {%- endfor -%} - return readAttributeMap; + }}; } } diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ClusterReadMapping.java b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ClusterReadMapping.java index adb4b973b2e2ee..e57dd4a37828d9 100644 --- a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ClusterReadMapping.java +++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/java/ClusterReadMapping.java @@ -23,9 +23,10 @@ import java.util.Map; public class ClusterReadMapping { - public Map> getReadAttributeMap() { - Map> readAttributeMap = new HashMap<>(); - Map readFirstInteractionInfo = new LinkedHashMap<>();Map readFirstSomeIntegerCommandParams = new LinkedHashMap(); + + + private static Map readFirstInteractionInfo() { + Map result = new LinkedHashMap<>();Map readFirstSomeIntegerCommandParams = new LinkedHashMap(); InteractionInfo readFirstSomeIntegerAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.FirstCluster) cluster).readSomeIntegerAttribute( @@ -35,9 +36,12 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readFirstSomeIntegerCommandParams ); - readFirstInteractionInfo.put("readSomeIntegerAttribute", readFirstSomeIntegerAttributeInteractionInfo); - readAttributeMap.put("first", readFirstInteractionInfo); - Map readSecondInteractionInfo = new LinkedHashMap<>();Map readSecondSomeBytesCommandParams = new LinkedHashMap(); + result.put("readSomeIntegerAttribute", readFirstSomeIntegerAttributeInteractionInfo); + + return result; + } + private static Map readSecondInteractionInfo() { + Map result = new LinkedHashMap<>();Map readSecondSomeBytesCommandParams = new LinkedHashMap(); InteractionInfo readSecondSomeBytesAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.SecondCluster) cluster).readSomeBytesAttribute( @@ -47,9 +51,12 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(), readSecondSomeBytesCommandParams ); - readSecondInteractionInfo.put("readSomeBytesAttribute", readSecondSomeBytesAttributeInteractionInfo); - readAttributeMap.put("second", readSecondInteractionInfo); - Map readThirdInteractionInfo = new LinkedHashMap<>();Map readThirdSomeEnumCommandParams = new LinkedHashMap(); + result.put("readSomeBytesAttribute", readSecondSomeBytesAttributeInteractionInfo); + + return result; + } + private static Map readThirdInteractionInfo() { + Map result = new LinkedHashMap<>();Map readThirdSomeEnumCommandParams = new LinkedHashMap(); InteractionInfo readThirdSomeEnumAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.ThirdCluster) cluster).readSomeEnumAttribute( @@ -59,7 +66,8 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThirdSomeEnumCommandParams ); - readThirdInteractionInfo.put("readSomeEnumAttribute", readThirdSomeEnumAttributeInteractionInfo);Map readThirdOptionsCommandParams = new LinkedHashMap(); + result.put("readSomeEnumAttribute", readThirdSomeEnumAttributeInteractionInfo); + Map readThirdOptionsCommandParams = new LinkedHashMap(); InteractionInfo readThirdOptionsAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.ThirdCluster) cluster).readOptionsAttribute( @@ -69,8 +77,17 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThirdOptionsCommandParams ); - readThirdInteractionInfo.put("readOptionsAttribute", readThirdOptionsAttributeInteractionInfo); - readAttributeMap.put("third", readThirdInteractionInfo);return readAttributeMap; + result.put("readOptionsAttribute", readThirdOptionsAttributeInteractionInfo); + + return result; + } + @SuppressWarnings("serial") + public Map> getReadAttributeMap() { + + return new HashMap>(){{ + put("first", readFirstInteractionInfo()); + put("second", readSecondInteractionInfo()); + put("third", readThirdInteractionInfo());}}; } } diff --git a/scripts/py_matter_yamltests/matter_yamltests/parser_builder.py b/scripts/py_matter_yamltests/matter_yamltests/parser_builder.py index 72ebae6a1fff8f..2305900d5a1435 100644 --- a/scripts/py_matter_yamltests/matter_yamltests/parser_builder.py +++ b/scripts/py_matter_yamltests/matter_yamltests/parser_builder.py @@ -66,7 +66,7 @@ def __init__(self, config: TestParserBuilderConfig = TestParserBuilderConfig()): self.__tests = copy.copy(config.tests) self.__config = config self.__duration = 0 - self.__done = False + self.done = False def __iter__(self): self.__config.hooks.start(len(self.__tests)) @@ -76,9 +76,9 @@ def __next__(self): if len(self.__tests): return self.__get_test_parser(self.__tests.pop(0)) - if not self.__done: + if not self.done: self.__config.hooks.stop(round(self.__duration)) - self.__done = True + self.done = True raise StopIteration diff --git a/scripts/py_matter_yamltests/matter_yamltests/runner.py b/scripts/py_matter_yamltests/matter_yamltests/runner.py index fe4a091bc9676f..f87f94d53dc993 100644 --- a/scripts/py_matter_yamltests/matter_yamltests/runner.py +++ b/scripts/py_matter_yamltests/matter_yamltests/runner.py @@ -155,7 +155,7 @@ def run(self, parser_builder_config: TestParserBuilderConfig, runner_config: Tes duration = round((time.time() - start) * 1000) runner_config.hooks.stop(duration) - return True + return parser_builder.done async def _run(self, parser: TestParser, config: TestRunnerConfig): status = True diff --git a/scripts/setup/requirements.esp32.txt b/scripts/setup/requirements.esp32.txt index d846ba4de30f5c..b9b2ddf6afa96d 100644 --- a/scripts/setup/requirements.esp32.txt +++ b/scripts/setup/requirements.esp32.txt @@ -9,4 +9,4 @@ ecdsa>=0.16.0 kconfiglib==13.7.1 construct==2.10.54 python-socketio<5 -gdbgui==0.13.2.0 ; platform_machine != 'aarch64' and sys_platform == 'linux' +gdbgui==0.13.2.0 ; python_version < "3.11" and platform_machine != 'aarch64' and sys_platform == 'linux' diff --git a/scripts/tools/memory/gh_report.py b/scripts/tools/memory/gh_report.py index c35c3e53840be4..ddaa23a45e79ba 100755 --- a/scripts/tools/memory/gh_report.py +++ b/scripts/tools/memory/gh_report.py @@ -375,8 +375,10 @@ def merge(df: pd.DataFrame, comment) -> pd.DataFrame: cols, rows = memdf.util.markdown.read_hierified(body) break logging.debug('REC: read %d rows', len(rows)) + attrs = df.attrs df = pd.concat([df, pd.DataFrame(data=rows, columns=cols).astype(df.dtypes)], ignore_index=True) + df.attrs = attrs return df.sort_values( by=['platform', 'target', 'config', 'section']).drop_duplicates() diff --git a/scripts/tools/zap/update_cluster_revisions.py b/scripts/tools/zap/update_cluster_revisions.py new file mode 100755 index 00000000000000..e29a274cf47087 --- /dev/null +++ b/scripts/tools/zap/update_cluster_revisions.py @@ -0,0 +1,154 @@ +#!/usr/bin/env python3 +# +# Copyright (c) 2020 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +import argparse +import json +import logging +import multiprocessing +import os +import subprocess +import sys +from pathlib import Path + +CHIP_ROOT_DIR = os.path.realpath( + os.path.join(os.path.dirname(__file__), '../../..')) + + +def getTargets(): + ROOTS_TO_SEARCH = [ + './examples', + './src/controller/data_model', + './scripts/tools/zap/tests/inputs', + ] + + targets = [] + for root in ROOTS_TO_SEARCH: + for filepath in Path(root).rglob('*.zap'): + targets.append(filepath) + + return targets + + +def checkPythonVersion(): + if sys.version_info[0] < 3: + print('Must use Python 3. Current version is ' + + str(sys.version_info[0])) + exit(1) + + +def runArgumentsParser(): + parser = argparse.ArgumentParser( + description='Update the ClusterRevision for a chosen cluster in all .zap files') + parser.add_argument('--cluster-id', default=None, action='store', + help='The id of the cluster, as hex, for which the cluster revision should be updated.') + parser.add_argument('--new-revision', default=None, action='store', + help='The new cluster revision as a decimal integer') + parser.add_argument('--old-revision', default=None, action='store', + help='If set, only clusters with this old revision will be updated. This is a decimal integer.') + parser.add_argument('--dry-run', default=False, action='store_true', + help="Don't do any generation, just log what .zap files would be updated (default: False)") + parser.add_argument('--parallel', action='store_true') + parser.add_argument('--no-parallel', action='store_false', dest='parallel') + parser.set_defaults(parallel=True) + + args = parser.parse_args() + + if args.cluster_id is None: + logging.error("Must have a cluster id") + sys.exit(1) + + if args.new_revision is None: + logging.error("Must have a new cluster revision") + sys.exit(1) + + args.cluster_id = int(args.cluster_id, 16) + + return args + + +def isClusterRevisionAttribute(attribute): + if attribute['mfgCode'] is not None: + return False + + if attribute['code'] != 0xFFFD: + return False + + if attribute['name'] != "ClusterRevision": + logging.error("Attribute has ClusterRevision id but wrong name") + return False + + return True + + +def updateOne(item): + """ + Helper method that may be run in parallel to update a single target. + """ + (args, target) = item + + with open(target, "r") as file: + data = json.load(file) + + for endpointType in data['endpointTypes']: + for cluster in endpointType['clusters']: + if cluster['mfgCode'] is None and cluster['code'] == args.cluster_id: + for attribute in cluster['attributes']: + if isClusterRevisionAttribute(attribute): + if args.old_revision is None or attribute['defaultValue'] == args.old_revision: + attribute['defaultValue'] = args.new_revision + + with open(target, "w") as file: + json.dump(data, file) + + # Now run convert.py on the file to have ZAP reformat it however it likes. + subprocess.check_call(['./scripts/tools/zap/convert.py', target]) + + +def main(): + checkPythonVersion() + + logging.basicConfig( + level=logging.INFO, + format='%(asctime)s %(name)s %(levelname)-7s %(message)s' + ) + + args = runArgumentsParser() + + os.chdir(CHIP_ROOT_DIR) + + targets = getTargets() + + if args.dry_run: + for target in targets: + print(f"Will try to update: {target}") + sys.exit(0) + + items = [(args, target) for target in targets] + + if args.parallel: + # Ensure each zap run is independent + os.environ['ZAP_TEMPSTATE'] = '1' + with multiprocessing.Pool() as pool: + for _ in pool.imap_unordered(updateOne, items): + pass + else: + for item in items: + updateOne(item) + + +if __name__ == '__main__': + main() diff --git a/scripts/tools/zap_convert_all.py b/scripts/tools/zap_convert_all.py index 677067c93dc123..ba456ca1efeb90 100755 --- a/scripts/tools/zap_convert_all.py +++ b/scripts/tools/zap_convert_all.py @@ -105,7 +105,7 @@ def main(): pass else: for target in targets: - generateOne(target) + convertOne(target) if __name__ == '__main__': diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni index 8b85c353ec7bc2..4fff92c4eaf5ff 100644 --- a/src/app/chip_data_model.gni +++ b/src/app/chip_data_model.gni @@ -15,14 +15,11 @@ import("//build_overrides/build.gni") import("//build_overrides/chip.gni") import("${chip_root}/build/chip/chip_codegen.gni") -import("${chip_root}/src/platform/python.gni") - import("${chip_root}/src/lib/core/core.gni") +import("${chip_root}/src/platform/python.gni") _app_root = get_path_info(".", "abspath") -_zap_cluster_list_script = get_path_info("zap_cluster_list.py", "abspath") - # Defines a source_set for CHIP data model. # # Arguments: @@ -193,12 +190,9 @@ template("chip_data_model") { ] if (defined(invoker.zap_file)) { - _zap_path = rebase_path(invoker.zap_file, root_build_dir) - _script_path = rebase_path(_zap_cluster_list_script, root_build_dir) - _script_args = [ "--zap_file=" + _zap_path ] - - _cluster_sources = exec_script("${build_root}/gn_run_binary.py", - [ _script_path ] + _script_args, + _zap_file = rebase_path(invoker.zap_file, root_build_dir) + _cluster_sources = exec_script("${_app_root}/zap_cluster_list.py", + [ "--zap_file=" + _zap_file ], "list lines", [ invoker.zap_file ]) } diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml index be554e8e2d2671..8e091aa7f42ecd 100644 --- a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml +++ b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml @@ -1852,6 +1852,33 @@ limitations under the License. + + MA-room-airconditioner + CHIP + Matter Room Air Conditioner + 0x0103 + 0x0072 + + + IDENTIFY_TIME + IDENTIFY_TYPE + Identify + + + ON_OFF + Off + On + Toggle + + + + + + + + + + MA-all-clusters-app CHIP diff --git a/src/controller/CHIPDeviceControllerFactory.cpp b/src/controller/CHIPDeviceControllerFactory.cpp index 6ae3b72464ddd1..d2edbd840894dc 100644 --- a/src/controller/CHIPDeviceControllerFactory.cpp +++ b/src/controller/CHIPDeviceControllerFactory.cpp @@ -58,11 +58,12 @@ CHIP_ERROR DeviceControllerFactory::Init(FactoryInitParams params) // Save our initialization state that we can't recover later from a // created-but-shut-down system state. - mListenPort = params.listenPort; - mFabricIndependentStorage = params.fabricIndependentStorage; - mOperationalKeystore = params.operationalKeystore; - mOpCertStore = params.opCertStore; - mEnableServerInteractions = params.enableServerInteractions; + mListenPort = params.listenPort; + mFabricIndependentStorage = params.fabricIndependentStorage; + mOperationalKeystore = params.operationalKeystore; + mOpCertStore = params.opCertStore; + mCertificateValidityPolicy = params.certificateValidityPolicy; + mEnableServerInteractions = params.enableServerInteractions; CHIP_ERROR err = InitSystemState(params); @@ -82,14 +83,15 @@ CHIP_ERROR DeviceControllerFactory::InitSystemState() #if CONFIG_NETWORK_LAYER_BLE params.bleLayer = mSystemState->BleLayer(); #endif - params.listenPort = mListenPort; - params.fabricIndependentStorage = mFabricIndependentStorage; - params.enableServerInteractions = mEnableServerInteractions; - params.groupDataProvider = mSystemState->GetGroupDataProvider(); - params.sessionKeystore = mSystemState->GetSessionKeystore(); - params.fabricTable = mSystemState->Fabrics(); - params.operationalKeystore = mOperationalKeystore; - params.opCertStore = mOpCertStore; + params.listenPort = mListenPort; + params.fabricIndependentStorage = mFabricIndependentStorage; + params.enableServerInteractions = mEnableServerInteractions; + params.groupDataProvider = mSystemState->GetGroupDataProvider(); + params.sessionKeystore = mSystemState->GetSessionKeystore(); + params.fabricTable = mSystemState->Fabrics(); + params.operationalKeystore = mOperationalKeystore; + params.opCertStore = mOpCertStore; + params.certificateValidityPolicy = mCertificateValidityPolicy; } return InitSystemState(params); @@ -363,9 +365,10 @@ void DeviceControllerFactory::Shutdown() Platform::Delete(mSystemState); mSystemState = nullptr; } - mFabricIndependentStorage = nullptr; - mOperationalKeystore = nullptr; - mOpCertStore = nullptr; + mFabricIndependentStorage = nullptr; + mOperationalKeystore = nullptr; + mOpCertStore = nullptr; + mCertificateValidityPolicy = nullptr; } void DeviceControllerSystemState::Shutdown() diff --git a/src/controller/CHIPDeviceControllerFactory.h b/src/controller/CHIPDeviceControllerFactory.h index a1c41e9fcfa370..11f84e6a42c58b 100644 --- a/src/controller/CHIPDeviceControllerFactory.h +++ b/src/controller/CHIPDeviceControllerFactory.h @@ -251,11 +251,12 @@ class DeviceControllerFactory CHIP_ERROR InitSystemState(); uint16_t mListenPort; - DeviceControllerSystemState * mSystemState = nullptr; - PersistentStorageDelegate * mFabricIndependentStorage = nullptr; - Crypto::OperationalKeystore * mOperationalKeystore = nullptr; - Credentials::OperationalCertificateStore * mOpCertStore = nullptr; - bool mEnableServerInteractions = false; + DeviceControllerSystemState * mSystemState = nullptr; + PersistentStorageDelegate * mFabricIndependentStorage = nullptr; + Crypto::OperationalKeystore * mOperationalKeystore = nullptr; + Credentials::OperationalCertificateStore * mOpCertStore = nullptr; + Credentials::CertificateValidityPolicy * mCertificateValidityPolicy = nullptr; + bool mEnableServerInteractions = false; }; } // namespace Controller diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp index b12d31b7d81ca5..9b40721795d0a4 100644 --- a/src/controller/java/CHIPDeviceController-JNI.cpp +++ b/src/controller/java/CHIPDeviceController-JNI.cpp @@ -653,6 +653,42 @@ JNI_METHOD(void, pairDeviceWithAddress) } } +JNI_METHOD(void, pairDeviceWithCode) +(JNIEnv * env, jobject self, jlong handle, jlong deviceId, jstring setUpCode, jbyteArray csrNonce, jobject networkCredentials) +{ + chip::DeviceLayer::StackLock lock; + CHIP_ERROR err = CHIP_NO_ERROR; + AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle); + + ChipLogProgress(Controller, "pairDeviceWithCode() called"); + + JniUtfString setUpCodeJniString(env, setUpCode); + + CommissioningParameters commissioningParams = wrapper->GetCommissioningParameters(); + if (csrNonce != nullptr) + { + JniByteArray jniCsrNonce(env, csrNonce); + commissioningParams.SetCSRNonce(jniCsrNonce.byteSpan()); + } + + if (networkCredentials != nullptr) + { + wrapper->ApplyNetworkCredentials(commissioningParams, networkCredentials); + } + + if (wrapper->GetDeviceAttestationDelegateBridge() != nullptr) + { + commissioningParams.SetDeviceAttestationDelegate(wrapper->GetDeviceAttestationDelegateBridge()); + } + err = wrapper->Controller()->PairDevice(deviceId, setUpCodeJniString.c_str(), commissioningParams, DiscoveryType::kAll); + + if (err != CHIP_NO_ERROR) + { + ChipLogError(Controller, "Failed to pair the device."); + JniReferences::GetInstance().ThrowError(env, sChipDeviceControllerExceptionCls, err); + } +} + JNI_METHOD(void, establishPaseConnection)(JNIEnv * env, jobject self, jlong handle, jlong deviceId, jint connObj, jlong pinCode) { chip::DeviceLayer::StackLock lock; diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java index 7f6ec70bd29dc8..512faa3af8b67e 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java @@ -23,9 +23,9 @@ import java.util.Map; public class ClusterReadMapping { - public Map> getReadAttributeMap() { - Map> readAttributeMap = new HashMap<>(); - Map readIdentifyInteractionInfo = new LinkedHashMap<>(); + + private static Map readIdentifyInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readIdentifyIdentifyTimeCommandParams = new LinkedHashMap(); InteractionInfo readIdentifyIdentifyTimeAttributeInteractionInfo = @@ -36,8 +36,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readIdentifyIdentifyTimeCommandParams); - readIdentifyInteractionInfo.put( - "readIdentifyTimeAttribute", readIdentifyIdentifyTimeAttributeInteractionInfo); + result.put("readIdentifyTimeAttribute", readIdentifyIdentifyTimeAttributeInteractionInfo); Map readIdentifyIdentifyTypeCommandParams = new LinkedHashMap(); InteractionInfo readIdentifyIdentifyTypeAttributeInteractionInfo = @@ -48,8 +47,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readIdentifyIdentifyTypeCommandParams); - readIdentifyInteractionInfo.put( - "readIdentifyTypeAttribute", readIdentifyIdentifyTypeAttributeInteractionInfo); + result.put("readIdentifyTypeAttribute", readIdentifyIdentifyTypeAttributeInteractionInfo); Map readIdentifyGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readIdentifyGeneratedCommandListAttributeInteractionInfo = @@ -64,7 +62,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedIdentifyClusterGeneratedCommandListAttributeCallback(), readIdentifyGeneratedCommandListCommandParams); - readIdentifyInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readIdentifyGeneratedCommandListAttributeInteractionInfo); Map readIdentifyAcceptedCommandListCommandParams = @@ -80,7 +78,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedIdentifyClusterAcceptedCommandListAttributeCallback(), readIdentifyAcceptedCommandListCommandParams); - readIdentifyInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readIdentifyAcceptedCommandListAttributeInteractionInfo); Map readIdentifyEventListCommandParams = @@ -94,8 +92,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIdentifyClusterEventListAttributeCallback(), readIdentifyEventListCommandParams); - readIdentifyInteractionInfo.put( - "readEventListAttribute", readIdentifyEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readIdentifyEventListAttributeInteractionInfo); Map readIdentifyAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readIdentifyAttributeListAttributeInteractionInfo = @@ -107,8 +104,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIdentifyClusterAttributeListAttributeCallback(), readIdentifyAttributeListCommandParams); - readIdentifyInteractionInfo.put( - "readAttributeListAttribute", readIdentifyAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readIdentifyAttributeListAttributeInteractionInfo); Map readIdentifyFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readIdentifyFeatureMapAttributeInteractionInfo = @@ -119,8 +115,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readIdentifyFeatureMapCommandParams); - readIdentifyInteractionInfo.put( - "readFeatureMapAttribute", readIdentifyFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readIdentifyFeatureMapAttributeInteractionInfo); Map readIdentifyClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readIdentifyClusterRevisionAttributeInteractionInfo = @@ -131,10 +126,13 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readIdentifyClusterRevisionCommandParams); - readIdentifyInteractionInfo.put( - "readClusterRevisionAttribute", readIdentifyClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("identify", readIdentifyInteractionInfo); - Map readGroupsInteractionInfo = new LinkedHashMap<>(); + result.put("readClusterRevisionAttribute", readIdentifyClusterRevisionAttributeInteractionInfo); + + return result; + } + + private static Map readGroupsInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readGroupsNameSupportCommandParams = new LinkedHashMap(); InteractionInfo readGroupsNameSupportAttributeInteractionInfo = @@ -145,8 +143,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readGroupsNameSupportCommandParams); - readGroupsInteractionInfo.put( - "readNameSupportAttribute", readGroupsNameSupportAttributeInteractionInfo); + result.put("readNameSupportAttribute", readGroupsNameSupportAttributeInteractionInfo); Map readGroupsGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readGroupsGeneratedCommandListAttributeInteractionInfo = @@ -160,7 +157,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGroupsClusterGeneratedCommandListAttributeCallback(), readGroupsGeneratedCommandListCommandParams); - readGroupsInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readGroupsGeneratedCommandListAttributeInteractionInfo); Map readGroupsAcceptedCommandListCommandParams = @@ -175,7 +172,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedGroupsClusterAcceptedCommandListAttributeCallback(), readGroupsAcceptedCommandListCommandParams); - readGroupsInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readGroupsAcceptedCommandListAttributeInteractionInfo); Map readGroupsEventListCommandParams = new LinkedHashMap(); @@ -188,8 +185,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedGroupsClusterEventListAttributeCallback(), readGroupsEventListCommandParams); - readGroupsInteractionInfo.put( - "readEventListAttribute", readGroupsEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readGroupsEventListAttributeInteractionInfo); Map readGroupsAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readGroupsAttributeListAttributeInteractionInfo = @@ -201,8 +197,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedGroupsClusterAttributeListAttributeCallback(), readGroupsAttributeListCommandParams); - readGroupsInteractionInfo.put( - "readAttributeListAttribute", readGroupsAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readGroupsAttributeListAttributeInteractionInfo); Map readGroupsFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readGroupsFeatureMapAttributeInteractionInfo = @@ -213,8 +208,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readGroupsFeatureMapCommandParams); - readGroupsInteractionInfo.put( - "readFeatureMapAttribute", readGroupsFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readGroupsFeatureMapAttributeInteractionInfo); Map readGroupsClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readGroupsClusterRevisionAttributeInteractionInfo = @@ -225,10 +219,13 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readGroupsClusterRevisionCommandParams); - readGroupsInteractionInfo.put( - "readClusterRevisionAttribute", readGroupsClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("groups", readGroupsInteractionInfo); - Map readScenesInteractionInfo = new LinkedHashMap<>(); + result.put("readClusterRevisionAttribute", readGroupsClusterRevisionAttributeInteractionInfo); + + return result; + } + + private static Map readScenesInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readScenesSceneCountCommandParams = new LinkedHashMap(); InteractionInfo readScenesSceneCountAttributeInteractionInfo = @@ -239,8 +236,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readScenesSceneCountCommandParams); - readScenesInteractionInfo.put( - "readSceneCountAttribute", readScenesSceneCountAttributeInteractionInfo); + result.put("readSceneCountAttribute", readScenesSceneCountAttributeInteractionInfo); Map readScenesCurrentSceneCommandParams = new LinkedHashMap(); InteractionInfo readScenesCurrentSceneAttributeInteractionInfo = @@ -251,8 +247,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readScenesCurrentSceneCommandParams); - readScenesInteractionInfo.put( - "readCurrentSceneAttribute", readScenesCurrentSceneAttributeInteractionInfo); + result.put("readCurrentSceneAttribute", readScenesCurrentSceneAttributeInteractionInfo); Map readScenesCurrentGroupCommandParams = new LinkedHashMap(); InteractionInfo readScenesCurrentGroupAttributeInteractionInfo = @@ -263,8 +258,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readScenesCurrentGroupCommandParams); - readScenesInteractionInfo.put( - "readCurrentGroupAttribute", readScenesCurrentGroupAttributeInteractionInfo); + result.put("readCurrentGroupAttribute", readScenesCurrentGroupAttributeInteractionInfo); Map readScenesSceneValidCommandParams = new LinkedHashMap(); InteractionInfo readScenesSceneValidAttributeInteractionInfo = @@ -275,8 +269,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readScenesSceneValidCommandParams); - readScenesInteractionInfo.put( - "readSceneValidAttribute", readScenesSceneValidAttributeInteractionInfo); + result.put("readSceneValidAttribute", readScenesSceneValidAttributeInteractionInfo); Map readScenesNameSupportCommandParams = new LinkedHashMap(); InteractionInfo readScenesNameSupportAttributeInteractionInfo = @@ -287,8 +280,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readScenesNameSupportCommandParams); - readScenesInteractionInfo.put( - "readNameSupportAttribute", readScenesNameSupportAttributeInteractionInfo); + result.put("readNameSupportAttribute", readScenesNameSupportAttributeInteractionInfo); Map readScenesLastConfiguredByCommandParams = new LinkedHashMap(); InteractionInfo readScenesLastConfiguredByAttributeInteractionInfo = @@ -300,8 +292,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedScenesClusterLastConfiguredByAttributeCallback(), readScenesLastConfiguredByCommandParams); - readScenesInteractionInfo.put( - "readLastConfiguredByAttribute", readScenesLastConfiguredByAttributeInteractionInfo); + result.put("readLastConfiguredByAttribute", readScenesLastConfiguredByAttributeInteractionInfo); Map readScenesGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readScenesGeneratedCommandListAttributeInteractionInfo = @@ -315,7 +306,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedScenesClusterGeneratedCommandListAttributeCallback(), readScenesGeneratedCommandListCommandParams); - readScenesInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readScenesGeneratedCommandListAttributeInteractionInfo); Map readScenesAcceptedCommandListCommandParams = @@ -330,7 +321,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedScenesClusterAcceptedCommandListAttributeCallback(), readScenesAcceptedCommandListCommandParams); - readScenesInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readScenesAcceptedCommandListAttributeInteractionInfo); Map readScenesEventListCommandParams = new LinkedHashMap(); @@ -343,8 +334,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedScenesClusterEventListAttributeCallback(), readScenesEventListCommandParams); - readScenesInteractionInfo.put( - "readEventListAttribute", readScenesEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readScenesEventListAttributeInteractionInfo); Map readScenesAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readScenesAttributeListAttributeInteractionInfo = @@ -356,8 +346,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedScenesClusterAttributeListAttributeCallback(), readScenesAttributeListCommandParams); - readScenesInteractionInfo.put( - "readAttributeListAttribute", readScenesAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readScenesAttributeListAttributeInteractionInfo); Map readScenesFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readScenesFeatureMapAttributeInteractionInfo = @@ -368,8 +357,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readScenesFeatureMapCommandParams); - readScenesInteractionInfo.put( - "readFeatureMapAttribute", readScenesFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readScenesFeatureMapAttributeInteractionInfo); Map readScenesClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readScenesClusterRevisionAttributeInteractionInfo = @@ -380,10 +368,13 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readScenesClusterRevisionCommandParams); - readScenesInteractionInfo.put( - "readClusterRevisionAttribute", readScenesClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("scenes", readScenesInteractionInfo); - Map readOnOffInteractionInfo = new LinkedHashMap<>(); + result.put("readClusterRevisionAttribute", readScenesClusterRevisionAttributeInteractionInfo); + + return result; + } + + private static Map readOnOffInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readOnOffOnOffCommandParams = new LinkedHashMap(); InteractionInfo readOnOffOnOffAttributeInteractionInfo = @@ -394,7 +385,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readOnOffOnOffCommandParams); - readOnOffInteractionInfo.put("readOnOffAttribute", readOnOffOnOffAttributeInteractionInfo); + result.put("readOnOffAttribute", readOnOffOnOffAttributeInteractionInfo); Map readOnOffGlobalSceneControlCommandParams = new LinkedHashMap(); InteractionInfo readOnOffGlobalSceneControlAttributeInteractionInfo = @@ -406,7 +397,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readOnOffGlobalSceneControlCommandParams); - readOnOffInteractionInfo.put( + result.put( "readGlobalSceneControlAttribute", readOnOffGlobalSceneControlAttributeInteractionInfo); Map readOnOffOnTimeCommandParams = new LinkedHashMap(); @@ -418,7 +409,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOnOffOnTimeCommandParams); - readOnOffInteractionInfo.put("readOnTimeAttribute", readOnOffOnTimeAttributeInteractionInfo); + result.put("readOnTimeAttribute", readOnOffOnTimeAttributeInteractionInfo); Map readOnOffOffWaitTimeCommandParams = new LinkedHashMap(); InteractionInfo readOnOffOffWaitTimeAttributeInteractionInfo = @@ -429,8 +420,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOnOffOffWaitTimeCommandParams); - readOnOffInteractionInfo.put( - "readOffWaitTimeAttribute", readOnOffOffWaitTimeAttributeInteractionInfo); + result.put("readOffWaitTimeAttribute", readOnOffOffWaitTimeAttributeInteractionInfo); Map readOnOffStartUpOnOffCommandParams = new LinkedHashMap(); InteractionInfo readOnOffStartUpOnOffAttributeInteractionInfo = @@ -442,8 +432,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedOnOffClusterStartUpOnOffAttributeCallback(), readOnOffStartUpOnOffCommandParams); - readOnOffInteractionInfo.put( - "readStartUpOnOffAttribute", readOnOffStartUpOnOffAttributeInteractionInfo); + result.put("readStartUpOnOffAttribute", readOnOffStartUpOnOffAttributeInteractionInfo); Map readOnOffGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readOnOffGeneratedCommandListAttributeInteractionInfo = @@ -456,7 +445,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedOnOffClusterGeneratedCommandListAttributeCallback(), readOnOffGeneratedCommandListCommandParams); - readOnOffInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readOnOffGeneratedCommandListAttributeInteractionInfo); Map readOnOffAcceptedCommandListCommandParams = new LinkedHashMap(); @@ -470,7 +459,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedOnOffClusterAcceptedCommandListAttributeCallback(), readOnOffAcceptedCommandListCommandParams); - readOnOffInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readOnOffAcceptedCommandListAttributeInteractionInfo); Map readOnOffEventListCommandParams = new LinkedHashMap(); @@ -483,8 +472,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedOnOffClusterEventListAttributeCallback(), readOnOffEventListCommandParams); - readOnOffInteractionInfo.put( - "readEventListAttribute", readOnOffEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readOnOffEventListAttributeInteractionInfo); Map readOnOffAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readOnOffAttributeListAttributeInteractionInfo = @@ -496,8 +484,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedOnOffClusterAttributeListAttributeCallback(), readOnOffAttributeListCommandParams); - readOnOffInteractionInfo.put( - "readAttributeListAttribute", readOnOffAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readOnOffAttributeListAttributeInteractionInfo); Map readOnOffFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readOnOffFeatureMapAttributeInteractionInfo = @@ -508,8 +495,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readOnOffFeatureMapCommandParams); - readOnOffInteractionInfo.put( - "readFeatureMapAttribute", readOnOffFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readOnOffFeatureMapAttributeInteractionInfo); Map readOnOffClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readOnOffClusterRevisionAttributeInteractionInfo = @@ -520,11 +506,13 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOnOffClusterRevisionCommandParams); - readOnOffInteractionInfo.put( - "readClusterRevisionAttribute", readOnOffClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("onOff", readOnOffInteractionInfo); - Map readOnOffSwitchConfigurationInteractionInfo = - new LinkedHashMap<>(); + result.put("readClusterRevisionAttribute", readOnOffClusterRevisionAttributeInteractionInfo); + + return result; + } + + private static Map readOnOffSwitchConfigurationInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readOnOffSwitchConfigurationSwitchTypeCommandParams = new LinkedHashMap(); InteractionInfo readOnOffSwitchConfigurationSwitchTypeAttributeInteractionInfo = @@ -535,7 +523,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOnOffSwitchConfigurationSwitchTypeCommandParams); - readOnOffSwitchConfigurationInteractionInfo.put( + result.put( "readSwitchTypeAttribute", readOnOffSwitchConfigurationSwitchTypeAttributeInteractionInfo); Map readOnOffSwitchConfigurationSwitchActionsCommandParams = new LinkedHashMap(); @@ -547,7 +535,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOnOffSwitchConfigurationSwitchActionsCommandParams); - readOnOffSwitchConfigurationInteractionInfo.put( + result.put( "readSwitchActionsAttribute", readOnOffSwitchConfigurationSwitchActionsAttributeInteractionInfo); Map @@ -566,7 +554,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOnOffSwitchConfigurationClusterGeneratedCommandListAttributeCallback(), readOnOffSwitchConfigurationGeneratedCommandListCommandParams); - readOnOffSwitchConfigurationInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readOnOffSwitchConfigurationGeneratedCommandListAttributeInteractionInfo); Map readOnOffSwitchConfigurationAcceptedCommandListCommandParams = @@ -584,7 +572,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOnOffSwitchConfigurationClusterAcceptedCommandListAttributeCallback(), readOnOffSwitchConfigurationAcceptedCommandListCommandParams); - readOnOffSwitchConfigurationInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readOnOffSwitchConfigurationAcceptedCommandListAttributeInteractionInfo); Map readOnOffSwitchConfigurationEventListCommandParams = @@ -601,7 +589,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOnOffSwitchConfigurationClusterEventListAttributeCallback(), readOnOffSwitchConfigurationEventListCommandParams); - readOnOffSwitchConfigurationInteractionInfo.put( + result.put( "readEventListAttribute", readOnOffSwitchConfigurationEventListAttributeInteractionInfo); Map readOnOffSwitchConfigurationAttributeListCommandParams = new LinkedHashMap(); @@ -617,7 +605,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOnOffSwitchConfigurationClusterAttributeListAttributeCallback(), readOnOffSwitchConfigurationAttributeListCommandParams); - readOnOffSwitchConfigurationInteractionInfo.put( + result.put( "readAttributeListAttribute", readOnOffSwitchConfigurationAttributeListAttributeInteractionInfo); Map readOnOffSwitchConfigurationFeatureMapCommandParams = @@ -630,7 +618,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readOnOffSwitchConfigurationFeatureMapCommandParams); - readOnOffSwitchConfigurationInteractionInfo.put( + result.put( "readFeatureMapAttribute", readOnOffSwitchConfigurationFeatureMapAttributeInteractionInfo); Map readOnOffSwitchConfigurationClusterRevisionCommandParams = new LinkedHashMap(); @@ -642,11 +630,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOnOffSwitchConfigurationClusterRevisionCommandParams); - readOnOffSwitchConfigurationInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readOnOffSwitchConfigurationClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("onOffSwitchConfiguration", readOnOffSwitchConfigurationInteractionInfo); - Map readLevelControlInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readLevelControlInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readLevelControlCurrentLevelCommandParams = new LinkedHashMap(); InteractionInfo readLevelControlCurrentLevelAttributeInteractionInfo = @@ -659,8 +651,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedLevelControlClusterCurrentLevelAttributeCallback(), readLevelControlCurrentLevelCommandParams); - readLevelControlInteractionInfo.put( - "readCurrentLevelAttribute", readLevelControlCurrentLevelAttributeInteractionInfo); + result.put("readCurrentLevelAttribute", readLevelControlCurrentLevelAttributeInteractionInfo); Map readLevelControlRemainingTimeCommandParams = new LinkedHashMap(); InteractionInfo readLevelControlRemainingTimeAttributeInteractionInfo = @@ -671,8 +662,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readLevelControlRemainingTimeCommandParams); - readLevelControlInteractionInfo.put( - "readRemainingTimeAttribute", readLevelControlRemainingTimeAttributeInteractionInfo); + result.put("readRemainingTimeAttribute", readLevelControlRemainingTimeAttributeInteractionInfo); Map readLevelControlMinLevelCommandParams = new LinkedHashMap(); InteractionInfo readLevelControlMinLevelAttributeInteractionInfo = @@ -683,8 +673,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readLevelControlMinLevelCommandParams); - readLevelControlInteractionInfo.put( - "readMinLevelAttribute", readLevelControlMinLevelAttributeInteractionInfo); + result.put("readMinLevelAttribute", readLevelControlMinLevelAttributeInteractionInfo); Map readLevelControlMaxLevelCommandParams = new LinkedHashMap(); InteractionInfo readLevelControlMaxLevelAttributeInteractionInfo = @@ -695,8 +684,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readLevelControlMaxLevelCommandParams); - readLevelControlInteractionInfo.put( - "readMaxLevelAttribute", readLevelControlMaxLevelAttributeInteractionInfo); + result.put("readMaxLevelAttribute", readLevelControlMaxLevelAttributeInteractionInfo); Map readLevelControlCurrentFrequencyCommandParams = new LinkedHashMap(); InteractionInfo readLevelControlCurrentFrequencyAttributeInteractionInfo = @@ -707,7 +695,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readLevelControlCurrentFrequencyCommandParams); - readLevelControlInteractionInfo.put( + result.put( "readCurrentFrequencyAttribute", readLevelControlCurrentFrequencyAttributeInteractionInfo); Map readLevelControlMinFrequencyCommandParams = new LinkedHashMap(); @@ -719,8 +707,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readLevelControlMinFrequencyCommandParams); - readLevelControlInteractionInfo.put( - "readMinFrequencyAttribute", readLevelControlMinFrequencyAttributeInteractionInfo); + result.put("readMinFrequencyAttribute", readLevelControlMinFrequencyAttributeInteractionInfo); Map readLevelControlMaxFrequencyCommandParams = new LinkedHashMap(); InteractionInfo readLevelControlMaxFrequencyAttributeInteractionInfo = @@ -731,8 +718,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readLevelControlMaxFrequencyCommandParams); - readLevelControlInteractionInfo.put( - "readMaxFrequencyAttribute", readLevelControlMaxFrequencyAttributeInteractionInfo); + result.put("readMaxFrequencyAttribute", readLevelControlMaxFrequencyAttributeInteractionInfo); Map readLevelControlOptionsCommandParams = new LinkedHashMap(); InteractionInfo readLevelControlOptionsAttributeInteractionInfo = @@ -743,8 +729,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readLevelControlOptionsCommandParams); - readLevelControlInteractionInfo.put( - "readOptionsAttribute", readLevelControlOptionsAttributeInteractionInfo); + result.put("readOptionsAttribute", readLevelControlOptionsAttributeInteractionInfo); Map readLevelControlOnOffTransitionTimeCommandParams = new LinkedHashMap(); InteractionInfo readLevelControlOnOffTransitionTimeAttributeInteractionInfo = @@ -756,7 +741,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readLevelControlOnOffTransitionTimeCommandParams); - readLevelControlInteractionInfo.put( + result.put( "readOnOffTransitionTimeAttribute", readLevelControlOnOffTransitionTimeAttributeInteractionInfo); Map readLevelControlOnLevelCommandParams = @@ -770,8 +755,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLevelControlClusterOnLevelAttributeCallback(), readLevelControlOnLevelCommandParams); - readLevelControlInteractionInfo.put( - "readOnLevelAttribute", readLevelControlOnLevelAttributeInteractionInfo); + result.put("readOnLevelAttribute", readLevelControlOnLevelAttributeInteractionInfo); Map readLevelControlOnTransitionTimeCommandParams = new LinkedHashMap(); InteractionInfo readLevelControlOnTransitionTimeAttributeInteractionInfo = @@ -786,7 +770,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedLevelControlClusterOnTransitionTimeAttributeCallback(), readLevelControlOnTransitionTimeCommandParams); - readLevelControlInteractionInfo.put( + result.put( "readOnTransitionTimeAttribute", readLevelControlOnTransitionTimeAttributeInteractionInfo); Map readLevelControlOffTransitionTimeCommandParams = new LinkedHashMap(); @@ -802,7 +786,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedLevelControlClusterOffTransitionTimeAttributeCallback(), readLevelControlOffTransitionTimeCommandParams); - readLevelControlInteractionInfo.put( + result.put( "readOffTransitionTimeAttribute", readLevelControlOffTransitionTimeAttributeInteractionInfo); Map readLevelControlDefaultMoveRateCommandParams = @@ -818,7 +802,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedLevelControlClusterDefaultMoveRateAttributeCallback(), readLevelControlDefaultMoveRateCommandParams); - readLevelControlInteractionInfo.put( + result.put( "readDefaultMoveRateAttribute", readLevelControlDefaultMoveRateAttributeInteractionInfo); Map readLevelControlStartUpCurrentLevelCommandParams = new LinkedHashMap(); @@ -834,7 +818,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedLevelControlClusterStartUpCurrentLevelAttributeCallback(), readLevelControlStartUpCurrentLevelCommandParams); - readLevelControlInteractionInfo.put( + result.put( "readStartUpCurrentLevelAttribute", readLevelControlStartUpCurrentLevelAttributeInteractionInfo); Map readLevelControlGeneratedCommandListCommandParams = @@ -851,7 +835,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedLevelControlClusterGeneratedCommandListAttributeCallback(), readLevelControlGeneratedCommandListCommandParams); - readLevelControlInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readLevelControlGeneratedCommandListAttributeInteractionInfo); Map readLevelControlAcceptedCommandListCommandParams = @@ -868,7 +852,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedLevelControlClusterAcceptedCommandListAttributeCallback(), readLevelControlAcceptedCommandListCommandParams); - readLevelControlInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readLevelControlAcceptedCommandListAttributeInteractionInfo); Map readLevelControlEventListCommandParams = @@ -882,8 +866,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLevelControlClusterEventListAttributeCallback(), readLevelControlEventListCommandParams); - readLevelControlInteractionInfo.put( - "readEventListAttribute", readLevelControlEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readLevelControlEventListAttributeInteractionInfo); Map readLevelControlAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readLevelControlAttributeListAttributeInteractionInfo = @@ -896,8 +879,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedLevelControlClusterAttributeListAttributeCallback(), readLevelControlAttributeListCommandParams); - readLevelControlInteractionInfo.put( - "readAttributeListAttribute", readLevelControlAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readLevelControlAttributeListAttributeInteractionInfo); Map readLevelControlFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readLevelControlFeatureMapAttributeInteractionInfo = @@ -908,8 +890,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readLevelControlFeatureMapCommandParams); - readLevelControlInteractionInfo.put( - "readFeatureMapAttribute", readLevelControlFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readLevelControlFeatureMapAttributeInteractionInfo); Map readLevelControlClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readLevelControlClusterRevisionAttributeInteractionInfo = @@ -920,10 +901,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readLevelControlClusterRevisionCommandParams); - readLevelControlInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readLevelControlClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("levelControl", readLevelControlInteractionInfo); - Map readBinaryInputBasicInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readBinaryInputBasicInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readBinaryInputBasicActiveTextCommandParams = new LinkedHashMap(); InteractionInfo readBinaryInputBasicActiveTextAttributeInteractionInfo = @@ -934,8 +919,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBinaryInputBasicActiveTextCommandParams); - readBinaryInputBasicInteractionInfo.put( - "readActiveTextAttribute", readBinaryInputBasicActiveTextAttributeInteractionInfo); + result.put("readActiveTextAttribute", readBinaryInputBasicActiveTextAttributeInteractionInfo); Map readBinaryInputBasicDescriptionCommandParams = new LinkedHashMap(); InteractionInfo readBinaryInputBasicDescriptionAttributeInteractionInfo = @@ -946,8 +930,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBinaryInputBasicDescriptionCommandParams); - readBinaryInputBasicInteractionInfo.put( - "readDescriptionAttribute", readBinaryInputBasicDescriptionAttributeInteractionInfo); + result.put("readDescriptionAttribute", readBinaryInputBasicDescriptionAttributeInteractionInfo); Map readBinaryInputBasicInactiveTextCommandParams = new LinkedHashMap(); InteractionInfo readBinaryInputBasicInactiveTextAttributeInteractionInfo = @@ -958,7 +941,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBinaryInputBasicInactiveTextCommandParams); - readBinaryInputBasicInteractionInfo.put( + result.put( "readInactiveTextAttribute", readBinaryInputBasicInactiveTextAttributeInteractionInfo); Map readBinaryInputBasicOutOfServiceCommandParams = new LinkedHashMap(); @@ -970,7 +953,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readBinaryInputBasicOutOfServiceCommandParams); - readBinaryInputBasicInteractionInfo.put( + result.put( "readOutOfServiceAttribute", readBinaryInputBasicOutOfServiceAttributeInteractionInfo); Map readBinaryInputBasicPolarityCommandParams = new LinkedHashMap(); @@ -982,8 +965,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBinaryInputBasicPolarityCommandParams); - readBinaryInputBasicInteractionInfo.put( - "readPolarityAttribute", readBinaryInputBasicPolarityAttributeInteractionInfo); + result.put("readPolarityAttribute", readBinaryInputBasicPolarityAttributeInteractionInfo); Map readBinaryInputBasicPresentValueCommandParams = new LinkedHashMap(); InteractionInfo readBinaryInputBasicPresentValueAttributeInteractionInfo = @@ -994,7 +976,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readBinaryInputBasicPresentValueCommandParams); - readBinaryInputBasicInteractionInfo.put( + result.put( "readPresentValueAttribute", readBinaryInputBasicPresentValueAttributeInteractionInfo); Map readBinaryInputBasicReliabilityCommandParams = new LinkedHashMap(); @@ -1006,8 +988,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBinaryInputBasicReliabilityCommandParams); - readBinaryInputBasicInteractionInfo.put( - "readReliabilityAttribute", readBinaryInputBasicReliabilityAttributeInteractionInfo); + result.put("readReliabilityAttribute", readBinaryInputBasicReliabilityAttributeInteractionInfo); Map readBinaryInputBasicStatusFlagsCommandParams = new LinkedHashMap(); InteractionInfo readBinaryInputBasicStatusFlagsAttributeInteractionInfo = @@ -1018,8 +999,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBinaryInputBasicStatusFlagsCommandParams); - readBinaryInputBasicInteractionInfo.put( - "readStatusFlagsAttribute", readBinaryInputBasicStatusFlagsAttributeInteractionInfo); + result.put("readStatusFlagsAttribute", readBinaryInputBasicStatusFlagsAttributeInteractionInfo); Map readBinaryInputBasicApplicationTypeCommandParams = new LinkedHashMap(); InteractionInfo readBinaryInputBasicApplicationTypeAttributeInteractionInfo = @@ -1030,7 +1010,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readBinaryInputBasicApplicationTypeCommandParams); - readBinaryInputBasicInteractionInfo.put( + result.put( "readApplicationTypeAttribute", readBinaryInputBasicApplicationTypeAttributeInteractionInfo); Map readBinaryInputBasicGeneratedCommandListCommandParams = @@ -1047,7 +1027,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBinaryInputBasicClusterGeneratedCommandListAttributeCallback(), readBinaryInputBasicGeneratedCommandListCommandParams); - readBinaryInputBasicInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readBinaryInputBasicGeneratedCommandListAttributeInteractionInfo); Map readBinaryInputBasicAcceptedCommandListCommandParams = @@ -1064,7 +1044,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBinaryInputBasicClusterAcceptedCommandListAttributeCallback(), readBinaryInputBasicAcceptedCommandListCommandParams); - readBinaryInputBasicInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readBinaryInputBasicAcceptedCommandListAttributeInteractionInfo); Map readBinaryInputBasicEventListCommandParams = @@ -1079,8 +1059,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedBinaryInputBasicClusterEventListAttributeCallback(), readBinaryInputBasicEventListCommandParams); - readBinaryInputBasicInteractionInfo.put( - "readEventListAttribute", readBinaryInputBasicEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readBinaryInputBasicEventListAttributeInteractionInfo); Map readBinaryInputBasicAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readBinaryInputBasicAttributeListAttributeInteractionInfo = @@ -1095,7 +1074,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBinaryInputBasicClusterAttributeListAttributeCallback(), readBinaryInputBasicAttributeListCommandParams); - readBinaryInputBasicInteractionInfo.put( + result.put( "readAttributeListAttribute", readBinaryInputBasicAttributeListAttributeInteractionInfo); Map readBinaryInputBasicFeatureMapCommandParams = new LinkedHashMap(); @@ -1107,8 +1086,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readBinaryInputBasicFeatureMapCommandParams); - readBinaryInputBasicInteractionInfo.put( - "readFeatureMapAttribute", readBinaryInputBasicFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readBinaryInputBasicFeatureMapAttributeInteractionInfo); Map readBinaryInputBasicClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readBinaryInputBasicClusterRevisionAttributeInteractionInfo = @@ -1119,11 +1097,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBinaryInputBasicClusterRevisionCommandParams); - readBinaryInputBasicInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readBinaryInputBasicClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("binaryInputBasic", readBinaryInputBasicInteractionInfo); - Map readDescriptorInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readDescriptorInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readDescriptorDeviceTypeListCommandParams = new LinkedHashMap(); InteractionInfo readDescriptorDeviceTypeListAttributeInteractionInfo = @@ -1136,8 +1118,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedDescriptorClusterDeviceTypeListAttributeCallback(), readDescriptorDeviceTypeListCommandParams); - readDescriptorInteractionInfo.put( - "readDeviceTypeListAttribute", readDescriptorDeviceTypeListAttributeInteractionInfo); + result.put("readDeviceTypeListAttribute", readDescriptorDeviceTypeListAttributeInteractionInfo); Map readDescriptorServerListCommandParams = new LinkedHashMap(); InteractionInfo readDescriptorServerListAttributeInteractionInfo = @@ -1149,8 +1130,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedDescriptorClusterServerListAttributeCallback(), readDescriptorServerListCommandParams); - readDescriptorInteractionInfo.put( - "readServerListAttribute", readDescriptorServerListAttributeInteractionInfo); + result.put("readServerListAttribute", readDescriptorServerListAttributeInteractionInfo); Map readDescriptorClientListCommandParams = new LinkedHashMap(); InteractionInfo readDescriptorClientListAttributeInteractionInfo = @@ -1162,8 +1142,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedDescriptorClusterClientListAttributeCallback(), readDescriptorClientListCommandParams); - readDescriptorInteractionInfo.put( - "readClientListAttribute", readDescriptorClientListAttributeInteractionInfo); + result.put("readClientListAttribute", readDescriptorClientListAttributeInteractionInfo); Map readDescriptorPartsListCommandParams = new LinkedHashMap(); InteractionInfo readDescriptorPartsListAttributeInteractionInfo = @@ -1175,8 +1154,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedDescriptorClusterPartsListAttributeCallback(), readDescriptorPartsListCommandParams); - readDescriptorInteractionInfo.put( - "readPartsListAttribute", readDescriptorPartsListAttributeInteractionInfo); + result.put("readPartsListAttribute", readDescriptorPartsListAttributeInteractionInfo); Map readDescriptorGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readDescriptorGeneratedCommandListAttributeInteractionInfo = @@ -1191,7 +1169,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedDescriptorClusterGeneratedCommandListAttributeCallback(), readDescriptorGeneratedCommandListCommandParams); - readDescriptorInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readDescriptorGeneratedCommandListAttributeInteractionInfo); Map readDescriptorAcceptedCommandListCommandParams = @@ -1208,7 +1186,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedDescriptorClusterAcceptedCommandListAttributeCallback(), readDescriptorAcceptedCommandListCommandParams); - readDescriptorInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readDescriptorAcceptedCommandListAttributeInteractionInfo); Map readDescriptorEventListCommandParams = @@ -1222,8 +1200,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedDescriptorClusterEventListAttributeCallback(), readDescriptorEventListCommandParams); - readDescriptorInteractionInfo.put( - "readEventListAttribute", readDescriptorEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readDescriptorEventListAttributeInteractionInfo); Map readDescriptorAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readDescriptorAttributeListAttributeInteractionInfo = @@ -1235,8 +1212,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedDescriptorClusterAttributeListAttributeCallback(), readDescriptorAttributeListCommandParams); - readDescriptorInteractionInfo.put( - "readAttributeListAttribute", readDescriptorAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readDescriptorAttributeListAttributeInteractionInfo); Map readDescriptorFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readDescriptorFeatureMapAttributeInteractionInfo = @@ -1247,8 +1223,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readDescriptorFeatureMapCommandParams); - readDescriptorInteractionInfo.put( - "readFeatureMapAttribute", readDescriptorFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readDescriptorFeatureMapAttributeInteractionInfo); Map readDescriptorClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readDescriptorClusterRevisionAttributeInteractionInfo = @@ -1259,10 +1234,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDescriptorClusterRevisionCommandParams); - readDescriptorInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readDescriptorClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("descriptor", readDescriptorInteractionInfo); - Map readBindingInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readBindingInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readBindingBindingCommandParams = new LinkedHashMap(); InteractionInfo readBindingBindingAttributeInteractionInfo = @@ -1274,8 +1253,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBindingClusterBindingAttributeCallback(), readBindingBindingCommandParams); - readBindingInteractionInfo.put( - "readBindingAttribute", readBindingBindingAttributeInteractionInfo); + result.put("readBindingAttribute", readBindingBindingAttributeInteractionInfo); Map readBindingGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readBindingGeneratedCommandListAttributeInteractionInfo = @@ -1289,7 +1267,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBindingClusterGeneratedCommandListAttributeCallback(), readBindingGeneratedCommandListCommandParams); - readBindingInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readBindingGeneratedCommandListAttributeInteractionInfo); Map readBindingAcceptedCommandListCommandParams = @@ -1305,7 +1283,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBindingClusterAcceptedCommandListAttributeCallback(), readBindingAcceptedCommandListCommandParams); - readBindingInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readBindingAcceptedCommandListAttributeInteractionInfo); Map readBindingEventListCommandParams = new LinkedHashMap(); @@ -1318,8 +1296,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBindingClusterEventListAttributeCallback(), readBindingEventListCommandParams); - readBindingInteractionInfo.put( - "readEventListAttribute", readBindingEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readBindingEventListAttributeInteractionInfo); Map readBindingAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readBindingAttributeListAttributeInteractionInfo = @@ -1331,8 +1308,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBindingClusterAttributeListAttributeCallback(), readBindingAttributeListCommandParams); - readBindingInteractionInfo.put( - "readAttributeListAttribute", readBindingAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readBindingAttributeListAttributeInteractionInfo); Map readBindingFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readBindingFeatureMapAttributeInteractionInfo = @@ -1343,8 +1319,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readBindingFeatureMapCommandParams); - readBindingInteractionInfo.put( - "readFeatureMapAttribute", readBindingFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readBindingFeatureMapAttributeInteractionInfo); Map readBindingClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readBindingClusterRevisionAttributeInteractionInfo = @@ -1355,10 +1330,13 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBindingClusterRevisionCommandParams); - readBindingInteractionInfo.put( - "readClusterRevisionAttribute", readBindingClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("binding", readBindingInteractionInfo); - Map readAccessControlInteractionInfo = new LinkedHashMap<>(); + result.put("readClusterRevisionAttribute", readBindingClusterRevisionAttributeInteractionInfo); + + return result; + } + + private static Map readAccessControlInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readAccessControlAclCommandParams = new LinkedHashMap(); InteractionInfo readAccessControlAclAttributeInteractionInfo = @@ -1370,8 +1348,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedAccessControlClusterAclAttributeCallback(), readAccessControlAclCommandParams); - readAccessControlInteractionInfo.put( - "readAclAttribute", readAccessControlAclAttributeInteractionInfo); + result.put("readAclAttribute", readAccessControlAclAttributeInteractionInfo); Map readAccessControlExtensionCommandParams = new LinkedHashMap(); InteractionInfo readAccessControlExtensionAttributeInteractionInfo = @@ -1383,8 +1360,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedAccessControlClusterExtensionAttributeCallback(), readAccessControlExtensionCommandParams); - readAccessControlInteractionInfo.put( - "readExtensionAttribute", readAccessControlExtensionAttributeInteractionInfo); + result.put("readExtensionAttribute", readAccessControlExtensionAttributeInteractionInfo); Map readAccessControlSubjectsPerAccessControlEntryCommandParams = new LinkedHashMap(); InteractionInfo readAccessControlSubjectsPerAccessControlEntryAttributeInteractionInfo = @@ -1396,7 +1372,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readAccessControlSubjectsPerAccessControlEntryCommandParams); - readAccessControlInteractionInfo.put( + result.put( "readSubjectsPerAccessControlEntryAttribute", readAccessControlSubjectsPerAccessControlEntryAttributeInteractionInfo); Map readAccessControlTargetsPerAccessControlEntryCommandParams = @@ -1410,7 +1386,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readAccessControlTargetsPerAccessControlEntryCommandParams); - readAccessControlInteractionInfo.put( + result.put( "readTargetsPerAccessControlEntryAttribute", readAccessControlTargetsPerAccessControlEntryAttributeInteractionInfo); Map readAccessControlAccessControlEntriesPerFabricCommandParams = @@ -1424,7 +1400,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readAccessControlAccessControlEntriesPerFabricCommandParams); - readAccessControlInteractionInfo.put( + result.put( "readAccessControlEntriesPerFabricAttribute", readAccessControlAccessControlEntriesPerFabricAttributeInteractionInfo); Map readAccessControlGeneratedCommandListCommandParams = @@ -1441,7 +1417,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedAccessControlClusterGeneratedCommandListAttributeCallback(), readAccessControlGeneratedCommandListCommandParams); - readAccessControlInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readAccessControlGeneratedCommandListAttributeInteractionInfo); Map readAccessControlAcceptedCommandListCommandParams = @@ -1458,7 +1434,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedAccessControlClusterAcceptedCommandListAttributeCallback(), readAccessControlAcceptedCommandListCommandParams); - readAccessControlInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readAccessControlAcceptedCommandListAttributeInteractionInfo); Map readAccessControlEventListCommandParams = @@ -1472,8 +1448,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedAccessControlClusterEventListAttributeCallback(), readAccessControlEventListCommandParams); - readAccessControlInteractionInfo.put( - "readEventListAttribute", readAccessControlEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readAccessControlEventListAttributeInteractionInfo); Map readAccessControlAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readAccessControlAttributeListAttributeInteractionInfo = @@ -1487,7 +1462,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedAccessControlClusterAttributeListAttributeCallback(), readAccessControlAttributeListCommandParams); - readAccessControlInteractionInfo.put( + result.put( "readAttributeListAttribute", readAccessControlAttributeListAttributeInteractionInfo); Map readAccessControlFeatureMapCommandParams = new LinkedHashMap(); @@ -1499,8 +1474,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readAccessControlFeatureMapCommandParams); - readAccessControlInteractionInfo.put( - "readFeatureMapAttribute", readAccessControlFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readAccessControlFeatureMapAttributeInteractionInfo); Map readAccessControlClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readAccessControlClusterRevisionAttributeInteractionInfo = @@ -1511,10 +1485,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readAccessControlClusterRevisionCommandParams); - readAccessControlInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readAccessControlClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("accessControl", readAccessControlInteractionInfo); - Map readActionsInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readActionsInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readActionsActionListCommandParams = new LinkedHashMap(); InteractionInfo readActionsActionListAttributeInteractionInfo = @@ -1526,8 +1504,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedActionsClusterActionListAttributeCallback(), readActionsActionListCommandParams); - readActionsInteractionInfo.put( - "readActionListAttribute", readActionsActionListAttributeInteractionInfo); + result.put("readActionListAttribute", readActionsActionListAttributeInteractionInfo); Map readActionsEndpointListsCommandParams = new LinkedHashMap(); InteractionInfo readActionsEndpointListsAttributeInteractionInfo = @@ -1539,8 +1516,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedActionsClusterEndpointListsAttributeCallback(), readActionsEndpointListsCommandParams); - readActionsInteractionInfo.put( - "readEndpointListsAttribute", readActionsEndpointListsAttributeInteractionInfo); + result.put("readEndpointListsAttribute", readActionsEndpointListsAttributeInteractionInfo); Map readActionsSetupURLCommandParams = new LinkedHashMap(); InteractionInfo readActionsSetupURLAttributeInteractionInfo = @@ -1551,8 +1527,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readActionsSetupURLCommandParams); - readActionsInteractionInfo.put( - "readSetupURLAttribute", readActionsSetupURLAttributeInteractionInfo); + result.put("readSetupURLAttribute", readActionsSetupURLAttributeInteractionInfo); Map readActionsGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readActionsGeneratedCommandListAttributeInteractionInfo = @@ -1566,7 +1541,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedActionsClusterGeneratedCommandListAttributeCallback(), readActionsGeneratedCommandListCommandParams); - readActionsInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readActionsGeneratedCommandListAttributeInteractionInfo); Map readActionsAcceptedCommandListCommandParams = @@ -1582,7 +1557,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedActionsClusterAcceptedCommandListAttributeCallback(), readActionsAcceptedCommandListCommandParams); - readActionsInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readActionsAcceptedCommandListAttributeInteractionInfo); Map readActionsEventListCommandParams = new LinkedHashMap(); @@ -1595,8 +1570,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedActionsClusterEventListAttributeCallback(), readActionsEventListCommandParams); - readActionsInteractionInfo.put( - "readEventListAttribute", readActionsEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readActionsEventListAttributeInteractionInfo); Map readActionsAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readActionsAttributeListAttributeInteractionInfo = @@ -1608,8 +1582,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedActionsClusterAttributeListAttributeCallback(), readActionsAttributeListCommandParams); - readActionsInteractionInfo.put( - "readAttributeListAttribute", readActionsAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readActionsAttributeListAttributeInteractionInfo); Map readActionsFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readActionsFeatureMapAttributeInteractionInfo = @@ -1620,8 +1593,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readActionsFeatureMapCommandParams); - readActionsInteractionInfo.put( - "readFeatureMapAttribute", readActionsFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readActionsFeatureMapAttributeInteractionInfo); Map readActionsClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readActionsClusterRevisionAttributeInteractionInfo = @@ -1632,10 +1604,13 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readActionsClusterRevisionCommandParams); - readActionsInteractionInfo.put( - "readClusterRevisionAttribute", readActionsClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("actions", readActionsInteractionInfo); - Map readBasicInformationInteractionInfo = new LinkedHashMap<>(); + result.put("readClusterRevisionAttribute", readActionsClusterRevisionAttributeInteractionInfo); + + return result; + } + + private static Map readBasicInformationInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readBasicInformationDataModelRevisionCommandParams = new LinkedHashMap(); InteractionInfo readBasicInformationDataModelRevisionAttributeInteractionInfo = @@ -1646,7 +1621,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBasicInformationDataModelRevisionCommandParams); - readBasicInformationInteractionInfo.put( + result.put( "readDataModelRevisionAttribute", readBasicInformationDataModelRevisionAttributeInteractionInfo); Map readBasicInformationVendorNameCommandParams = @@ -1659,8 +1634,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBasicInformationVendorNameCommandParams); - readBasicInformationInteractionInfo.put( - "readVendorNameAttribute", readBasicInformationVendorNameAttributeInteractionInfo); + result.put("readVendorNameAttribute", readBasicInformationVendorNameAttributeInteractionInfo); Map readBasicInformationVendorIDCommandParams = new LinkedHashMap(); InteractionInfo readBasicInformationVendorIDAttributeInteractionInfo = @@ -1671,8 +1645,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBasicInformationVendorIDCommandParams); - readBasicInformationInteractionInfo.put( - "readVendorIDAttribute", readBasicInformationVendorIDAttributeInteractionInfo); + result.put("readVendorIDAttribute", readBasicInformationVendorIDAttributeInteractionInfo); Map readBasicInformationProductNameCommandParams = new LinkedHashMap(); InteractionInfo readBasicInformationProductNameAttributeInteractionInfo = @@ -1683,8 +1656,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBasicInformationProductNameCommandParams); - readBasicInformationInteractionInfo.put( - "readProductNameAttribute", readBasicInformationProductNameAttributeInteractionInfo); + result.put("readProductNameAttribute", readBasicInformationProductNameAttributeInteractionInfo); Map readBasicInformationProductIDCommandParams = new LinkedHashMap(); InteractionInfo readBasicInformationProductIDAttributeInteractionInfo = @@ -1695,8 +1667,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBasicInformationProductIDCommandParams); - readBasicInformationInteractionInfo.put( - "readProductIDAttribute", readBasicInformationProductIDAttributeInteractionInfo); + result.put("readProductIDAttribute", readBasicInformationProductIDAttributeInteractionInfo); Map readBasicInformationNodeLabelCommandParams = new LinkedHashMap(); InteractionInfo readBasicInformationNodeLabelAttributeInteractionInfo = @@ -1707,8 +1678,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBasicInformationNodeLabelCommandParams); - readBasicInformationInteractionInfo.put( - "readNodeLabelAttribute", readBasicInformationNodeLabelAttributeInteractionInfo); + result.put("readNodeLabelAttribute", readBasicInformationNodeLabelAttributeInteractionInfo); Map readBasicInformationLocationCommandParams = new LinkedHashMap(); InteractionInfo readBasicInformationLocationAttributeInteractionInfo = @@ -1719,8 +1689,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBasicInformationLocationCommandParams); - readBasicInformationInteractionInfo.put( - "readLocationAttribute", readBasicInformationLocationAttributeInteractionInfo); + result.put("readLocationAttribute", readBasicInformationLocationAttributeInteractionInfo); Map readBasicInformationHardwareVersionCommandParams = new LinkedHashMap(); InteractionInfo readBasicInformationHardwareVersionAttributeInteractionInfo = @@ -1731,7 +1700,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBasicInformationHardwareVersionCommandParams); - readBasicInformationInteractionInfo.put( + result.put( "readHardwareVersionAttribute", readBasicInformationHardwareVersionAttributeInteractionInfo); Map readBasicInformationHardwareVersionStringCommandParams = @@ -1745,7 +1714,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBasicInformationHardwareVersionStringCommandParams); - readBasicInformationInteractionInfo.put( + result.put( "readHardwareVersionStringAttribute", readBasicInformationHardwareVersionStringAttributeInteractionInfo); Map readBasicInformationSoftwareVersionCommandParams = @@ -1758,7 +1727,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readBasicInformationSoftwareVersionCommandParams); - readBasicInformationInteractionInfo.put( + result.put( "readSoftwareVersionAttribute", readBasicInformationSoftwareVersionAttributeInteractionInfo); Map readBasicInformationSoftwareVersionStringCommandParams = @@ -1772,7 +1741,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBasicInformationSoftwareVersionStringCommandParams); - readBasicInformationInteractionInfo.put( + result.put( "readSoftwareVersionStringAttribute", readBasicInformationSoftwareVersionStringAttributeInteractionInfo); Map readBasicInformationManufacturingDateCommandParams = @@ -1786,7 +1755,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBasicInformationManufacturingDateCommandParams); - readBasicInformationInteractionInfo.put( + result.put( "readManufacturingDateAttribute", readBasicInformationManufacturingDateAttributeInteractionInfo); Map readBasicInformationPartNumberCommandParams = @@ -1799,8 +1768,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBasicInformationPartNumberCommandParams); - readBasicInformationInteractionInfo.put( - "readPartNumberAttribute", readBasicInformationPartNumberAttributeInteractionInfo); + result.put("readPartNumberAttribute", readBasicInformationPartNumberAttributeInteractionInfo); Map readBasicInformationProductURLCommandParams = new LinkedHashMap(); InteractionInfo readBasicInformationProductURLAttributeInteractionInfo = @@ -1811,8 +1779,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBasicInformationProductURLCommandParams); - readBasicInformationInteractionInfo.put( - "readProductURLAttribute", readBasicInformationProductURLAttributeInteractionInfo); + result.put("readProductURLAttribute", readBasicInformationProductURLAttributeInteractionInfo); Map readBasicInformationProductLabelCommandParams = new LinkedHashMap(); InteractionInfo readBasicInformationProductLabelAttributeInteractionInfo = @@ -1823,7 +1790,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBasicInformationProductLabelCommandParams); - readBasicInformationInteractionInfo.put( + result.put( "readProductLabelAttribute", readBasicInformationProductLabelAttributeInteractionInfo); Map readBasicInformationSerialNumberCommandParams = new LinkedHashMap(); @@ -1835,7 +1802,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBasicInformationSerialNumberCommandParams); - readBasicInformationInteractionInfo.put( + result.put( "readSerialNumberAttribute", readBasicInformationSerialNumberAttributeInteractionInfo); Map readBasicInformationLocalConfigDisabledCommandParams = new LinkedHashMap(); @@ -1848,7 +1815,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readBasicInformationLocalConfigDisabledCommandParams); - readBasicInformationInteractionInfo.put( + result.put( "readLocalConfigDisabledAttribute", readBasicInformationLocalConfigDisabledAttributeInteractionInfo); Map readBasicInformationReachableCommandParams = @@ -1861,8 +1828,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readBasicInformationReachableCommandParams); - readBasicInformationInteractionInfo.put( - "readReachableAttribute", readBasicInformationReachableAttributeInteractionInfo); + result.put("readReachableAttribute", readBasicInformationReachableAttributeInteractionInfo); Map readBasicInformationUniqueIDCommandParams = new LinkedHashMap(); InteractionInfo readBasicInformationUniqueIDAttributeInteractionInfo = @@ -1873,8 +1839,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBasicInformationUniqueIDCommandParams); - readBasicInformationInteractionInfo.put( - "readUniqueIDAttribute", readBasicInformationUniqueIDAttributeInteractionInfo); + result.put("readUniqueIDAttribute", readBasicInformationUniqueIDAttributeInteractionInfo); Map readBasicInformationGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readBasicInformationGeneratedCommandListAttributeInteractionInfo = @@ -1889,7 +1854,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBasicInformationClusterGeneratedCommandListAttributeCallback(), readBasicInformationGeneratedCommandListCommandParams); - readBasicInformationInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readBasicInformationGeneratedCommandListAttributeInteractionInfo); Map readBasicInformationAcceptedCommandListCommandParams = @@ -1906,7 +1871,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBasicInformationClusterAcceptedCommandListAttributeCallback(), readBasicInformationAcceptedCommandListCommandParams); - readBasicInformationInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readBasicInformationAcceptedCommandListAttributeInteractionInfo); Map readBasicInformationEventListCommandParams = @@ -1921,8 +1886,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedBasicInformationClusterEventListAttributeCallback(), readBasicInformationEventListCommandParams); - readBasicInformationInteractionInfo.put( - "readEventListAttribute", readBasicInformationEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readBasicInformationEventListAttributeInteractionInfo); Map readBasicInformationAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readBasicInformationAttributeListAttributeInteractionInfo = @@ -1937,7 +1901,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBasicInformationClusterAttributeListAttributeCallback(), readBasicInformationAttributeListCommandParams); - readBasicInformationInteractionInfo.put( + result.put( "readAttributeListAttribute", readBasicInformationAttributeListAttributeInteractionInfo); Map readBasicInformationFeatureMapCommandParams = new LinkedHashMap(); @@ -1949,8 +1913,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readBasicInformationFeatureMapCommandParams); - readBasicInformationInteractionInfo.put( - "readFeatureMapAttribute", readBasicInformationFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readBasicInformationFeatureMapAttributeInteractionInfo); Map readBasicInformationClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readBasicInformationClusterRevisionAttributeInteractionInfo = @@ -1961,12 +1924,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBasicInformationClusterRevisionCommandParams); - readBasicInformationInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readBasicInformationClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("basicInformation", readBasicInformationInteractionInfo); - Map readOtaSoftwareUpdateProviderInteractionInfo = - new LinkedHashMap<>(); + + return result; + } + + private static Map readOtaSoftwareUpdateProviderInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readOtaSoftwareUpdateProviderGeneratedCommandListCommandParams = new LinkedHashMap(); @@ -1983,7 +1949,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOtaSoftwareUpdateProviderClusterGeneratedCommandListAttributeCallback(), readOtaSoftwareUpdateProviderGeneratedCommandListCommandParams); - readOtaSoftwareUpdateProviderInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readOtaSoftwareUpdateProviderGeneratedCommandListAttributeInteractionInfo); Map @@ -2002,7 +1968,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOtaSoftwareUpdateProviderClusterAcceptedCommandListAttributeCallback(), readOtaSoftwareUpdateProviderAcceptedCommandListCommandParams); - readOtaSoftwareUpdateProviderInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readOtaSoftwareUpdateProviderAcceptedCommandListAttributeInteractionInfo); Map readOtaSoftwareUpdateProviderEventListCommandParams = @@ -2019,7 +1985,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOtaSoftwareUpdateProviderClusterEventListAttributeCallback(), readOtaSoftwareUpdateProviderEventListCommandParams); - readOtaSoftwareUpdateProviderInteractionInfo.put( + result.put( "readEventListAttribute", readOtaSoftwareUpdateProviderEventListAttributeInteractionInfo); Map readOtaSoftwareUpdateProviderAttributeListCommandParams = new LinkedHashMap(); @@ -2035,7 +2001,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOtaSoftwareUpdateProviderClusterAttributeListAttributeCallback(), readOtaSoftwareUpdateProviderAttributeListCommandParams); - readOtaSoftwareUpdateProviderInteractionInfo.put( + result.put( "readAttributeListAttribute", readOtaSoftwareUpdateProviderAttributeListAttributeInteractionInfo); Map readOtaSoftwareUpdateProviderFeatureMapCommandParams = @@ -2048,7 +2014,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readOtaSoftwareUpdateProviderFeatureMapCommandParams); - readOtaSoftwareUpdateProviderInteractionInfo.put( + result.put( "readFeatureMapAttribute", readOtaSoftwareUpdateProviderFeatureMapAttributeInteractionInfo); Map readOtaSoftwareUpdateProviderClusterRevisionCommandParams = new LinkedHashMap(); @@ -2060,12 +2026,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOtaSoftwareUpdateProviderClusterRevisionCommandParams); - readOtaSoftwareUpdateProviderInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readOtaSoftwareUpdateProviderClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("otaSoftwareUpdateProvider", readOtaSoftwareUpdateProviderInteractionInfo); - Map readOtaSoftwareUpdateRequestorInteractionInfo = - new LinkedHashMap<>(); + + return result; + } + + private static Map readOtaSoftwareUpdateRequestorInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readOtaSoftwareUpdateRequestorDefaultOTAProvidersCommandParams = new LinkedHashMap(); @@ -2082,7 +2051,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOtaSoftwareUpdateRequestorClusterDefaultOTAProvidersAttributeCallback(), readOtaSoftwareUpdateRequestorDefaultOTAProvidersCommandParams); - readOtaSoftwareUpdateRequestorInteractionInfo.put( + result.put( "readDefaultOTAProvidersAttribute", readOtaSoftwareUpdateRequestorDefaultOTAProvidersAttributeInteractionInfo); Map readOtaSoftwareUpdateRequestorUpdatePossibleCommandParams = @@ -2095,7 +2064,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readOtaSoftwareUpdateRequestorUpdatePossibleCommandParams); - readOtaSoftwareUpdateRequestorInteractionInfo.put( + result.put( "readUpdatePossibleAttribute", readOtaSoftwareUpdateRequestorUpdatePossibleAttributeInteractionInfo); Map readOtaSoftwareUpdateRequestorUpdateStateCommandParams = @@ -2108,7 +2077,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOtaSoftwareUpdateRequestorUpdateStateCommandParams); - readOtaSoftwareUpdateRequestorInteractionInfo.put( + result.put( "readUpdateStateAttribute", readOtaSoftwareUpdateRequestorUpdateStateAttributeInteractionInfo); Map @@ -2127,7 +2096,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOtaSoftwareUpdateRequestorClusterUpdateStateProgressAttributeCallback(), readOtaSoftwareUpdateRequestorUpdateStateProgressCommandParams); - readOtaSoftwareUpdateRequestorInteractionInfo.put( + result.put( "readUpdateStateProgressAttribute", readOtaSoftwareUpdateRequestorUpdateStateProgressAttributeInteractionInfo); Map @@ -2146,7 +2115,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOtaSoftwareUpdateRequestorClusterGeneratedCommandListAttributeCallback(), readOtaSoftwareUpdateRequestorGeneratedCommandListCommandParams); - readOtaSoftwareUpdateRequestorInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readOtaSoftwareUpdateRequestorGeneratedCommandListAttributeInteractionInfo); Map @@ -2165,7 +2134,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOtaSoftwareUpdateRequestorClusterAcceptedCommandListAttributeCallback(), readOtaSoftwareUpdateRequestorAcceptedCommandListCommandParams); - readOtaSoftwareUpdateRequestorInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readOtaSoftwareUpdateRequestorAcceptedCommandListAttributeInteractionInfo); Map readOtaSoftwareUpdateRequestorEventListCommandParams = @@ -2182,7 +2151,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOtaSoftwareUpdateRequestorClusterEventListAttributeCallback(), readOtaSoftwareUpdateRequestorEventListCommandParams); - readOtaSoftwareUpdateRequestorInteractionInfo.put( + result.put( "readEventListAttribute", readOtaSoftwareUpdateRequestorEventListAttributeInteractionInfo); Map readOtaSoftwareUpdateRequestorAttributeListCommandParams = new LinkedHashMap(); @@ -2199,7 +2168,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOtaSoftwareUpdateRequestorClusterAttributeListAttributeCallback(), readOtaSoftwareUpdateRequestorAttributeListCommandParams); - readOtaSoftwareUpdateRequestorInteractionInfo.put( + result.put( "readAttributeListAttribute", readOtaSoftwareUpdateRequestorAttributeListAttributeInteractionInfo); Map readOtaSoftwareUpdateRequestorFeatureMapCommandParams = @@ -2212,7 +2181,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readOtaSoftwareUpdateRequestorFeatureMapCommandParams); - readOtaSoftwareUpdateRequestorInteractionInfo.put( + result.put( "readFeatureMapAttribute", readOtaSoftwareUpdateRequestorFeatureMapAttributeInteractionInfo); Map readOtaSoftwareUpdateRequestorClusterRevisionCommandParams = @@ -2225,13 +2194,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOtaSoftwareUpdateRequestorClusterRevisionCommandParams); - readOtaSoftwareUpdateRequestorInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readOtaSoftwareUpdateRequestorClusterRevisionAttributeInteractionInfo); - readAttributeMap.put( - "otaSoftwareUpdateRequestor", readOtaSoftwareUpdateRequestorInteractionInfo); - Map readLocalizationConfigurationInteractionInfo = - new LinkedHashMap<>(); + + return result; + } + + private static Map readLocalizationConfigurationInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readLocalizationConfigurationActiveLocaleCommandParams = new LinkedHashMap(); InteractionInfo readLocalizationConfigurationActiveLocaleAttributeInteractionInfo = @@ -2242,7 +2213,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readLocalizationConfigurationActiveLocaleCommandParams); - readLocalizationConfigurationInteractionInfo.put( + result.put( "readActiveLocaleAttribute", readLocalizationConfigurationActiveLocaleAttributeInteractionInfo); Map readLocalizationConfigurationSupportedLocalesCommandParams = @@ -2260,7 +2231,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedLocalizationConfigurationClusterSupportedLocalesAttributeCallback(), readLocalizationConfigurationSupportedLocalesCommandParams); - readLocalizationConfigurationInteractionInfo.put( + result.put( "readSupportedLocalesAttribute", readLocalizationConfigurationSupportedLocalesAttributeInteractionInfo); Map @@ -2279,7 +2250,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedLocalizationConfigurationClusterGeneratedCommandListAttributeCallback(), readLocalizationConfigurationGeneratedCommandListCommandParams); - readLocalizationConfigurationInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readLocalizationConfigurationGeneratedCommandListAttributeInteractionInfo); Map @@ -2298,7 +2269,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedLocalizationConfigurationClusterAcceptedCommandListAttributeCallback(), readLocalizationConfigurationAcceptedCommandListCommandParams); - readLocalizationConfigurationInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readLocalizationConfigurationAcceptedCommandListAttributeInteractionInfo); Map readLocalizationConfigurationEventListCommandParams = @@ -2315,7 +2286,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedLocalizationConfigurationClusterEventListAttributeCallback(), readLocalizationConfigurationEventListCommandParams); - readLocalizationConfigurationInteractionInfo.put( + result.put( "readEventListAttribute", readLocalizationConfigurationEventListAttributeInteractionInfo); Map readLocalizationConfigurationAttributeListCommandParams = new LinkedHashMap(); @@ -2331,7 +2302,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedLocalizationConfigurationClusterAttributeListAttributeCallback(), readLocalizationConfigurationAttributeListCommandParams); - readLocalizationConfigurationInteractionInfo.put( + result.put( "readAttributeListAttribute", readLocalizationConfigurationAttributeListAttributeInteractionInfo); Map readLocalizationConfigurationFeatureMapCommandParams = @@ -2344,7 +2315,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readLocalizationConfigurationFeatureMapCommandParams); - readLocalizationConfigurationInteractionInfo.put( + result.put( "readFeatureMapAttribute", readLocalizationConfigurationFeatureMapAttributeInteractionInfo); Map readLocalizationConfigurationClusterRevisionCommandParams = new LinkedHashMap(); @@ -2356,11 +2327,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readLocalizationConfigurationClusterRevisionCommandParams); - readLocalizationConfigurationInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readLocalizationConfigurationClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("localizationConfiguration", readLocalizationConfigurationInteractionInfo); - Map readTimeFormatLocalizationInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readTimeFormatLocalizationInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readTimeFormatLocalizationHourFormatCommandParams = new LinkedHashMap(); InteractionInfo readTimeFormatLocalizationHourFormatAttributeInteractionInfo = @@ -2371,7 +2346,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readTimeFormatLocalizationHourFormatCommandParams); - readTimeFormatLocalizationInteractionInfo.put( + result.put( "readHourFormatAttribute", readTimeFormatLocalizationHourFormatAttributeInteractionInfo); Map readTimeFormatLocalizationActiveCalendarTypeCommandParams = new LinkedHashMap(); @@ -2384,7 +2359,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readTimeFormatLocalizationActiveCalendarTypeCommandParams); - readTimeFormatLocalizationInteractionInfo.put( + result.put( "readActiveCalendarTypeAttribute", readTimeFormatLocalizationActiveCalendarTypeAttributeInteractionInfo); Map @@ -2403,7 +2378,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedTimeFormatLocalizationClusterSupportedCalendarTypesAttributeCallback(), readTimeFormatLocalizationSupportedCalendarTypesCommandParams); - readTimeFormatLocalizationInteractionInfo.put( + result.put( "readSupportedCalendarTypesAttribute", readTimeFormatLocalizationSupportedCalendarTypesAttributeInteractionInfo); Map readTimeFormatLocalizationGeneratedCommandListCommandParams = @@ -2421,7 +2396,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedTimeFormatLocalizationClusterGeneratedCommandListAttributeCallback(), readTimeFormatLocalizationGeneratedCommandListCommandParams); - readTimeFormatLocalizationInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readTimeFormatLocalizationGeneratedCommandListAttributeInteractionInfo); Map readTimeFormatLocalizationAcceptedCommandListCommandParams = @@ -2439,7 +2414,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedTimeFormatLocalizationClusterAcceptedCommandListAttributeCallback(), readTimeFormatLocalizationAcceptedCommandListCommandParams); - readTimeFormatLocalizationInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readTimeFormatLocalizationAcceptedCommandListAttributeInteractionInfo); Map readTimeFormatLocalizationEventListCommandParams = @@ -2456,7 +2431,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedTimeFormatLocalizationClusterEventListAttributeCallback(), readTimeFormatLocalizationEventListCommandParams); - readTimeFormatLocalizationInteractionInfo.put( + result.put( "readEventListAttribute", readTimeFormatLocalizationEventListAttributeInteractionInfo); Map readTimeFormatLocalizationAttributeListCommandParams = new LinkedHashMap(); @@ -2472,7 +2447,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedTimeFormatLocalizationClusterAttributeListAttributeCallback(), readTimeFormatLocalizationAttributeListCommandParams); - readTimeFormatLocalizationInteractionInfo.put( + result.put( "readAttributeListAttribute", readTimeFormatLocalizationAttributeListAttributeInteractionInfo); Map readTimeFormatLocalizationFeatureMapCommandParams = @@ -2485,7 +2460,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readTimeFormatLocalizationFeatureMapCommandParams); - readTimeFormatLocalizationInteractionInfo.put( + result.put( "readFeatureMapAttribute", readTimeFormatLocalizationFeatureMapAttributeInteractionInfo); Map readTimeFormatLocalizationClusterRevisionCommandParams = new LinkedHashMap(); @@ -2497,11 +2472,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readTimeFormatLocalizationClusterRevisionCommandParams); - readTimeFormatLocalizationInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readTimeFormatLocalizationClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("timeFormatLocalization", readTimeFormatLocalizationInteractionInfo); - Map readUnitLocalizationInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readUnitLocalizationInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readUnitLocalizationTemperatureUnitCommandParams = new LinkedHashMap(); InteractionInfo readUnitLocalizationTemperatureUnitAttributeInteractionInfo = @@ -2512,7 +2491,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitLocalizationTemperatureUnitCommandParams); - readUnitLocalizationInteractionInfo.put( + result.put( "readTemperatureUnitAttribute", readUnitLocalizationTemperatureUnitAttributeInteractionInfo); Map readUnitLocalizationGeneratedCommandListCommandParams = @@ -2529,7 +2508,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitLocalizationClusterGeneratedCommandListAttributeCallback(), readUnitLocalizationGeneratedCommandListCommandParams); - readUnitLocalizationInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readUnitLocalizationGeneratedCommandListAttributeInteractionInfo); Map readUnitLocalizationAcceptedCommandListCommandParams = @@ -2546,7 +2525,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitLocalizationClusterAcceptedCommandListAttributeCallback(), readUnitLocalizationAcceptedCommandListCommandParams); - readUnitLocalizationInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readUnitLocalizationAcceptedCommandListAttributeInteractionInfo); Map readUnitLocalizationEventListCommandParams = @@ -2561,8 +2540,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitLocalizationClusterEventListAttributeCallback(), readUnitLocalizationEventListCommandParams); - readUnitLocalizationInteractionInfo.put( - "readEventListAttribute", readUnitLocalizationEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readUnitLocalizationEventListAttributeInteractionInfo); Map readUnitLocalizationAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readUnitLocalizationAttributeListAttributeInteractionInfo = @@ -2577,7 +2555,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitLocalizationClusterAttributeListAttributeCallback(), readUnitLocalizationAttributeListCommandParams); - readUnitLocalizationInteractionInfo.put( + result.put( "readAttributeListAttribute", readUnitLocalizationAttributeListAttributeInteractionInfo); Map readUnitLocalizationFeatureMapCommandParams = new LinkedHashMap(); @@ -2589,8 +2567,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitLocalizationFeatureMapCommandParams); - readUnitLocalizationInteractionInfo.put( - "readFeatureMapAttribute", readUnitLocalizationFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readUnitLocalizationFeatureMapAttributeInteractionInfo); Map readUnitLocalizationClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readUnitLocalizationClusterRevisionAttributeInteractionInfo = @@ -2601,12 +2578,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitLocalizationClusterRevisionCommandParams); - readUnitLocalizationInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readUnitLocalizationClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("unitLocalization", readUnitLocalizationInteractionInfo); - Map readPowerSourceConfigurationInteractionInfo = - new LinkedHashMap<>(); + + return result; + } + + private static Map readPowerSourceConfigurationInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readPowerSourceConfigurationSourcesCommandParams = new LinkedHashMap(); InteractionInfo readPowerSourceConfigurationSourcesAttributeInteractionInfo = @@ -2621,8 +2601,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPowerSourceConfigurationClusterSourcesAttributeCallback(), readPowerSourceConfigurationSourcesCommandParams); - readPowerSourceConfigurationInteractionInfo.put( - "readSourcesAttribute", readPowerSourceConfigurationSourcesAttributeInteractionInfo); + result.put("readSourcesAttribute", readPowerSourceConfigurationSourcesAttributeInteractionInfo); Map readPowerSourceConfigurationGeneratedCommandListCommandParams = new LinkedHashMap(); @@ -2639,7 +2618,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPowerSourceConfigurationClusterGeneratedCommandListAttributeCallback(), readPowerSourceConfigurationGeneratedCommandListCommandParams); - readPowerSourceConfigurationInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readPowerSourceConfigurationGeneratedCommandListAttributeInteractionInfo); Map readPowerSourceConfigurationAcceptedCommandListCommandParams = @@ -2657,7 +2636,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPowerSourceConfigurationClusterAcceptedCommandListAttributeCallback(), readPowerSourceConfigurationAcceptedCommandListCommandParams); - readPowerSourceConfigurationInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readPowerSourceConfigurationAcceptedCommandListAttributeInteractionInfo); Map readPowerSourceConfigurationEventListCommandParams = @@ -2674,7 +2653,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPowerSourceConfigurationClusterEventListAttributeCallback(), readPowerSourceConfigurationEventListCommandParams); - readPowerSourceConfigurationInteractionInfo.put( + result.put( "readEventListAttribute", readPowerSourceConfigurationEventListAttributeInteractionInfo); Map readPowerSourceConfigurationAttributeListCommandParams = new LinkedHashMap(); @@ -2690,7 +2669,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPowerSourceConfigurationClusterAttributeListAttributeCallback(), readPowerSourceConfigurationAttributeListCommandParams); - readPowerSourceConfigurationInteractionInfo.put( + result.put( "readAttributeListAttribute", readPowerSourceConfigurationAttributeListAttributeInteractionInfo); Map readPowerSourceConfigurationFeatureMapCommandParams = @@ -2703,7 +2682,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readPowerSourceConfigurationFeatureMapCommandParams); - readPowerSourceConfigurationInteractionInfo.put( + result.put( "readFeatureMapAttribute", readPowerSourceConfigurationFeatureMapAttributeInteractionInfo); Map readPowerSourceConfigurationClusterRevisionCommandParams = new LinkedHashMap(); @@ -2715,11 +2694,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPowerSourceConfigurationClusterRevisionCommandParams); - readPowerSourceConfigurationInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readPowerSourceConfigurationClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("powerSourceConfiguration", readPowerSourceConfigurationInteractionInfo); - Map readPowerSourceInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readPowerSourceInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readPowerSourceStatusCommandParams = new LinkedHashMap(); InteractionInfo readPowerSourceStatusAttributeInteractionInfo = @@ -2730,8 +2713,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPowerSourceStatusCommandParams); - readPowerSourceInteractionInfo.put( - "readStatusAttribute", readPowerSourceStatusAttributeInteractionInfo); + result.put("readStatusAttribute", readPowerSourceStatusAttributeInteractionInfo); Map readPowerSourceOrderCommandParams = new LinkedHashMap(); InteractionInfo readPowerSourceOrderAttributeInteractionInfo = @@ -2742,8 +2724,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPowerSourceOrderCommandParams); - readPowerSourceInteractionInfo.put( - "readOrderAttribute", readPowerSourceOrderAttributeInteractionInfo); + result.put("readOrderAttribute", readPowerSourceOrderAttributeInteractionInfo); Map readPowerSourceDescriptionCommandParams = new LinkedHashMap(); InteractionInfo readPowerSourceDescriptionAttributeInteractionInfo = @@ -2754,8 +2735,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readPowerSourceDescriptionCommandParams); - readPowerSourceInteractionInfo.put( - "readDescriptionAttribute", readPowerSourceDescriptionAttributeInteractionInfo); + result.put("readDescriptionAttribute", readPowerSourceDescriptionAttributeInteractionInfo); Map readPowerSourceWiredAssessedInputVoltageCommandParams = new LinkedHashMap(); InteractionInfo readPowerSourceWiredAssessedInputVoltageAttributeInteractionInfo = @@ -2770,7 +2750,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPowerSourceClusterWiredAssessedInputVoltageAttributeCallback(), readPowerSourceWiredAssessedInputVoltageCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readWiredAssessedInputVoltageAttribute", readPowerSourceWiredAssessedInputVoltageAttributeInteractionInfo); Map readPowerSourceWiredAssessedInputFrequencyCommandParams = @@ -2787,7 +2767,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPowerSourceClusterWiredAssessedInputFrequencyAttributeCallback(), readPowerSourceWiredAssessedInputFrequencyCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readWiredAssessedInputFrequencyAttribute", readPowerSourceWiredAssessedInputFrequencyAttributeInteractionInfo); Map readPowerSourceWiredCurrentTypeCommandParams = @@ -2800,7 +2780,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPowerSourceWiredCurrentTypeCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readWiredCurrentTypeAttribute", readPowerSourceWiredCurrentTypeAttributeInteractionInfo); Map readPowerSourceWiredAssessedCurrentCommandParams = new LinkedHashMap(); @@ -2816,7 +2796,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPowerSourceClusterWiredAssessedCurrentAttributeCallback(), readPowerSourceWiredAssessedCurrentCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readWiredAssessedCurrentAttribute", readPowerSourceWiredAssessedCurrentAttributeInteractionInfo); Map readPowerSourceWiredNominalVoltageCommandParams = @@ -2829,7 +2809,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readPowerSourceWiredNominalVoltageCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readWiredNominalVoltageAttribute", readPowerSourceWiredNominalVoltageAttributeInteractionInfo); Map readPowerSourceWiredMaximumCurrentCommandParams = @@ -2842,7 +2822,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readPowerSourceWiredMaximumCurrentCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readWiredMaximumCurrentAttribute", readPowerSourceWiredMaximumCurrentAttributeInteractionInfo); Map readPowerSourceWiredPresentCommandParams = @@ -2855,8 +2835,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readPowerSourceWiredPresentCommandParams); - readPowerSourceInteractionInfo.put( - "readWiredPresentAttribute", readPowerSourceWiredPresentAttributeInteractionInfo); + result.put("readWiredPresentAttribute", readPowerSourceWiredPresentAttributeInteractionInfo); Map readPowerSourceActiveWiredFaultsCommandParams = new LinkedHashMap(); InteractionInfo readPowerSourceActiveWiredFaultsAttributeInteractionInfo = @@ -2871,7 +2850,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPowerSourceClusterActiveWiredFaultsAttributeCallback(), readPowerSourceActiveWiredFaultsCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readActiveWiredFaultsAttribute", readPowerSourceActiveWiredFaultsAttributeInteractionInfo); Map readPowerSourceBatVoltageCommandParams = new LinkedHashMap(); @@ -2884,8 +2863,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedPowerSourceClusterBatVoltageAttributeCallback(), readPowerSourceBatVoltageCommandParams); - readPowerSourceInteractionInfo.put( - "readBatVoltageAttribute", readPowerSourceBatVoltageAttributeInteractionInfo); + result.put("readBatVoltageAttribute", readPowerSourceBatVoltageAttributeInteractionInfo); Map readPowerSourceBatPercentRemainingCommandParams = new LinkedHashMap(); InteractionInfo readPowerSourceBatPercentRemainingAttributeInteractionInfo = @@ -2900,7 +2878,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPowerSourceClusterBatPercentRemainingAttributeCallback(), readPowerSourceBatPercentRemainingCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readBatPercentRemainingAttribute", readPowerSourceBatPercentRemainingAttributeInteractionInfo); Map readPowerSourceBatTimeRemainingCommandParams = @@ -2916,7 +2894,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPowerSourceClusterBatTimeRemainingAttributeCallback(), readPowerSourceBatTimeRemainingCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readBatTimeRemainingAttribute", readPowerSourceBatTimeRemainingAttributeInteractionInfo); Map readPowerSourceBatChargeLevelCommandParams = new LinkedHashMap(); @@ -2928,7 +2906,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPowerSourceBatChargeLevelCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readBatChargeLevelAttribute", readPowerSourceBatChargeLevelAttributeInteractionInfo); Map readPowerSourceBatReplacementNeededCommandParams = new LinkedHashMap(); @@ -2941,7 +2919,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readPowerSourceBatReplacementNeededCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readBatReplacementNeededAttribute", readPowerSourceBatReplacementNeededAttributeInteractionInfo); Map readPowerSourceBatReplaceabilityCommandParams = @@ -2954,7 +2932,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPowerSourceBatReplaceabilityCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readBatReplaceabilityAttribute", readPowerSourceBatReplaceabilityAttributeInteractionInfo); Map readPowerSourceBatPresentCommandParams = new LinkedHashMap(); @@ -2966,8 +2944,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readPowerSourceBatPresentCommandParams); - readPowerSourceInteractionInfo.put( - "readBatPresentAttribute", readPowerSourceBatPresentAttributeInteractionInfo); + result.put("readBatPresentAttribute", readPowerSourceBatPresentAttributeInteractionInfo); Map readPowerSourceActiveBatFaultsCommandParams = new LinkedHashMap(); InteractionInfo readPowerSourceActiveBatFaultsAttributeInteractionInfo = @@ -2981,7 +2958,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPowerSourceClusterActiveBatFaultsAttributeCallback(), readPowerSourceActiveBatFaultsCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readActiveBatFaultsAttribute", readPowerSourceActiveBatFaultsAttributeInteractionInfo); Map readPowerSourceBatReplacementDescriptionCommandParams = new LinkedHashMap(); @@ -2994,7 +2971,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readPowerSourceBatReplacementDescriptionCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readBatReplacementDescriptionAttribute", readPowerSourceBatReplacementDescriptionAttributeInteractionInfo); Map readPowerSourceBatCommonDesignationCommandParams = @@ -3008,7 +2985,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPowerSourceBatCommonDesignationCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readBatCommonDesignationAttribute", readPowerSourceBatCommonDesignationAttributeInteractionInfo); Map readPowerSourceBatANSIDesignationCommandParams = @@ -3022,7 +2999,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readPowerSourceBatANSIDesignationCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readBatANSIDesignationAttribute", readPowerSourceBatANSIDesignationAttributeInteractionInfo); Map readPowerSourceBatIECDesignationCommandParams = @@ -3036,7 +3013,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readPowerSourceBatIECDesignationCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readBatIECDesignationAttribute", readPowerSourceBatIECDesignationAttributeInteractionInfo); Map readPowerSourceBatApprovedChemistryCommandParams = new LinkedHashMap(); @@ -3049,7 +3026,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPowerSourceBatApprovedChemistryCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readBatApprovedChemistryAttribute", readPowerSourceBatApprovedChemistryAttributeInteractionInfo); Map readPowerSourceBatCapacityCommandParams = @@ -3062,8 +3039,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readPowerSourceBatCapacityCommandParams); - readPowerSourceInteractionInfo.put( - "readBatCapacityAttribute", readPowerSourceBatCapacityAttributeInteractionInfo); + result.put("readBatCapacityAttribute", readPowerSourceBatCapacityAttributeInteractionInfo); Map readPowerSourceBatQuantityCommandParams = new LinkedHashMap(); InteractionInfo readPowerSourceBatQuantityAttributeInteractionInfo = @@ -3074,8 +3050,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPowerSourceBatQuantityCommandParams); - readPowerSourceInteractionInfo.put( - "readBatQuantityAttribute", readPowerSourceBatQuantityAttributeInteractionInfo); + result.put("readBatQuantityAttribute", readPowerSourceBatQuantityAttributeInteractionInfo); Map readPowerSourceBatChargeStateCommandParams = new LinkedHashMap(); InteractionInfo readPowerSourceBatChargeStateAttributeInteractionInfo = @@ -3086,7 +3061,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPowerSourceBatChargeStateCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readBatChargeStateAttribute", readPowerSourceBatChargeStateAttributeInteractionInfo); Map readPowerSourceBatTimeToFullChargeCommandParams = new LinkedHashMap(); @@ -3102,7 +3077,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPowerSourceClusterBatTimeToFullChargeAttributeCallback(), readPowerSourceBatTimeToFullChargeCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readBatTimeToFullChargeAttribute", readPowerSourceBatTimeToFullChargeAttributeInteractionInfo); Map readPowerSourceBatFunctionalWhileChargingCommandParams = @@ -3116,7 +3091,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readPowerSourceBatFunctionalWhileChargingCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readBatFunctionalWhileChargingAttribute", readPowerSourceBatFunctionalWhileChargingAttributeInteractionInfo); Map readPowerSourceBatChargingCurrentCommandParams = @@ -3133,7 +3108,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPowerSourceClusterBatChargingCurrentAttributeCallback(), readPowerSourceBatChargingCurrentCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readBatChargingCurrentAttribute", readPowerSourceBatChargingCurrentAttributeInteractionInfo); Map readPowerSourceActiveBatChargeFaultsCommandParams = @@ -3150,7 +3125,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPowerSourceClusterActiveBatChargeFaultsAttributeCallback(), readPowerSourceActiveBatChargeFaultsCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readActiveBatChargeFaultsAttribute", readPowerSourceActiveBatChargeFaultsAttributeInteractionInfo); Map readPowerSourceGeneratedCommandListCommandParams = @@ -3167,7 +3142,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPowerSourceClusterGeneratedCommandListAttributeCallback(), readPowerSourceGeneratedCommandListCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readPowerSourceGeneratedCommandListAttributeInteractionInfo); Map readPowerSourceAcceptedCommandListCommandParams = @@ -3184,7 +3159,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPowerSourceClusterAcceptedCommandListAttributeCallback(), readPowerSourceAcceptedCommandListCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readPowerSourceAcceptedCommandListAttributeInteractionInfo); Map readPowerSourceEventListCommandParams = @@ -3198,8 +3173,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedPowerSourceClusterEventListAttributeCallback(), readPowerSourceEventListCommandParams); - readPowerSourceInteractionInfo.put( - "readEventListAttribute", readPowerSourceEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readPowerSourceEventListAttributeInteractionInfo); Map readPowerSourceAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readPowerSourceAttributeListAttributeInteractionInfo = @@ -3212,8 +3186,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedPowerSourceClusterAttributeListAttributeCallback(), readPowerSourceAttributeListCommandParams); - readPowerSourceInteractionInfo.put( - "readAttributeListAttribute", readPowerSourceAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readPowerSourceAttributeListAttributeInteractionInfo); Map readPowerSourceFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readPowerSourceFeatureMapAttributeInteractionInfo = @@ -3224,8 +3197,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readPowerSourceFeatureMapCommandParams); - readPowerSourceInteractionInfo.put( - "readFeatureMapAttribute", readPowerSourceFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readPowerSourceFeatureMapAttributeInteractionInfo); Map readPowerSourceClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readPowerSourceClusterRevisionAttributeInteractionInfo = @@ -3236,10 +3208,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPowerSourceClusterRevisionCommandParams); - readPowerSourceInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readPowerSourceClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("powerSource", readPowerSourceInteractionInfo); - Map readGeneralCommissioningInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readGeneralCommissioningInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readGeneralCommissioningBreadcrumbCommandParams = new LinkedHashMap(); InteractionInfo readGeneralCommissioningBreadcrumbAttributeInteractionInfo = @@ -3250,7 +3226,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readGeneralCommissioningBreadcrumbCommandParams); - readGeneralCommissioningInteractionInfo.put( + result.put( "readBreadcrumbAttribute", readGeneralCommissioningBreadcrumbAttributeInteractionInfo); Map readGeneralCommissioningRegulatoryConfigCommandParams = new LinkedHashMap(); @@ -3262,7 +3238,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readGeneralCommissioningRegulatoryConfigCommandParams); - readGeneralCommissioningInteractionInfo.put( + result.put( "readRegulatoryConfigAttribute", readGeneralCommissioningRegulatoryConfigAttributeInteractionInfo); Map readGeneralCommissioningLocationCapabilityCommandParams = @@ -3276,7 +3252,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readGeneralCommissioningLocationCapabilityCommandParams); - readGeneralCommissioningInteractionInfo.put( + result.put( "readLocationCapabilityAttribute", readGeneralCommissioningLocationCapabilityAttributeInteractionInfo); Map @@ -3291,7 +3267,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readGeneralCommissioningSupportsConcurrentConnectionCommandParams); - readGeneralCommissioningInteractionInfo.put( + result.put( "readSupportsConcurrentConnectionAttribute", readGeneralCommissioningSupportsConcurrentConnectionAttributeInteractionInfo); Map readGeneralCommissioningGeneratedCommandListCommandParams = @@ -3309,7 +3285,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGeneralCommissioningClusterGeneratedCommandListAttributeCallback(), readGeneralCommissioningGeneratedCommandListCommandParams); - readGeneralCommissioningInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readGeneralCommissioningGeneratedCommandListAttributeInteractionInfo); Map readGeneralCommissioningAcceptedCommandListCommandParams = @@ -3327,7 +3303,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGeneralCommissioningClusterAcceptedCommandListAttributeCallback(), readGeneralCommissioningAcceptedCommandListCommandParams); - readGeneralCommissioningInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readGeneralCommissioningAcceptedCommandListAttributeInteractionInfo); Map readGeneralCommissioningEventListCommandParams = @@ -3344,8 +3320,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGeneralCommissioningClusterEventListAttributeCallback(), readGeneralCommissioningEventListCommandParams); - readGeneralCommissioningInteractionInfo.put( - "readEventListAttribute", readGeneralCommissioningEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readGeneralCommissioningEventListAttributeInteractionInfo); Map readGeneralCommissioningAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readGeneralCommissioningAttributeListAttributeInteractionInfo = @@ -3360,7 +3335,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGeneralCommissioningClusterAttributeListAttributeCallback(), readGeneralCommissioningAttributeListCommandParams); - readGeneralCommissioningInteractionInfo.put( + result.put( "readAttributeListAttribute", readGeneralCommissioningAttributeListAttributeInteractionInfo); Map readGeneralCommissioningFeatureMapCommandParams = @@ -3373,7 +3348,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readGeneralCommissioningFeatureMapCommandParams); - readGeneralCommissioningInteractionInfo.put( + result.put( "readFeatureMapAttribute", readGeneralCommissioningFeatureMapAttributeInteractionInfo); Map readGeneralCommissioningClusterRevisionCommandParams = new LinkedHashMap(); @@ -3385,11 +3360,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readGeneralCommissioningClusterRevisionCommandParams); - readGeneralCommissioningInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readGeneralCommissioningClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("generalCommissioning", readGeneralCommissioningInteractionInfo); - Map readNetworkCommissioningInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readNetworkCommissioningInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readNetworkCommissioningMaxNetworksCommandParams = new LinkedHashMap(); InteractionInfo readNetworkCommissioningMaxNetworksAttributeInteractionInfo = @@ -3400,7 +3379,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readNetworkCommissioningMaxNetworksCommandParams); - readNetworkCommissioningInteractionInfo.put( + result.put( "readMaxNetworksAttribute", readNetworkCommissioningMaxNetworksAttributeInteractionInfo); Map readNetworkCommissioningNetworksCommandParams = new LinkedHashMap(); @@ -3416,8 +3395,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedNetworkCommissioningClusterNetworksAttributeCallback(), readNetworkCommissioningNetworksCommandParams); - readNetworkCommissioningInteractionInfo.put( - "readNetworksAttribute", readNetworkCommissioningNetworksAttributeInteractionInfo); + result.put("readNetworksAttribute", readNetworkCommissioningNetworksAttributeInteractionInfo); Map readNetworkCommissioningScanMaxTimeSecondsCommandParams = new LinkedHashMap(); InteractionInfo readNetworkCommissioningScanMaxTimeSecondsAttributeInteractionInfo = @@ -3429,7 +3407,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readNetworkCommissioningScanMaxTimeSecondsCommandParams); - readNetworkCommissioningInteractionInfo.put( + result.put( "readScanMaxTimeSecondsAttribute", readNetworkCommissioningScanMaxTimeSecondsAttributeInteractionInfo); Map readNetworkCommissioningConnectMaxTimeSecondsCommandParams = @@ -3443,7 +3421,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readNetworkCommissioningConnectMaxTimeSecondsCommandParams); - readNetworkCommissioningInteractionInfo.put( + result.put( "readConnectMaxTimeSecondsAttribute", readNetworkCommissioningConnectMaxTimeSecondsAttributeInteractionInfo); Map readNetworkCommissioningInterfaceEnabledCommandParams = @@ -3456,7 +3434,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readNetworkCommissioningInterfaceEnabledCommandParams); - readNetworkCommissioningInteractionInfo.put( + result.put( "readInterfaceEnabledAttribute", readNetworkCommissioningInterfaceEnabledAttributeInteractionInfo); Map readNetworkCommissioningLastNetworkingStatusCommandParams = @@ -3474,7 +3452,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedNetworkCommissioningClusterLastNetworkingStatusAttributeCallback(), readNetworkCommissioningLastNetworkingStatusCommandParams); - readNetworkCommissioningInteractionInfo.put( + result.put( "readLastNetworkingStatusAttribute", readNetworkCommissioningLastNetworkingStatusAttributeInteractionInfo); Map readNetworkCommissioningLastNetworkIDCommandParams = @@ -3491,7 +3469,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedNetworkCommissioningClusterLastNetworkIDAttributeCallback(), readNetworkCommissioningLastNetworkIDCommandParams); - readNetworkCommissioningInteractionInfo.put( + result.put( "readLastNetworkIDAttribute", readNetworkCommissioningLastNetworkIDAttributeInteractionInfo); Map readNetworkCommissioningLastConnectErrorValueCommandParams = @@ -3509,7 +3487,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedNetworkCommissioningClusterLastConnectErrorValueAttributeCallback(), readNetworkCommissioningLastConnectErrorValueCommandParams); - readNetworkCommissioningInteractionInfo.put( + result.put( "readLastConnectErrorValueAttribute", readNetworkCommissioningLastConnectErrorValueAttributeInteractionInfo); Map readNetworkCommissioningGeneratedCommandListCommandParams = @@ -3527,7 +3505,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedNetworkCommissioningClusterGeneratedCommandListAttributeCallback(), readNetworkCommissioningGeneratedCommandListCommandParams); - readNetworkCommissioningInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readNetworkCommissioningGeneratedCommandListAttributeInteractionInfo); Map readNetworkCommissioningAcceptedCommandListCommandParams = @@ -3545,7 +3523,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedNetworkCommissioningClusterAcceptedCommandListAttributeCallback(), readNetworkCommissioningAcceptedCommandListCommandParams); - readNetworkCommissioningInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readNetworkCommissioningAcceptedCommandListAttributeInteractionInfo); Map readNetworkCommissioningEventListCommandParams = @@ -3562,8 +3540,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedNetworkCommissioningClusterEventListAttributeCallback(), readNetworkCommissioningEventListCommandParams); - readNetworkCommissioningInteractionInfo.put( - "readEventListAttribute", readNetworkCommissioningEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readNetworkCommissioningEventListAttributeInteractionInfo); Map readNetworkCommissioningAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readNetworkCommissioningAttributeListAttributeInteractionInfo = @@ -3578,7 +3555,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedNetworkCommissioningClusterAttributeListAttributeCallback(), readNetworkCommissioningAttributeListCommandParams); - readNetworkCommissioningInteractionInfo.put( + result.put( "readAttributeListAttribute", readNetworkCommissioningAttributeListAttributeInteractionInfo); Map readNetworkCommissioningFeatureMapCommandParams = @@ -3591,7 +3568,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readNetworkCommissioningFeatureMapCommandParams); - readNetworkCommissioningInteractionInfo.put( + result.put( "readFeatureMapAttribute", readNetworkCommissioningFeatureMapAttributeInteractionInfo); Map readNetworkCommissioningClusterRevisionCommandParams = new LinkedHashMap(); @@ -3603,11 +3580,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readNetworkCommissioningClusterRevisionCommandParams); - readNetworkCommissioningInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readNetworkCommissioningClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("networkCommissioning", readNetworkCommissioningInteractionInfo); - Map readDiagnosticLogsInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readDiagnosticLogsInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readDiagnosticLogsGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readDiagnosticLogsGeneratedCommandListAttributeInteractionInfo = @@ -3622,7 +3603,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedDiagnosticLogsClusterGeneratedCommandListAttributeCallback(), readDiagnosticLogsGeneratedCommandListCommandParams); - readDiagnosticLogsInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readDiagnosticLogsGeneratedCommandListAttributeInteractionInfo); Map readDiagnosticLogsAcceptedCommandListCommandParams = @@ -3639,7 +3620,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedDiagnosticLogsClusterAcceptedCommandListAttributeCallback(), readDiagnosticLogsAcceptedCommandListCommandParams); - readDiagnosticLogsInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readDiagnosticLogsAcceptedCommandListAttributeInteractionInfo); Map readDiagnosticLogsEventListCommandParams = @@ -3653,8 +3634,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedDiagnosticLogsClusterEventListAttributeCallback(), readDiagnosticLogsEventListCommandParams); - readDiagnosticLogsInteractionInfo.put( - "readEventListAttribute", readDiagnosticLogsEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readDiagnosticLogsEventListAttributeInteractionInfo); Map readDiagnosticLogsAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readDiagnosticLogsAttributeListAttributeInteractionInfo = @@ -3668,7 +3648,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedDiagnosticLogsClusterAttributeListAttributeCallback(), readDiagnosticLogsAttributeListCommandParams); - readDiagnosticLogsInteractionInfo.put( + result.put( "readAttributeListAttribute", readDiagnosticLogsAttributeListAttributeInteractionInfo); Map readDiagnosticLogsFeatureMapCommandParams = new LinkedHashMap(); @@ -3680,8 +3660,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readDiagnosticLogsFeatureMapCommandParams); - readDiagnosticLogsInteractionInfo.put( - "readFeatureMapAttribute", readDiagnosticLogsFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readDiagnosticLogsFeatureMapAttributeInteractionInfo); Map readDiagnosticLogsClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readDiagnosticLogsClusterRevisionAttributeInteractionInfo = @@ -3692,10 +3671,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDiagnosticLogsClusterRevisionCommandParams); - readDiagnosticLogsInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readDiagnosticLogsClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("diagnosticLogs", readDiagnosticLogsInteractionInfo); - Map readGeneralDiagnosticsInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readGeneralDiagnosticsInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readGeneralDiagnosticsNetworkInterfacesCommandParams = new LinkedHashMap(); InteractionInfo readGeneralDiagnosticsNetworkInterfacesAttributeInteractionInfo = @@ -3710,7 +3693,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGeneralDiagnosticsClusterNetworkInterfacesAttributeCallback(), readGeneralDiagnosticsNetworkInterfacesCommandParams); - readGeneralDiagnosticsInteractionInfo.put( + result.put( "readNetworkInterfacesAttribute", readGeneralDiagnosticsNetworkInterfacesAttributeInteractionInfo); Map readGeneralDiagnosticsRebootCountCommandParams = @@ -3723,7 +3706,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readGeneralDiagnosticsRebootCountCommandParams); - readGeneralDiagnosticsInteractionInfo.put( + result.put( "readRebootCountAttribute", readGeneralDiagnosticsRebootCountAttributeInteractionInfo); Map readGeneralDiagnosticsUpTimeCommandParams = new LinkedHashMap(); @@ -3735,8 +3718,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readGeneralDiagnosticsUpTimeCommandParams); - readGeneralDiagnosticsInteractionInfo.put( - "readUpTimeAttribute", readGeneralDiagnosticsUpTimeAttributeInteractionInfo); + result.put("readUpTimeAttribute", readGeneralDiagnosticsUpTimeAttributeInteractionInfo); Map readGeneralDiagnosticsTotalOperationalHoursCommandParams = new LinkedHashMap(); InteractionInfo readGeneralDiagnosticsTotalOperationalHoursAttributeInteractionInfo = @@ -3748,7 +3730,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readGeneralDiagnosticsTotalOperationalHoursCommandParams); - readGeneralDiagnosticsInteractionInfo.put( + result.put( "readTotalOperationalHoursAttribute", readGeneralDiagnosticsTotalOperationalHoursAttributeInteractionInfo); Map readGeneralDiagnosticsBootReasonCommandParams = @@ -3761,8 +3743,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readGeneralDiagnosticsBootReasonCommandParams); - readGeneralDiagnosticsInteractionInfo.put( - "readBootReasonAttribute", readGeneralDiagnosticsBootReasonAttributeInteractionInfo); + result.put("readBootReasonAttribute", readGeneralDiagnosticsBootReasonAttributeInteractionInfo); Map readGeneralDiagnosticsActiveHardwareFaultsCommandParams = new LinkedHashMap(); InteractionInfo readGeneralDiagnosticsActiveHardwareFaultsAttributeInteractionInfo = @@ -3777,7 +3758,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGeneralDiagnosticsClusterActiveHardwareFaultsAttributeCallback(), readGeneralDiagnosticsActiveHardwareFaultsCommandParams); - readGeneralDiagnosticsInteractionInfo.put( + result.put( "readActiveHardwareFaultsAttribute", readGeneralDiagnosticsActiveHardwareFaultsAttributeInteractionInfo); Map readGeneralDiagnosticsActiveRadioFaultsCommandParams = @@ -3794,7 +3775,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGeneralDiagnosticsClusterActiveRadioFaultsAttributeCallback(), readGeneralDiagnosticsActiveRadioFaultsCommandParams); - readGeneralDiagnosticsInteractionInfo.put( + result.put( "readActiveRadioFaultsAttribute", readGeneralDiagnosticsActiveRadioFaultsAttributeInteractionInfo); Map readGeneralDiagnosticsActiveNetworkFaultsCommandParams = @@ -3811,7 +3792,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGeneralDiagnosticsClusterActiveNetworkFaultsAttributeCallback(), readGeneralDiagnosticsActiveNetworkFaultsCommandParams); - readGeneralDiagnosticsInteractionInfo.put( + result.put( "readActiveNetworkFaultsAttribute", readGeneralDiagnosticsActiveNetworkFaultsAttributeInteractionInfo); Map readGeneralDiagnosticsTestEventTriggersEnabledCommandParams = @@ -3825,7 +3806,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readGeneralDiagnosticsTestEventTriggersEnabledCommandParams); - readGeneralDiagnosticsInteractionInfo.put( + result.put( "readTestEventTriggersEnabledAttribute", readGeneralDiagnosticsTestEventTriggersEnabledAttributeInteractionInfo); Map readGeneralDiagnosticsGeneratedCommandListCommandParams = @@ -3842,7 +3823,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGeneralDiagnosticsClusterGeneratedCommandListAttributeCallback(), readGeneralDiagnosticsGeneratedCommandListCommandParams); - readGeneralDiagnosticsInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readGeneralDiagnosticsGeneratedCommandListAttributeInteractionInfo); Map readGeneralDiagnosticsAcceptedCommandListCommandParams = @@ -3859,7 +3840,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGeneralDiagnosticsClusterAcceptedCommandListAttributeCallback(), readGeneralDiagnosticsAcceptedCommandListCommandParams); - readGeneralDiagnosticsInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readGeneralDiagnosticsAcceptedCommandListAttributeInteractionInfo); Map readGeneralDiagnosticsEventListCommandParams = @@ -3875,8 +3856,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGeneralDiagnosticsClusterEventListAttributeCallback(), readGeneralDiagnosticsEventListCommandParams); - readGeneralDiagnosticsInteractionInfo.put( - "readEventListAttribute", readGeneralDiagnosticsEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readGeneralDiagnosticsEventListAttributeInteractionInfo); Map readGeneralDiagnosticsAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readGeneralDiagnosticsAttributeListAttributeInteractionInfo = @@ -3891,7 +3871,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGeneralDiagnosticsClusterAttributeListAttributeCallback(), readGeneralDiagnosticsAttributeListCommandParams); - readGeneralDiagnosticsInteractionInfo.put( + result.put( "readAttributeListAttribute", readGeneralDiagnosticsAttributeListAttributeInteractionInfo); Map readGeneralDiagnosticsFeatureMapCommandParams = new LinkedHashMap(); @@ -3903,8 +3883,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readGeneralDiagnosticsFeatureMapCommandParams); - readGeneralDiagnosticsInteractionInfo.put( - "readFeatureMapAttribute", readGeneralDiagnosticsFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readGeneralDiagnosticsFeatureMapAttributeInteractionInfo); Map readGeneralDiagnosticsClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readGeneralDiagnosticsClusterRevisionAttributeInteractionInfo = @@ -3915,11 +3894,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readGeneralDiagnosticsClusterRevisionCommandParams); - readGeneralDiagnosticsInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readGeneralDiagnosticsClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("generalDiagnostics", readGeneralDiagnosticsInteractionInfo); - Map readSoftwareDiagnosticsInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readSoftwareDiagnosticsInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readSoftwareDiagnosticsThreadMetricsCommandParams = new LinkedHashMap(); InteractionInfo readSoftwareDiagnosticsThreadMetricsAttributeInteractionInfo = @@ -3934,7 +3917,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedSoftwareDiagnosticsClusterThreadMetricsAttributeCallback(), readSoftwareDiagnosticsThreadMetricsCommandParams); - readSoftwareDiagnosticsInteractionInfo.put( + result.put( "readThreadMetricsAttribute", readSoftwareDiagnosticsThreadMetricsAttributeInteractionInfo); Map readSoftwareDiagnosticsCurrentHeapFreeCommandParams = new LinkedHashMap(); @@ -3946,7 +3929,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readSoftwareDiagnosticsCurrentHeapFreeCommandParams); - readSoftwareDiagnosticsInteractionInfo.put( + result.put( "readCurrentHeapFreeAttribute", readSoftwareDiagnosticsCurrentHeapFreeAttributeInteractionInfo); Map readSoftwareDiagnosticsCurrentHeapUsedCommandParams = @@ -3959,7 +3942,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readSoftwareDiagnosticsCurrentHeapUsedCommandParams); - readSoftwareDiagnosticsInteractionInfo.put( + result.put( "readCurrentHeapUsedAttribute", readSoftwareDiagnosticsCurrentHeapUsedAttributeInteractionInfo); Map readSoftwareDiagnosticsCurrentHeapHighWatermarkCommandParams = @@ -3973,7 +3956,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readSoftwareDiagnosticsCurrentHeapHighWatermarkCommandParams); - readSoftwareDiagnosticsInteractionInfo.put( + result.put( "readCurrentHeapHighWatermarkAttribute", readSoftwareDiagnosticsCurrentHeapHighWatermarkAttributeInteractionInfo); Map readSoftwareDiagnosticsGeneratedCommandListCommandParams = @@ -3991,7 +3974,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedSoftwareDiagnosticsClusterGeneratedCommandListAttributeCallback(), readSoftwareDiagnosticsGeneratedCommandListCommandParams); - readSoftwareDiagnosticsInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readSoftwareDiagnosticsGeneratedCommandListAttributeInteractionInfo); Map readSoftwareDiagnosticsAcceptedCommandListCommandParams = @@ -4008,7 +3991,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedSoftwareDiagnosticsClusterAcceptedCommandListAttributeCallback(), readSoftwareDiagnosticsAcceptedCommandListCommandParams); - readSoftwareDiagnosticsInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readSoftwareDiagnosticsAcceptedCommandListAttributeInteractionInfo); Map readSoftwareDiagnosticsEventListCommandParams = @@ -4025,8 +4008,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedSoftwareDiagnosticsClusterEventListAttributeCallback(), readSoftwareDiagnosticsEventListCommandParams); - readSoftwareDiagnosticsInteractionInfo.put( - "readEventListAttribute", readSoftwareDiagnosticsEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readSoftwareDiagnosticsEventListAttributeInteractionInfo); Map readSoftwareDiagnosticsAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readSoftwareDiagnosticsAttributeListAttributeInteractionInfo = @@ -4041,7 +4023,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedSoftwareDiagnosticsClusterAttributeListAttributeCallback(), readSoftwareDiagnosticsAttributeListCommandParams); - readSoftwareDiagnosticsInteractionInfo.put( + result.put( "readAttributeListAttribute", readSoftwareDiagnosticsAttributeListAttributeInteractionInfo); Map readSoftwareDiagnosticsFeatureMapCommandParams = new LinkedHashMap(); @@ -4053,7 +4035,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readSoftwareDiagnosticsFeatureMapCommandParams); - readSoftwareDiagnosticsInteractionInfo.put( + result.put( "readFeatureMapAttribute", readSoftwareDiagnosticsFeatureMapAttributeInteractionInfo); Map readSoftwareDiagnosticsClusterRevisionCommandParams = new LinkedHashMap(); @@ -4065,12 +4047,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readSoftwareDiagnosticsClusterRevisionCommandParams); - readSoftwareDiagnosticsInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readSoftwareDiagnosticsClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("softwareDiagnostics", readSoftwareDiagnosticsInteractionInfo); - Map readThreadNetworkDiagnosticsInteractionInfo = - new LinkedHashMap<>(); + + return result; + } + + private static Map readThreadNetworkDiagnosticsInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readThreadNetworkDiagnosticsChannelCommandParams = new LinkedHashMap(); InteractionInfo readThreadNetworkDiagnosticsChannelAttributeInteractionInfo = @@ -4085,8 +4070,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterChannelAttributeCallback(), readThreadNetworkDiagnosticsChannelCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( - "readChannelAttribute", readThreadNetworkDiagnosticsChannelAttributeInteractionInfo); + result.put("readChannelAttribute", readThreadNetworkDiagnosticsChannelAttributeInteractionInfo); Map readThreadNetworkDiagnosticsRoutingRoleCommandParams = new LinkedHashMap(); InteractionInfo readThreadNetworkDiagnosticsRoutingRoleAttributeInteractionInfo = @@ -4101,7 +4085,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterRoutingRoleAttributeCallback(), readThreadNetworkDiagnosticsRoutingRoleCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRoutingRoleAttribute", readThreadNetworkDiagnosticsRoutingRoleAttributeInteractionInfo); Map readThreadNetworkDiagnosticsNetworkNameCommandParams = @@ -4118,7 +4102,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterNetworkNameAttributeCallback(), readThreadNetworkDiagnosticsNetworkNameCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readNetworkNameAttribute", readThreadNetworkDiagnosticsNetworkNameAttributeInteractionInfo); Map readThreadNetworkDiagnosticsPanIdCommandParams = @@ -4135,8 +4119,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterPanIdAttributeCallback(), readThreadNetworkDiagnosticsPanIdCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( - "readPanIdAttribute", readThreadNetworkDiagnosticsPanIdAttributeInteractionInfo); + result.put("readPanIdAttribute", readThreadNetworkDiagnosticsPanIdAttributeInteractionInfo); Map readThreadNetworkDiagnosticsExtendedPanIdCommandParams = new LinkedHashMap(); InteractionInfo readThreadNetworkDiagnosticsExtendedPanIdAttributeInteractionInfo = @@ -4151,7 +4134,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterExtendedPanIdAttributeCallback(), readThreadNetworkDiagnosticsExtendedPanIdCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readExtendedPanIdAttribute", readThreadNetworkDiagnosticsExtendedPanIdAttributeInteractionInfo); Map readThreadNetworkDiagnosticsMeshLocalPrefixCommandParams = @@ -4169,7 +4152,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterMeshLocalPrefixAttributeCallback(), readThreadNetworkDiagnosticsMeshLocalPrefixCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readMeshLocalPrefixAttribute", readThreadNetworkDiagnosticsMeshLocalPrefixAttributeInteractionInfo); Map readThreadNetworkDiagnosticsOverrunCountCommandParams = @@ -4182,7 +4165,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsOverrunCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readOverrunCountAttribute", readThreadNetworkDiagnosticsOverrunCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsNeighborTableCommandParams = @@ -4199,7 +4182,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterNeighborTableAttributeCallback(), readThreadNetworkDiagnosticsNeighborTableCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readNeighborTableAttribute", readThreadNetworkDiagnosticsNeighborTableAttributeInteractionInfo); Map readThreadNetworkDiagnosticsRouteTableCommandParams = @@ -4216,7 +4199,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterRouteTableAttributeCallback(), readThreadNetworkDiagnosticsRouteTableCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRouteTableAttribute", readThreadNetworkDiagnosticsRouteTableAttributeInteractionInfo); Map readThreadNetworkDiagnosticsPartitionIdCommandParams = new LinkedHashMap(); @@ -4232,7 +4215,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterPartitionIdAttributeCallback(), readThreadNetworkDiagnosticsPartitionIdCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readPartitionIdAttribute", readThreadNetworkDiagnosticsPartitionIdAttributeInteractionInfo); Map readThreadNetworkDiagnosticsWeightingCommandParams = @@ -4249,7 +4232,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterWeightingAttributeCallback(), readThreadNetworkDiagnosticsWeightingCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readWeightingAttribute", readThreadNetworkDiagnosticsWeightingAttributeInteractionInfo); Map readThreadNetworkDiagnosticsDataVersionCommandParams = new LinkedHashMap(); @@ -4265,7 +4248,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterDataVersionAttributeCallback(), readThreadNetworkDiagnosticsDataVersionCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readDataVersionAttribute", readThreadNetworkDiagnosticsDataVersionAttributeInteractionInfo); Map readThreadNetworkDiagnosticsStableDataVersionCommandParams = @@ -4283,7 +4266,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterStableDataVersionAttributeCallback(), readThreadNetworkDiagnosticsStableDataVersionCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readStableDataVersionAttribute", readThreadNetworkDiagnosticsStableDataVersionAttributeInteractionInfo); Map readThreadNetworkDiagnosticsLeaderRouterIdCommandParams = @@ -4300,7 +4283,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterLeaderRouterIdAttributeCallback(), readThreadNetworkDiagnosticsLeaderRouterIdCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readLeaderRouterIdAttribute", readThreadNetworkDiagnosticsLeaderRouterIdAttributeInteractionInfo); Map readThreadNetworkDiagnosticsDetachedRoleCountCommandParams = @@ -4313,7 +4296,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThreadNetworkDiagnosticsDetachedRoleCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readDetachedRoleCountAttribute", readThreadNetworkDiagnosticsDetachedRoleCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsChildRoleCountCommandParams = @@ -4326,7 +4309,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThreadNetworkDiagnosticsChildRoleCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readChildRoleCountAttribute", readThreadNetworkDiagnosticsChildRoleCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsRouterRoleCountCommandParams = @@ -4339,7 +4322,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThreadNetworkDiagnosticsRouterRoleCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRouterRoleCountAttribute", readThreadNetworkDiagnosticsRouterRoleCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsLeaderRoleCountCommandParams = @@ -4352,7 +4335,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThreadNetworkDiagnosticsLeaderRoleCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readLeaderRoleCountAttribute", readThreadNetworkDiagnosticsLeaderRoleCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsAttachAttemptCountCommandParams = @@ -4366,7 +4349,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThreadNetworkDiagnosticsAttachAttemptCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readAttachAttemptCountAttribute", readThreadNetworkDiagnosticsAttachAttemptCountAttributeInteractionInfo); Map @@ -4381,7 +4364,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThreadNetworkDiagnosticsPartitionIdChangeCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readPartitionIdChangeCountAttribute", readThreadNetworkDiagnosticsPartitionIdChangeCountAttributeInteractionInfo); Map @@ -4397,7 +4380,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThreadNetworkDiagnosticsBetterPartitionAttachAttemptCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readBetterPartitionAttachAttemptCountAttribute", readThreadNetworkDiagnosticsBetterPartitionAttachAttemptCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsParentChangeCountCommandParams = @@ -4410,7 +4393,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThreadNetworkDiagnosticsParentChangeCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readParentChangeCountAttribute", readThreadNetworkDiagnosticsParentChangeCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsTxTotalCountCommandParams = @@ -4423,7 +4406,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsTxTotalCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxTotalCountAttribute", readThreadNetworkDiagnosticsTxTotalCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsTxUnicastCountCommandParams = @@ -4436,7 +4419,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsTxUnicastCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxUnicastCountAttribute", readThreadNetworkDiagnosticsTxUnicastCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsTxBroadcastCountCommandParams = @@ -4449,7 +4432,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsTxBroadcastCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxBroadcastCountAttribute", readThreadNetworkDiagnosticsTxBroadcastCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsTxAckRequestedCountCommandParams = @@ -4462,7 +4445,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsTxAckRequestedCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxAckRequestedCountAttribute", readThreadNetworkDiagnosticsTxAckRequestedCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsTxAckedCountCommandParams = @@ -4475,7 +4458,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsTxAckedCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxAckedCountAttribute", readThreadNetworkDiagnosticsTxAckedCountAttributeInteractionInfo); Map @@ -4490,7 +4473,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsTxNoAckRequestedCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxNoAckRequestedCountAttribute", readThreadNetworkDiagnosticsTxNoAckRequestedCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsTxDataCountCommandParams = @@ -4503,7 +4486,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsTxDataCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxDataCountAttribute", readThreadNetworkDiagnosticsTxDataCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsTxDataPollCountCommandParams = @@ -4516,7 +4499,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsTxDataPollCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxDataPollCountAttribute", readThreadNetworkDiagnosticsTxDataPollCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsTxBeaconCountCommandParams = @@ -4529,7 +4512,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsTxBeaconCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxBeaconCountAttribute", readThreadNetworkDiagnosticsTxBeaconCountAttributeInteractionInfo); Map @@ -4543,7 +4526,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsTxBeaconRequestCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxBeaconRequestCountAttribute", readThreadNetworkDiagnosticsTxBeaconRequestCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsTxOtherCountCommandParams = @@ -4556,7 +4539,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsTxOtherCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxOtherCountAttribute", readThreadNetworkDiagnosticsTxOtherCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsTxRetryCountCommandParams = @@ -4569,7 +4552,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsTxRetryCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxRetryCountAttribute", readThreadNetworkDiagnosticsTxRetryCountAttributeInteractionInfo); Map @@ -4585,7 +4568,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxDirectMaxRetryExpiryCountAttribute", readThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCountAttributeInteractionInfo); Map @@ -4601,7 +4584,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxIndirectMaxRetryExpiryCountAttribute", readThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsTxErrCcaCountCommandParams = @@ -4614,7 +4597,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsTxErrCcaCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxErrCcaCountAttribute", readThreadNetworkDiagnosticsTxErrCcaCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsTxErrAbortCountCommandParams = @@ -4627,7 +4610,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsTxErrAbortCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxErrAbortCountAttribute", readThreadNetworkDiagnosticsTxErrAbortCountAttributeInteractionInfo); Map @@ -4642,7 +4625,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsTxErrBusyChannelCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxErrBusyChannelCountAttribute", readThreadNetworkDiagnosticsTxErrBusyChannelCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsRxTotalCountCommandParams = @@ -4655,7 +4638,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsRxTotalCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRxTotalCountAttribute", readThreadNetworkDiagnosticsRxTotalCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsRxUnicastCountCommandParams = @@ -4668,7 +4651,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsRxUnicastCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRxUnicastCountAttribute", readThreadNetworkDiagnosticsRxUnicastCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsRxBroadcastCountCommandParams = @@ -4681,7 +4664,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsRxBroadcastCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRxBroadcastCountAttribute", readThreadNetworkDiagnosticsRxBroadcastCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsRxDataCountCommandParams = @@ -4694,7 +4677,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsRxDataCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRxDataCountAttribute", readThreadNetworkDiagnosticsRxDataCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsRxDataPollCountCommandParams = @@ -4707,7 +4690,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsRxDataPollCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRxDataPollCountAttribute", readThreadNetworkDiagnosticsRxDataPollCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsRxBeaconCountCommandParams = @@ -4720,7 +4703,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsRxBeaconCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRxBeaconCountAttribute", readThreadNetworkDiagnosticsRxBeaconCountAttributeInteractionInfo); Map @@ -4734,7 +4717,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsRxBeaconRequestCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRxBeaconRequestCountAttribute", readThreadNetworkDiagnosticsRxBeaconRequestCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsRxOtherCountCommandParams = @@ -4747,7 +4730,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsRxOtherCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRxOtherCountAttribute", readThreadNetworkDiagnosticsRxOtherCountAttributeInteractionInfo); Map @@ -4762,7 +4745,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsRxAddressFilteredCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRxAddressFilteredCountAttribute", readThreadNetworkDiagnosticsRxAddressFilteredCountAttributeInteractionInfo); Map @@ -4777,7 +4760,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsRxDestAddrFilteredCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRxDestAddrFilteredCountAttribute", readThreadNetworkDiagnosticsRxDestAddrFilteredCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsRxDuplicatedCountCommandParams = @@ -4790,7 +4773,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsRxDuplicatedCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRxDuplicatedCountAttribute", readThreadNetworkDiagnosticsRxDuplicatedCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsRxErrNoFrameCountCommandParams = @@ -4803,7 +4786,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsRxErrNoFrameCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRxErrNoFrameCountAttribute", readThreadNetworkDiagnosticsRxErrNoFrameCountAttributeInteractionInfo); Map @@ -4818,7 +4801,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsRxErrUnknownNeighborCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRxErrUnknownNeighborCountAttribute", readThreadNetworkDiagnosticsRxErrUnknownNeighborCountAttributeInteractionInfo); Map @@ -4833,7 +4816,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsRxErrInvalidSrcAddrCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRxErrInvalidSrcAddrCountAttribute", readThreadNetworkDiagnosticsRxErrInvalidSrcAddrCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsRxErrSecCountCommandParams = @@ -4846,7 +4829,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsRxErrSecCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRxErrSecCountAttribute", readThreadNetworkDiagnosticsRxErrSecCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsRxErrFcsCountCommandParams = @@ -4859,7 +4842,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsRxErrFcsCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRxErrFcsCountAttribute", readThreadNetworkDiagnosticsRxErrFcsCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsRxErrOtherCountCommandParams = @@ -4872,7 +4855,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsRxErrOtherCountCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readRxErrOtherCountAttribute", readThreadNetworkDiagnosticsRxErrOtherCountAttributeInteractionInfo); Map readThreadNetworkDiagnosticsActiveTimestampCommandParams = @@ -4890,7 +4873,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterActiveTimestampAttributeCallback(), readThreadNetworkDiagnosticsActiveTimestampCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readActiveTimestampAttribute", readThreadNetworkDiagnosticsActiveTimestampAttributeInteractionInfo); Map readThreadNetworkDiagnosticsPendingTimestampCommandParams = @@ -4908,7 +4891,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterPendingTimestampAttributeCallback(), readThreadNetworkDiagnosticsPendingTimestampCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readPendingTimestampAttribute", readThreadNetworkDiagnosticsPendingTimestampAttributeInteractionInfo); Map readThreadNetworkDiagnosticsDelayCommandParams = @@ -4925,8 +4908,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterDelayAttributeCallback(), readThreadNetworkDiagnosticsDelayCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( - "readDelayAttribute", readThreadNetworkDiagnosticsDelayAttributeInteractionInfo); + result.put("readDelayAttribute", readThreadNetworkDiagnosticsDelayAttributeInteractionInfo); Map readThreadNetworkDiagnosticsChannelPage0MaskCommandParams = new LinkedHashMap(); InteractionInfo readThreadNetworkDiagnosticsChannelPage0MaskAttributeInteractionInfo = @@ -4942,7 +4924,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterChannelPage0MaskAttributeCallback(), readThreadNetworkDiagnosticsChannelPage0MaskCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readChannelPage0MaskAttribute", readThreadNetworkDiagnosticsChannelPage0MaskAttributeInteractionInfo); Map @@ -4961,7 +4943,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterActiveNetworkFaultsListAttributeCallback(), readThreadNetworkDiagnosticsActiveNetworkFaultsListCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readActiveNetworkFaultsListAttribute", readThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeInteractionInfo); Map @@ -4980,7 +4962,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback(), readThreadNetworkDiagnosticsGeneratedCommandListCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readThreadNetworkDiagnosticsGeneratedCommandListAttributeInteractionInfo); Map readThreadNetworkDiagnosticsAcceptedCommandListCommandParams = @@ -4998,7 +4980,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback(), readThreadNetworkDiagnosticsAcceptedCommandListCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readThreadNetworkDiagnosticsAcceptedCommandListAttributeInteractionInfo); Map readThreadNetworkDiagnosticsEventListCommandParams = @@ -5015,7 +4997,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterEventListAttributeCallback(), readThreadNetworkDiagnosticsEventListCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readEventListAttribute", readThreadNetworkDiagnosticsEventListAttributeInteractionInfo); Map readThreadNetworkDiagnosticsAttributeListCommandParams = new LinkedHashMap(); @@ -5031,7 +5013,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThreadNetworkDiagnosticsClusterAttributeListAttributeCallback(), readThreadNetworkDiagnosticsAttributeListCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readAttributeListAttribute", readThreadNetworkDiagnosticsAttributeListAttributeInteractionInfo); Map readThreadNetworkDiagnosticsFeatureMapCommandParams = @@ -5044,7 +5026,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThreadNetworkDiagnosticsFeatureMapCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readFeatureMapAttribute", readThreadNetworkDiagnosticsFeatureMapAttributeInteractionInfo); Map readThreadNetworkDiagnosticsClusterRevisionCommandParams = new LinkedHashMap(); @@ -5056,11 +5038,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThreadNetworkDiagnosticsClusterRevisionCommandParams); - readThreadNetworkDiagnosticsInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readThreadNetworkDiagnosticsClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("threadNetworkDiagnostics", readThreadNetworkDiagnosticsInteractionInfo); - Map readWiFiNetworkDiagnosticsInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readWiFiNetworkDiagnosticsInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readWiFiNetworkDiagnosticsBssidCommandParams = new LinkedHashMap(); InteractionInfo readWiFiNetworkDiagnosticsBssidAttributeInteractionInfo = @@ -5074,8 +5060,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWiFiNetworkDiagnosticsClusterBssidAttributeCallback(), readWiFiNetworkDiagnosticsBssidCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( - "readBssidAttribute", readWiFiNetworkDiagnosticsBssidAttributeInteractionInfo); + result.put("readBssidAttribute", readWiFiNetworkDiagnosticsBssidAttributeInteractionInfo); Map readWiFiNetworkDiagnosticsSecurityTypeCommandParams = new LinkedHashMap(); InteractionInfo readWiFiNetworkDiagnosticsSecurityTypeAttributeInteractionInfo = @@ -5090,7 +5075,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWiFiNetworkDiagnosticsClusterSecurityTypeAttributeCallback(), readWiFiNetworkDiagnosticsSecurityTypeCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( + result.put( "readSecurityTypeAttribute", readWiFiNetworkDiagnosticsSecurityTypeAttributeInteractionInfo); Map readWiFiNetworkDiagnosticsWiFiVersionCommandParams = @@ -5107,7 +5092,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWiFiNetworkDiagnosticsClusterWiFiVersionAttributeCallback(), readWiFiNetworkDiagnosticsWiFiVersionCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( + result.put( "readWiFiVersionAttribute", readWiFiNetworkDiagnosticsWiFiVersionAttributeInteractionInfo); Map readWiFiNetworkDiagnosticsChannelNumberCommandParams = new LinkedHashMap(); @@ -5123,7 +5108,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWiFiNetworkDiagnosticsClusterChannelNumberAttributeCallback(), readWiFiNetworkDiagnosticsChannelNumberCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( + result.put( "readChannelNumberAttribute", readWiFiNetworkDiagnosticsChannelNumberAttributeInteractionInfo); Map readWiFiNetworkDiagnosticsRssiCommandParams = @@ -5139,8 +5124,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWiFiNetworkDiagnosticsClusterRssiAttributeCallback(), readWiFiNetworkDiagnosticsRssiCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( - "readRssiAttribute", readWiFiNetworkDiagnosticsRssiAttributeInteractionInfo); + result.put("readRssiAttribute", readWiFiNetworkDiagnosticsRssiAttributeInteractionInfo); Map readWiFiNetworkDiagnosticsBeaconLostCountCommandParams = new LinkedHashMap(); InteractionInfo readWiFiNetworkDiagnosticsBeaconLostCountAttributeInteractionInfo = @@ -5155,7 +5139,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWiFiNetworkDiagnosticsClusterBeaconLostCountAttributeCallback(), readWiFiNetworkDiagnosticsBeaconLostCountCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( + result.put( "readBeaconLostCountAttribute", readWiFiNetworkDiagnosticsBeaconLostCountAttributeInteractionInfo); Map readWiFiNetworkDiagnosticsBeaconRxCountCommandParams = @@ -5172,7 +5156,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWiFiNetworkDiagnosticsClusterBeaconRxCountAttributeCallback(), readWiFiNetworkDiagnosticsBeaconRxCountCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( + result.put( "readBeaconRxCountAttribute", readWiFiNetworkDiagnosticsBeaconRxCountAttributeInteractionInfo); Map @@ -5191,7 +5175,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWiFiNetworkDiagnosticsClusterPacketMulticastRxCountAttributeCallback(), readWiFiNetworkDiagnosticsPacketMulticastRxCountCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( + result.put( "readPacketMulticastRxCountAttribute", readWiFiNetworkDiagnosticsPacketMulticastRxCountAttributeInteractionInfo); Map @@ -5210,7 +5194,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWiFiNetworkDiagnosticsClusterPacketMulticastTxCountAttributeCallback(), readWiFiNetworkDiagnosticsPacketMulticastTxCountCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( + result.put( "readPacketMulticastTxCountAttribute", readWiFiNetworkDiagnosticsPacketMulticastTxCountAttributeInteractionInfo); Map readWiFiNetworkDiagnosticsPacketUnicastRxCountCommandParams = @@ -5228,7 +5212,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWiFiNetworkDiagnosticsClusterPacketUnicastRxCountAttributeCallback(), readWiFiNetworkDiagnosticsPacketUnicastRxCountCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( + result.put( "readPacketUnicastRxCountAttribute", readWiFiNetworkDiagnosticsPacketUnicastRxCountAttributeInteractionInfo); Map readWiFiNetworkDiagnosticsPacketUnicastTxCountCommandParams = @@ -5246,7 +5230,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWiFiNetworkDiagnosticsClusterPacketUnicastTxCountAttributeCallback(), readWiFiNetworkDiagnosticsPacketUnicastTxCountCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( + result.put( "readPacketUnicastTxCountAttribute", readWiFiNetworkDiagnosticsPacketUnicastTxCountAttributeInteractionInfo); Map readWiFiNetworkDiagnosticsCurrentMaxRateCommandParams = @@ -5263,7 +5247,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWiFiNetworkDiagnosticsClusterCurrentMaxRateAttributeCallback(), readWiFiNetworkDiagnosticsCurrentMaxRateCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( + result.put( "readCurrentMaxRateAttribute", readWiFiNetworkDiagnosticsCurrentMaxRateAttributeInteractionInfo); Map readWiFiNetworkDiagnosticsOverrunCountCommandParams = @@ -5280,7 +5264,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWiFiNetworkDiagnosticsClusterOverrunCountAttributeCallback(), readWiFiNetworkDiagnosticsOverrunCountCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( + result.put( "readOverrunCountAttribute", readWiFiNetworkDiagnosticsOverrunCountAttributeInteractionInfo); Map readWiFiNetworkDiagnosticsGeneratedCommandListCommandParams = @@ -5298,7 +5282,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWiFiNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback(), readWiFiNetworkDiagnosticsGeneratedCommandListCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readWiFiNetworkDiagnosticsGeneratedCommandListAttributeInteractionInfo); Map readWiFiNetworkDiagnosticsAcceptedCommandListCommandParams = @@ -5316,7 +5300,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWiFiNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback(), readWiFiNetworkDiagnosticsAcceptedCommandListCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readWiFiNetworkDiagnosticsAcceptedCommandListAttributeInteractionInfo); Map readWiFiNetworkDiagnosticsEventListCommandParams = @@ -5333,7 +5317,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWiFiNetworkDiagnosticsClusterEventListAttributeCallback(), readWiFiNetworkDiagnosticsEventListCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( + result.put( "readEventListAttribute", readWiFiNetworkDiagnosticsEventListAttributeInteractionInfo); Map readWiFiNetworkDiagnosticsAttributeListCommandParams = new LinkedHashMap(); @@ -5349,7 +5333,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWiFiNetworkDiagnosticsClusterAttributeListAttributeCallback(), readWiFiNetworkDiagnosticsAttributeListCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( + result.put( "readAttributeListAttribute", readWiFiNetworkDiagnosticsAttributeListAttributeInteractionInfo); Map readWiFiNetworkDiagnosticsFeatureMapCommandParams = @@ -5362,7 +5346,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readWiFiNetworkDiagnosticsFeatureMapCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( + result.put( "readFeatureMapAttribute", readWiFiNetworkDiagnosticsFeatureMapAttributeInteractionInfo); Map readWiFiNetworkDiagnosticsClusterRevisionCommandParams = new LinkedHashMap(); @@ -5374,12 +5358,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readWiFiNetworkDiagnosticsClusterRevisionCommandParams); - readWiFiNetworkDiagnosticsInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readWiFiNetworkDiagnosticsClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("wiFiNetworkDiagnostics", readWiFiNetworkDiagnosticsInteractionInfo); - Map readEthernetNetworkDiagnosticsInteractionInfo = - new LinkedHashMap<>(); + + return result; + } + + private static Map readEthernetNetworkDiagnosticsInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readEthernetNetworkDiagnosticsPHYRateCommandParams = new LinkedHashMap(); InteractionInfo readEthernetNetworkDiagnosticsPHYRateAttributeInteractionInfo = @@ -5394,7 +5381,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedEthernetNetworkDiagnosticsClusterPHYRateAttributeCallback(), readEthernetNetworkDiagnosticsPHYRateCommandParams); - readEthernetNetworkDiagnosticsInteractionInfo.put( + result.put( "readPHYRateAttribute", readEthernetNetworkDiagnosticsPHYRateAttributeInteractionInfo); Map readEthernetNetworkDiagnosticsFullDuplexCommandParams = new LinkedHashMap(); @@ -5410,7 +5397,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedEthernetNetworkDiagnosticsClusterFullDuplexAttributeCallback(), readEthernetNetworkDiagnosticsFullDuplexCommandParams); - readEthernetNetworkDiagnosticsInteractionInfo.put( + result.put( "readFullDuplexAttribute", readEthernetNetworkDiagnosticsFullDuplexAttributeInteractionInfo); Map readEthernetNetworkDiagnosticsPacketRxCountCommandParams = @@ -5423,7 +5410,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readEthernetNetworkDiagnosticsPacketRxCountCommandParams); - readEthernetNetworkDiagnosticsInteractionInfo.put( + result.put( "readPacketRxCountAttribute", readEthernetNetworkDiagnosticsPacketRxCountAttributeInteractionInfo); Map readEthernetNetworkDiagnosticsPacketTxCountCommandParams = @@ -5436,7 +5423,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readEthernetNetworkDiagnosticsPacketTxCountCommandParams); - readEthernetNetworkDiagnosticsInteractionInfo.put( + result.put( "readPacketTxCountAttribute", readEthernetNetworkDiagnosticsPacketTxCountAttributeInteractionInfo); Map readEthernetNetworkDiagnosticsTxErrCountCommandParams = @@ -5449,7 +5436,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readEthernetNetworkDiagnosticsTxErrCountCommandParams); - readEthernetNetworkDiagnosticsInteractionInfo.put( + result.put( "readTxErrCountAttribute", readEthernetNetworkDiagnosticsTxErrCountAttributeInteractionInfo); Map readEthernetNetworkDiagnosticsCollisionCountCommandParams = @@ -5462,7 +5449,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readEthernetNetworkDiagnosticsCollisionCountCommandParams); - readEthernetNetworkDiagnosticsInteractionInfo.put( + result.put( "readCollisionCountAttribute", readEthernetNetworkDiagnosticsCollisionCountAttributeInteractionInfo); Map readEthernetNetworkDiagnosticsOverrunCountCommandParams = @@ -5475,7 +5462,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readEthernetNetworkDiagnosticsOverrunCountCommandParams); - readEthernetNetworkDiagnosticsInteractionInfo.put( + result.put( "readOverrunCountAttribute", readEthernetNetworkDiagnosticsOverrunCountAttributeInteractionInfo); Map readEthernetNetworkDiagnosticsCarrierDetectCommandParams = @@ -5493,7 +5480,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedEthernetNetworkDiagnosticsClusterCarrierDetectAttributeCallback(), readEthernetNetworkDiagnosticsCarrierDetectCommandParams); - readEthernetNetworkDiagnosticsInteractionInfo.put( + result.put( "readCarrierDetectAttribute", readEthernetNetworkDiagnosticsCarrierDetectAttributeInteractionInfo); Map readEthernetNetworkDiagnosticsTimeSinceResetCommandParams = @@ -5506,7 +5493,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readEthernetNetworkDiagnosticsTimeSinceResetCommandParams); - readEthernetNetworkDiagnosticsInteractionInfo.put( + result.put( "readTimeSinceResetAttribute", readEthernetNetworkDiagnosticsTimeSinceResetAttributeInteractionInfo); Map @@ -5525,7 +5512,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedEthernetNetworkDiagnosticsClusterGeneratedCommandListAttributeCallback(), readEthernetNetworkDiagnosticsGeneratedCommandListCommandParams); - readEthernetNetworkDiagnosticsInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readEthernetNetworkDiagnosticsGeneratedCommandListAttributeInteractionInfo); Map @@ -5544,7 +5531,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedEthernetNetworkDiagnosticsClusterAcceptedCommandListAttributeCallback(), readEthernetNetworkDiagnosticsAcceptedCommandListCommandParams); - readEthernetNetworkDiagnosticsInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readEthernetNetworkDiagnosticsAcceptedCommandListAttributeInteractionInfo); Map readEthernetNetworkDiagnosticsEventListCommandParams = @@ -5561,7 +5548,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedEthernetNetworkDiagnosticsClusterEventListAttributeCallback(), readEthernetNetworkDiagnosticsEventListCommandParams); - readEthernetNetworkDiagnosticsInteractionInfo.put( + result.put( "readEventListAttribute", readEthernetNetworkDiagnosticsEventListAttributeInteractionInfo); Map readEthernetNetworkDiagnosticsAttributeListCommandParams = new LinkedHashMap(); @@ -5578,7 +5565,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedEthernetNetworkDiagnosticsClusterAttributeListAttributeCallback(), readEthernetNetworkDiagnosticsAttributeListCommandParams); - readEthernetNetworkDiagnosticsInteractionInfo.put( + result.put( "readAttributeListAttribute", readEthernetNetworkDiagnosticsAttributeListAttributeInteractionInfo); Map readEthernetNetworkDiagnosticsFeatureMapCommandParams = @@ -5591,7 +5578,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readEthernetNetworkDiagnosticsFeatureMapCommandParams); - readEthernetNetworkDiagnosticsInteractionInfo.put( + result.put( "readFeatureMapAttribute", readEthernetNetworkDiagnosticsFeatureMapAttributeInteractionInfo); Map readEthernetNetworkDiagnosticsClusterRevisionCommandParams = @@ -5604,13 +5591,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readEthernetNetworkDiagnosticsClusterRevisionCommandParams); - readEthernetNetworkDiagnosticsInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readEthernetNetworkDiagnosticsClusterRevisionAttributeInteractionInfo); - readAttributeMap.put( - "ethernetNetworkDiagnostics", readEthernetNetworkDiagnosticsInteractionInfo); - Map readBridgedDeviceBasicInformationInteractionInfo = - new LinkedHashMap<>(); + + return result; + } + + private static Map readBridgedDeviceBasicInformationInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readBridgedDeviceBasicInformationVendorNameCommandParams = new LinkedHashMap(); InteractionInfo readBridgedDeviceBasicInformationVendorNameAttributeInteractionInfo = @@ -5621,7 +5610,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBridgedDeviceBasicInformationVendorNameCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readVendorNameAttribute", readBridgedDeviceBasicInformationVendorNameAttributeInteractionInfo); Map readBridgedDeviceBasicInformationVendorIDCommandParams = @@ -5634,7 +5623,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBridgedDeviceBasicInformationVendorIDCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readVendorIDAttribute", readBridgedDeviceBasicInformationVendorIDAttributeInteractionInfo); Map readBridgedDeviceBasicInformationProductNameCommandParams = new LinkedHashMap(); @@ -5646,7 +5635,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBridgedDeviceBasicInformationProductNameCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readProductNameAttribute", readBridgedDeviceBasicInformationProductNameAttributeInteractionInfo); Map readBridgedDeviceBasicInformationNodeLabelCommandParams = @@ -5659,7 +5648,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBridgedDeviceBasicInformationNodeLabelCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readNodeLabelAttribute", readBridgedDeviceBasicInformationNodeLabelAttributeInteractionInfo); Map @@ -5673,7 +5662,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBridgedDeviceBasicInformationHardwareVersionCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readHardwareVersionAttribute", readBridgedDeviceBasicInformationHardwareVersionAttributeInteractionInfo); Map @@ -5688,7 +5677,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBridgedDeviceBasicInformationHardwareVersionStringCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readHardwareVersionStringAttribute", readBridgedDeviceBasicInformationHardwareVersionStringAttributeInteractionInfo); Map @@ -5702,7 +5691,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readBridgedDeviceBasicInformationSoftwareVersionCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readSoftwareVersionAttribute", readBridgedDeviceBasicInformationSoftwareVersionAttributeInteractionInfo); Map @@ -5717,7 +5706,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBridgedDeviceBasicInformationSoftwareVersionStringCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readSoftwareVersionStringAttribute", readBridgedDeviceBasicInformationSoftwareVersionStringAttributeInteractionInfo); Map @@ -5732,7 +5721,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBridgedDeviceBasicInformationManufacturingDateCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readManufacturingDateAttribute", readBridgedDeviceBasicInformationManufacturingDateAttributeInteractionInfo); Map readBridgedDeviceBasicInformationPartNumberCommandParams = @@ -5745,7 +5734,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBridgedDeviceBasicInformationPartNumberCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readPartNumberAttribute", readBridgedDeviceBasicInformationPartNumberAttributeInteractionInfo); Map readBridgedDeviceBasicInformationProductURLCommandParams = @@ -5758,7 +5747,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBridgedDeviceBasicInformationProductURLCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readProductURLAttribute", readBridgedDeviceBasicInformationProductURLAttributeInteractionInfo); Map readBridgedDeviceBasicInformationProductLabelCommandParams = @@ -5771,7 +5760,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBridgedDeviceBasicInformationProductLabelCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readProductLabelAttribute", readBridgedDeviceBasicInformationProductLabelAttributeInteractionInfo); Map readBridgedDeviceBasicInformationSerialNumberCommandParams = @@ -5784,7 +5773,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBridgedDeviceBasicInformationSerialNumberCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readSerialNumberAttribute", readBridgedDeviceBasicInformationSerialNumberAttributeInteractionInfo); Map readBridgedDeviceBasicInformationReachableCommandParams = @@ -5797,7 +5786,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readBridgedDeviceBasicInformationReachableCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readReachableAttribute", readBridgedDeviceBasicInformationReachableAttributeInteractionInfo); Map readBridgedDeviceBasicInformationUniqueIDCommandParams = @@ -5810,7 +5799,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBridgedDeviceBasicInformationUniqueIDCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readUniqueIDAttribute", readBridgedDeviceBasicInformationUniqueIDAttributeInteractionInfo); Map readBridgedDeviceBasicInformationGeneratedCommandListCommandParams = @@ -5828,7 +5817,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBridgedDeviceBasicInformationClusterGeneratedCommandListAttributeCallback(), readBridgedDeviceBasicInformationGeneratedCommandListCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readBridgedDeviceBasicInformationGeneratedCommandListAttributeInteractionInfo); Map @@ -5847,7 +5836,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBridgedDeviceBasicInformationClusterAcceptedCommandListAttributeCallback(), readBridgedDeviceBasicInformationAcceptedCommandListCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readBridgedDeviceBasicInformationAcceptedCommandListAttributeInteractionInfo); Map readBridgedDeviceBasicInformationEventListCommandParams = @@ -5864,7 +5853,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBridgedDeviceBasicInformationClusterEventListAttributeCallback(), readBridgedDeviceBasicInformationEventListCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readEventListAttribute", readBridgedDeviceBasicInformationEventListAttributeInteractionInfo); Map readBridgedDeviceBasicInformationAttributeListCommandParams = @@ -5882,7 +5871,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBridgedDeviceBasicInformationClusterAttributeListAttributeCallback(), readBridgedDeviceBasicInformationAttributeListCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readAttributeListAttribute", readBridgedDeviceBasicInformationAttributeListAttributeInteractionInfo); Map readBridgedDeviceBasicInformationFeatureMapCommandParams = @@ -5895,7 +5884,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readBridgedDeviceBasicInformationFeatureMapCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readFeatureMapAttribute", readBridgedDeviceBasicInformationFeatureMapAttributeInteractionInfo); Map @@ -5909,12 +5898,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBridgedDeviceBasicInformationClusterRevisionCommandParams); - readBridgedDeviceBasicInformationInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readBridgedDeviceBasicInformationClusterRevisionAttributeInteractionInfo); - readAttributeMap.put( - "bridgedDeviceBasicInformation", readBridgedDeviceBasicInformationInteractionInfo); - Map readSwitchInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readSwitchInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readSwitchNumberOfPositionsCommandParams = new LinkedHashMap(); InteractionInfo readSwitchNumberOfPositionsAttributeInteractionInfo = @@ -5925,7 +5917,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readSwitchNumberOfPositionsCommandParams); - readSwitchInteractionInfo.put( + result.put( "readNumberOfPositionsAttribute", readSwitchNumberOfPositionsAttributeInteractionInfo); Map readSwitchCurrentPositionCommandParams = new LinkedHashMap(); @@ -5937,8 +5929,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readSwitchCurrentPositionCommandParams); - readSwitchInteractionInfo.put( - "readCurrentPositionAttribute", readSwitchCurrentPositionAttributeInteractionInfo); + result.put("readCurrentPositionAttribute", readSwitchCurrentPositionAttributeInteractionInfo); Map readSwitchMultiPressMaxCommandParams = new LinkedHashMap(); InteractionInfo readSwitchMultiPressMaxAttributeInteractionInfo = @@ -5949,8 +5940,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readSwitchMultiPressMaxCommandParams); - readSwitchInteractionInfo.put( - "readMultiPressMaxAttribute", readSwitchMultiPressMaxAttributeInteractionInfo); + result.put("readMultiPressMaxAttribute", readSwitchMultiPressMaxAttributeInteractionInfo); Map readSwitchGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readSwitchGeneratedCommandListAttributeInteractionInfo = @@ -5964,7 +5954,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedSwitchClusterGeneratedCommandListAttributeCallback(), readSwitchGeneratedCommandListCommandParams); - readSwitchInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readSwitchGeneratedCommandListAttributeInteractionInfo); Map readSwitchAcceptedCommandListCommandParams = @@ -5979,7 +5969,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedSwitchClusterAcceptedCommandListAttributeCallback(), readSwitchAcceptedCommandListCommandParams); - readSwitchInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readSwitchAcceptedCommandListAttributeInteractionInfo); Map readSwitchEventListCommandParams = new LinkedHashMap(); @@ -5992,8 +5982,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedSwitchClusterEventListAttributeCallback(), readSwitchEventListCommandParams); - readSwitchInteractionInfo.put( - "readEventListAttribute", readSwitchEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readSwitchEventListAttributeInteractionInfo); Map readSwitchAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readSwitchAttributeListAttributeInteractionInfo = @@ -6005,8 +5994,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedSwitchClusterAttributeListAttributeCallback(), readSwitchAttributeListCommandParams); - readSwitchInteractionInfo.put( - "readAttributeListAttribute", readSwitchAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readSwitchAttributeListAttributeInteractionInfo); Map readSwitchFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readSwitchFeatureMapAttributeInteractionInfo = @@ -6017,8 +6005,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readSwitchFeatureMapCommandParams); - readSwitchInteractionInfo.put( - "readFeatureMapAttribute", readSwitchFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readSwitchFeatureMapAttributeInteractionInfo); Map readSwitchClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readSwitchClusterRevisionAttributeInteractionInfo = @@ -6029,11 +6016,13 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readSwitchClusterRevisionCommandParams); - readSwitchInteractionInfo.put( - "readClusterRevisionAttribute", readSwitchClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("switch", readSwitchInteractionInfo); - Map readAdministratorCommissioningInteractionInfo = - new LinkedHashMap<>(); + result.put("readClusterRevisionAttribute", readSwitchClusterRevisionAttributeInteractionInfo); + + return result; + } + + private static Map readAdministratorCommissioningInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readAdministratorCommissioningWindowStatusCommandParams = new LinkedHashMap(); InteractionInfo readAdministratorCommissioningWindowStatusAttributeInteractionInfo = @@ -6044,7 +6033,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readAdministratorCommissioningWindowStatusCommandParams); - readAdministratorCommissioningInteractionInfo.put( + result.put( "readWindowStatusAttribute", readAdministratorCommissioningWindowStatusAttributeInteractionInfo); Map readAdministratorCommissioningAdminFabricIndexCommandParams = @@ -6062,7 +6051,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedAdministratorCommissioningClusterAdminFabricIndexAttributeCallback(), readAdministratorCommissioningAdminFabricIndexCommandParams); - readAdministratorCommissioningInteractionInfo.put( + result.put( "readAdminFabricIndexAttribute", readAdministratorCommissioningAdminFabricIndexAttributeInteractionInfo); Map readAdministratorCommissioningAdminVendorIdCommandParams = @@ -6080,7 +6069,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedAdministratorCommissioningClusterAdminVendorIdAttributeCallback(), readAdministratorCommissioningAdminVendorIdCommandParams); - readAdministratorCommissioningInteractionInfo.put( + result.put( "readAdminVendorIdAttribute", readAdministratorCommissioningAdminVendorIdAttributeInteractionInfo); Map @@ -6099,7 +6088,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedAdministratorCommissioningClusterGeneratedCommandListAttributeCallback(), readAdministratorCommissioningGeneratedCommandListCommandParams); - readAdministratorCommissioningInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readAdministratorCommissioningGeneratedCommandListAttributeInteractionInfo); Map @@ -6118,7 +6107,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedAdministratorCommissioningClusterAcceptedCommandListAttributeCallback(), readAdministratorCommissioningAcceptedCommandListCommandParams); - readAdministratorCommissioningInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readAdministratorCommissioningAcceptedCommandListAttributeInteractionInfo); Map readAdministratorCommissioningEventListCommandParams = @@ -6135,7 +6124,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedAdministratorCommissioningClusterEventListAttributeCallback(), readAdministratorCommissioningEventListCommandParams); - readAdministratorCommissioningInteractionInfo.put( + result.put( "readEventListAttribute", readAdministratorCommissioningEventListAttributeInteractionInfo); Map readAdministratorCommissioningAttributeListCommandParams = new LinkedHashMap(); @@ -6152,7 +6141,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedAdministratorCommissioningClusterAttributeListAttributeCallback(), readAdministratorCommissioningAttributeListCommandParams); - readAdministratorCommissioningInteractionInfo.put( + result.put( "readAttributeListAttribute", readAdministratorCommissioningAttributeListAttributeInteractionInfo); Map readAdministratorCommissioningFeatureMapCommandParams = @@ -6165,7 +6154,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readAdministratorCommissioningFeatureMapCommandParams); - readAdministratorCommissioningInteractionInfo.put( + result.put( "readFeatureMapAttribute", readAdministratorCommissioningFeatureMapAttributeInteractionInfo); Map readAdministratorCommissioningClusterRevisionCommandParams = @@ -6178,12 +6167,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readAdministratorCommissioningClusterRevisionCommandParams); - readAdministratorCommissioningInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readAdministratorCommissioningClusterRevisionAttributeInteractionInfo); - readAttributeMap.put( - "administratorCommissioning", readAdministratorCommissioningInteractionInfo); - Map readOperationalCredentialsInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readOperationalCredentialsInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readOperationalCredentialsNOCsCommandParams = new LinkedHashMap(); InteractionInfo readOperationalCredentialsNOCsAttributeInteractionInfo = @@ -6197,8 +6189,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOperationalCredentialsClusterNOCsAttributeCallback(), readOperationalCredentialsNOCsCommandParams); - readOperationalCredentialsInteractionInfo.put( - "readNOCsAttribute", readOperationalCredentialsNOCsAttributeInteractionInfo); + result.put("readNOCsAttribute", readOperationalCredentialsNOCsAttributeInteractionInfo); Map readOperationalCredentialsFabricsCommandParams = new LinkedHashMap(); InteractionInfo readOperationalCredentialsFabricsAttributeInteractionInfo = @@ -6213,8 +6204,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOperationalCredentialsClusterFabricsAttributeCallback(), readOperationalCredentialsFabricsCommandParams); - readOperationalCredentialsInteractionInfo.put( - "readFabricsAttribute", readOperationalCredentialsFabricsAttributeInteractionInfo); + result.put("readFabricsAttribute", readOperationalCredentialsFabricsAttributeInteractionInfo); Map readOperationalCredentialsSupportedFabricsCommandParams = new LinkedHashMap(); InteractionInfo readOperationalCredentialsSupportedFabricsAttributeInteractionInfo = @@ -6225,7 +6215,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOperationalCredentialsSupportedFabricsCommandParams); - readOperationalCredentialsInteractionInfo.put( + result.put( "readSupportedFabricsAttribute", readOperationalCredentialsSupportedFabricsAttributeInteractionInfo); Map readOperationalCredentialsCommissionedFabricsCommandParams = @@ -6239,7 +6229,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOperationalCredentialsCommissionedFabricsCommandParams); - readOperationalCredentialsInteractionInfo.put( + result.put( "readCommissionedFabricsAttribute", readOperationalCredentialsCommissionedFabricsAttributeInteractionInfo); Map @@ -6258,7 +6248,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOperationalCredentialsClusterTrustedRootCertificatesAttributeCallback(), readOperationalCredentialsTrustedRootCertificatesCommandParams); - readOperationalCredentialsInteractionInfo.put( + result.put( "readTrustedRootCertificatesAttribute", readOperationalCredentialsTrustedRootCertificatesAttributeInteractionInfo); Map readOperationalCredentialsCurrentFabricIndexCommandParams = @@ -6272,7 +6262,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOperationalCredentialsCurrentFabricIndexCommandParams); - readOperationalCredentialsInteractionInfo.put( + result.put( "readCurrentFabricIndexAttribute", readOperationalCredentialsCurrentFabricIndexAttributeInteractionInfo); Map readOperationalCredentialsGeneratedCommandListCommandParams = @@ -6290,7 +6280,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOperationalCredentialsClusterGeneratedCommandListAttributeCallback(), readOperationalCredentialsGeneratedCommandListCommandParams); - readOperationalCredentialsInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readOperationalCredentialsGeneratedCommandListAttributeInteractionInfo); Map readOperationalCredentialsAcceptedCommandListCommandParams = @@ -6308,7 +6298,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOperationalCredentialsClusterAcceptedCommandListAttributeCallback(), readOperationalCredentialsAcceptedCommandListCommandParams); - readOperationalCredentialsInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readOperationalCredentialsAcceptedCommandListAttributeInteractionInfo); Map readOperationalCredentialsEventListCommandParams = @@ -6325,7 +6315,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOperationalCredentialsClusterEventListAttributeCallback(), readOperationalCredentialsEventListCommandParams); - readOperationalCredentialsInteractionInfo.put( + result.put( "readEventListAttribute", readOperationalCredentialsEventListAttributeInteractionInfo); Map readOperationalCredentialsAttributeListCommandParams = new LinkedHashMap(); @@ -6341,7 +6331,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOperationalCredentialsClusterAttributeListAttributeCallback(), readOperationalCredentialsAttributeListCommandParams); - readOperationalCredentialsInteractionInfo.put( + result.put( "readAttributeListAttribute", readOperationalCredentialsAttributeListAttributeInteractionInfo); Map readOperationalCredentialsFeatureMapCommandParams = @@ -6354,7 +6344,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readOperationalCredentialsFeatureMapCommandParams); - readOperationalCredentialsInteractionInfo.put( + result.put( "readFeatureMapAttribute", readOperationalCredentialsFeatureMapAttributeInteractionInfo); Map readOperationalCredentialsClusterRevisionCommandParams = new LinkedHashMap(); @@ -6366,11 +6356,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOperationalCredentialsClusterRevisionCommandParams); - readOperationalCredentialsInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readOperationalCredentialsClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("operationalCredentials", readOperationalCredentialsInteractionInfo); - Map readGroupKeyManagementInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readGroupKeyManagementInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readGroupKeyManagementGroupKeyMapCommandParams = new LinkedHashMap(); InteractionInfo readGroupKeyManagementGroupKeyMapAttributeInteractionInfo = @@ -6385,7 +6379,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGroupKeyManagementClusterGroupKeyMapAttributeCallback(), readGroupKeyManagementGroupKeyMapCommandParams); - readGroupKeyManagementInteractionInfo.put( + result.put( "readGroupKeyMapAttribute", readGroupKeyManagementGroupKeyMapAttributeInteractionInfo); Map readGroupKeyManagementGroupTableCommandParams = new LinkedHashMap(); @@ -6401,8 +6395,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGroupKeyManagementClusterGroupTableAttributeCallback(), readGroupKeyManagementGroupTableCommandParams); - readGroupKeyManagementInteractionInfo.put( - "readGroupTableAttribute", readGroupKeyManagementGroupTableAttributeInteractionInfo); + result.put("readGroupTableAttribute", readGroupKeyManagementGroupTableAttributeInteractionInfo); Map readGroupKeyManagementMaxGroupsPerFabricCommandParams = new LinkedHashMap(); InteractionInfo readGroupKeyManagementMaxGroupsPerFabricAttributeInteractionInfo = @@ -6414,7 +6407,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readGroupKeyManagementMaxGroupsPerFabricCommandParams); - readGroupKeyManagementInteractionInfo.put( + result.put( "readMaxGroupsPerFabricAttribute", readGroupKeyManagementMaxGroupsPerFabricAttributeInteractionInfo); Map readGroupKeyManagementMaxGroupKeysPerFabricCommandParams = @@ -6428,7 +6421,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readGroupKeyManagementMaxGroupKeysPerFabricCommandParams); - readGroupKeyManagementInteractionInfo.put( + result.put( "readMaxGroupKeysPerFabricAttribute", readGroupKeyManagementMaxGroupKeysPerFabricAttributeInteractionInfo); Map readGroupKeyManagementGeneratedCommandListCommandParams = @@ -6445,7 +6438,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGroupKeyManagementClusterGeneratedCommandListAttributeCallback(), readGroupKeyManagementGeneratedCommandListCommandParams); - readGroupKeyManagementInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readGroupKeyManagementGeneratedCommandListAttributeInteractionInfo); Map readGroupKeyManagementAcceptedCommandListCommandParams = @@ -6462,7 +6455,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGroupKeyManagementClusterAcceptedCommandListAttributeCallback(), readGroupKeyManagementAcceptedCommandListCommandParams); - readGroupKeyManagementInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readGroupKeyManagementAcceptedCommandListAttributeInteractionInfo); Map readGroupKeyManagementEventListCommandParams = @@ -6478,8 +6471,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGroupKeyManagementClusterEventListAttributeCallback(), readGroupKeyManagementEventListCommandParams); - readGroupKeyManagementInteractionInfo.put( - "readEventListAttribute", readGroupKeyManagementEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readGroupKeyManagementEventListAttributeInteractionInfo); Map readGroupKeyManagementAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readGroupKeyManagementAttributeListAttributeInteractionInfo = @@ -6494,7 +6486,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedGroupKeyManagementClusterAttributeListAttributeCallback(), readGroupKeyManagementAttributeListCommandParams); - readGroupKeyManagementInteractionInfo.put( + result.put( "readAttributeListAttribute", readGroupKeyManagementAttributeListAttributeInteractionInfo); Map readGroupKeyManagementFeatureMapCommandParams = new LinkedHashMap(); @@ -6506,8 +6498,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readGroupKeyManagementFeatureMapCommandParams); - readGroupKeyManagementInteractionInfo.put( - "readFeatureMapAttribute", readGroupKeyManagementFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readGroupKeyManagementFeatureMapAttributeInteractionInfo); Map readGroupKeyManagementClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readGroupKeyManagementClusterRevisionAttributeInteractionInfo = @@ -6518,11 +6509,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readGroupKeyManagementClusterRevisionCommandParams); - readGroupKeyManagementInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readGroupKeyManagementClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("groupKeyManagement", readGroupKeyManagementInteractionInfo); - Map readFixedLabelInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readFixedLabelInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readFixedLabelLabelListCommandParams = new LinkedHashMap(); InteractionInfo readFixedLabelLabelListAttributeInteractionInfo = @@ -6534,8 +6529,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedFixedLabelClusterLabelListAttributeCallback(), readFixedLabelLabelListCommandParams); - readFixedLabelInteractionInfo.put( - "readLabelListAttribute", readFixedLabelLabelListAttributeInteractionInfo); + result.put("readLabelListAttribute", readFixedLabelLabelListAttributeInteractionInfo); Map readFixedLabelGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readFixedLabelGeneratedCommandListAttributeInteractionInfo = @@ -6550,7 +6544,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedFixedLabelClusterGeneratedCommandListAttributeCallback(), readFixedLabelGeneratedCommandListCommandParams); - readFixedLabelInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readFixedLabelGeneratedCommandListAttributeInteractionInfo); Map readFixedLabelAcceptedCommandListCommandParams = @@ -6567,7 +6561,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedFixedLabelClusterAcceptedCommandListAttributeCallback(), readFixedLabelAcceptedCommandListCommandParams); - readFixedLabelInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readFixedLabelAcceptedCommandListAttributeInteractionInfo); Map readFixedLabelEventListCommandParams = @@ -6581,8 +6575,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedFixedLabelClusterEventListAttributeCallback(), readFixedLabelEventListCommandParams); - readFixedLabelInteractionInfo.put( - "readEventListAttribute", readFixedLabelEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readFixedLabelEventListAttributeInteractionInfo); Map readFixedLabelAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readFixedLabelAttributeListAttributeInteractionInfo = @@ -6594,8 +6587,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedFixedLabelClusterAttributeListAttributeCallback(), readFixedLabelAttributeListCommandParams); - readFixedLabelInteractionInfo.put( - "readAttributeListAttribute", readFixedLabelAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readFixedLabelAttributeListAttributeInteractionInfo); Map readFixedLabelFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readFixedLabelFeatureMapAttributeInteractionInfo = @@ -6606,8 +6598,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readFixedLabelFeatureMapCommandParams); - readFixedLabelInteractionInfo.put( - "readFeatureMapAttribute", readFixedLabelFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readFixedLabelFeatureMapAttributeInteractionInfo); Map readFixedLabelClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readFixedLabelClusterRevisionAttributeInteractionInfo = @@ -6618,10 +6609,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readFixedLabelClusterRevisionCommandParams); - readFixedLabelInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readFixedLabelClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("fixedLabel", readFixedLabelInteractionInfo); - Map readUserLabelInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readUserLabelInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readUserLabelLabelListCommandParams = new LinkedHashMap(); InteractionInfo readUserLabelLabelListAttributeInteractionInfo = @@ -6633,8 +6628,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedUserLabelClusterLabelListAttributeCallback(), readUserLabelLabelListCommandParams); - readUserLabelInteractionInfo.put( - "readLabelListAttribute", readUserLabelLabelListAttributeInteractionInfo); + result.put("readLabelListAttribute", readUserLabelLabelListAttributeInteractionInfo); Map readUserLabelGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readUserLabelGeneratedCommandListAttributeInteractionInfo = @@ -6649,7 +6643,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUserLabelClusterGeneratedCommandListAttributeCallback(), readUserLabelGeneratedCommandListCommandParams); - readUserLabelInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readUserLabelGeneratedCommandListAttributeInteractionInfo); Map readUserLabelAcceptedCommandListCommandParams = @@ -6666,7 +6660,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUserLabelClusterAcceptedCommandListAttributeCallback(), readUserLabelAcceptedCommandListCommandParams); - readUserLabelInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readUserLabelAcceptedCommandListAttributeInteractionInfo); Map readUserLabelEventListCommandParams = @@ -6680,8 +6674,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedUserLabelClusterEventListAttributeCallback(), readUserLabelEventListCommandParams); - readUserLabelInteractionInfo.put( - "readEventListAttribute", readUserLabelEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readUserLabelEventListAttributeInteractionInfo); Map readUserLabelAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readUserLabelAttributeListAttributeInteractionInfo = @@ -6693,8 +6686,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedUserLabelClusterAttributeListAttributeCallback(), readUserLabelAttributeListCommandParams); - readUserLabelInteractionInfo.put( - "readAttributeListAttribute", readUserLabelAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readUserLabelAttributeListAttributeInteractionInfo); Map readUserLabelFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readUserLabelFeatureMapAttributeInteractionInfo = @@ -6705,8 +6697,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUserLabelFeatureMapCommandParams); - readUserLabelInteractionInfo.put( - "readFeatureMapAttribute", readUserLabelFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readUserLabelFeatureMapAttributeInteractionInfo); Map readUserLabelClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readUserLabelClusterRevisionAttributeInteractionInfo = @@ -6717,10 +6708,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUserLabelClusterRevisionCommandParams); - readUserLabelInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readUserLabelClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("userLabel", readUserLabelInteractionInfo); - Map readBooleanStateInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readBooleanStateInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readBooleanStateStateValueCommandParams = new LinkedHashMap(); InteractionInfo readBooleanStateStateValueAttributeInteractionInfo = @@ -6731,8 +6726,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readBooleanStateStateValueCommandParams); - readBooleanStateInteractionInfo.put( - "readStateValueAttribute", readBooleanStateStateValueAttributeInteractionInfo); + result.put("readStateValueAttribute", readBooleanStateStateValueAttributeInteractionInfo); Map readBooleanStateGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readBooleanStateGeneratedCommandListAttributeInteractionInfo = @@ -6747,7 +6741,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBooleanStateClusterGeneratedCommandListAttributeCallback(), readBooleanStateGeneratedCommandListCommandParams); - readBooleanStateInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readBooleanStateGeneratedCommandListAttributeInteractionInfo); Map readBooleanStateAcceptedCommandListCommandParams = @@ -6764,7 +6758,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBooleanStateClusterAcceptedCommandListAttributeCallback(), readBooleanStateAcceptedCommandListCommandParams); - readBooleanStateInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readBooleanStateAcceptedCommandListAttributeInteractionInfo); Map readBooleanStateEventListCommandParams = @@ -6778,8 +6772,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanStateClusterEventListAttributeCallback(), readBooleanStateEventListCommandParams); - readBooleanStateInteractionInfo.put( - "readEventListAttribute", readBooleanStateEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readBooleanStateEventListAttributeInteractionInfo); Map readBooleanStateAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readBooleanStateAttributeListAttributeInteractionInfo = @@ -6792,8 +6785,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedBooleanStateClusterAttributeListAttributeCallback(), readBooleanStateAttributeListCommandParams); - readBooleanStateInteractionInfo.put( - "readAttributeListAttribute", readBooleanStateAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readBooleanStateAttributeListAttributeInteractionInfo); Map readBooleanStateFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readBooleanStateFeatureMapAttributeInteractionInfo = @@ -6804,8 +6796,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readBooleanStateFeatureMapCommandParams); - readBooleanStateInteractionInfo.put( - "readFeatureMapAttribute", readBooleanStateFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readBooleanStateFeatureMapAttributeInteractionInfo); Map readBooleanStateClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readBooleanStateClusterRevisionAttributeInteractionInfo = @@ -6816,10 +6807,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBooleanStateClusterRevisionCommandParams); - readBooleanStateInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readBooleanStateClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("booleanState", readBooleanStateInteractionInfo); - Map readModeSelectInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readModeSelectInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readModeSelectDescriptionCommandParams = new LinkedHashMap(); InteractionInfo readModeSelectDescriptionAttributeInteractionInfo = @@ -6830,8 +6825,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readModeSelectDescriptionCommandParams); - readModeSelectInteractionInfo.put( - "readDescriptionAttribute", readModeSelectDescriptionAttributeInteractionInfo); + result.put("readDescriptionAttribute", readModeSelectDescriptionAttributeInteractionInfo); Map readModeSelectStandardNamespaceCommandParams = new LinkedHashMap(); InteractionInfo readModeSelectStandardNamespaceAttributeInteractionInfo = @@ -6845,7 +6839,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedModeSelectClusterStandardNamespaceAttributeCallback(), readModeSelectStandardNamespaceCommandParams); - readModeSelectInteractionInfo.put( + result.put( "readStandardNamespaceAttribute", readModeSelectStandardNamespaceAttributeInteractionInfo); Map readModeSelectSupportedModesCommandParams = new LinkedHashMap(); @@ -6859,8 +6853,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedModeSelectClusterSupportedModesAttributeCallback(), readModeSelectSupportedModesCommandParams); - readModeSelectInteractionInfo.put( - "readSupportedModesAttribute", readModeSelectSupportedModesAttributeInteractionInfo); + result.put("readSupportedModesAttribute", readModeSelectSupportedModesAttributeInteractionInfo); Map readModeSelectCurrentModeCommandParams = new LinkedHashMap(); InteractionInfo readModeSelectCurrentModeAttributeInteractionInfo = @@ -6871,8 +6864,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readModeSelectCurrentModeCommandParams); - readModeSelectInteractionInfo.put( - "readCurrentModeAttribute", readModeSelectCurrentModeAttributeInteractionInfo); + result.put("readCurrentModeAttribute", readModeSelectCurrentModeAttributeInteractionInfo); Map readModeSelectStartUpModeCommandParams = new LinkedHashMap(); InteractionInfo readModeSelectStartUpModeAttributeInteractionInfo = @@ -6884,8 +6876,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedModeSelectClusterStartUpModeAttributeCallback(), readModeSelectStartUpModeCommandParams); - readModeSelectInteractionInfo.put( - "readStartUpModeAttribute", readModeSelectStartUpModeAttributeInteractionInfo); + result.put("readStartUpModeAttribute", readModeSelectStartUpModeAttributeInteractionInfo); Map readModeSelectOnModeCommandParams = new LinkedHashMap(); InteractionInfo readModeSelectOnModeAttributeInteractionInfo = @@ -6897,8 +6888,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedModeSelectClusterOnModeAttributeCallback(), readModeSelectOnModeCommandParams); - readModeSelectInteractionInfo.put( - "readOnModeAttribute", readModeSelectOnModeAttributeInteractionInfo); + result.put("readOnModeAttribute", readModeSelectOnModeAttributeInteractionInfo); Map readModeSelectGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readModeSelectGeneratedCommandListAttributeInteractionInfo = @@ -6913,7 +6903,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedModeSelectClusterGeneratedCommandListAttributeCallback(), readModeSelectGeneratedCommandListCommandParams); - readModeSelectInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readModeSelectGeneratedCommandListAttributeInteractionInfo); Map readModeSelectAcceptedCommandListCommandParams = @@ -6930,7 +6920,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedModeSelectClusterAcceptedCommandListAttributeCallback(), readModeSelectAcceptedCommandListCommandParams); - readModeSelectInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readModeSelectAcceptedCommandListAttributeInteractionInfo); Map readModeSelectEventListCommandParams = @@ -6944,8 +6934,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedModeSelectClusterEventListAttributeCallback(), readModeSelectEventListCommandParams); - readModeSelectInteractionInfo.put( - "readEventListAttribute", readModeSelectEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readModeSelectEventListAttributeInteractionInfo); Map readModeSelectAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readModeSelectAttributeListAttributeInteractionInfo = @@ -6957,8 +6946,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedModeSelectClusterAttributeListAttributeCallback(), readModeSelectAttributeListCommandParams); - readModeSelectInteractionInfo.put( - "readAttributeListAttribute", readModeSelectAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readModeSelectAttributeListAttributeInteractionInfo); Map readModeSelectFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readModeSelectFeatureMapAttributeInteractionInfo = @@ -6969,8 +6957,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readModeSelectFeatureMapCommandParams); - readModeSelectInteractionInfo.put( - "readFeatureMapAttribute", readModeSelectFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readModeSelectFeatureMapAttributeInteractionInfo); Map readModeSelectClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readModeSelectClusterRevisionAttributeInteractionInfo = @@ -6981,10 +6968,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readModeSelectClusterRevisionCommandParams); - readModeSelectInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readModeSelectClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("modeSelect", readModeSelectInteractionInfo); - Map readDoorLockInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readDoorLockInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readDoorLockLockStateCommandParams = new LinkedHashMap(); InteractionInfo readDoorLockLockStateAttributeInteractionInfo = @@ -6996,8 +6987,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedDoorLockClusterLockStateAttributeCallback(), readDoorLockLockStateCommandParams); - readDoorLockInteractionInfo.put( - "readLockStateAttribute", readDoorLockLockStateAttributeInteractionInfo); + result.put("readLockStateAttribute", readDoorLockLockStateAttributeInteractionInfo); Map readDoorLockLockTypeCommandParams = new LinkedHashMap(); InteractionInfo readDoorLockLockTypeAttributeInteractionInfo = @@ -7008,8 +6998,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockLockTypeCommandParams); - readDoorLockInteractionInfo.put( - "readLockTypeAttribute", readDoorLockLockTypeAttributeInteractionInfo); + result.put("readLockTypeAttribute", readDoorLockLockTypeAttributeInteractionInfo); Map readDoorLockActuatorEnabledCommandParams = new LinkedHashMap(); InteractionInfo readDoorLockActuatorEnabledAttributeInteractionInfo = @@ -7020,8 +7009,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readDoorLockActuatorEnabledCommandParams); - readDoorLockInteractionInfo.put( - "readActuatorEnabledAttribute", readDoorLockActuatorEnabledAttributeInteractionInfo); + result.put("readActuatorEnabledAttribute", readDoorLockActuatorEnabledAttributeInteractionInfo); Map readDoorLockDoorStateCommandParams = new LinkedHashMap(); InteractionInfo readDoorLockDoorStateAttributeInteractionInfo = @@ -7033,8 +7021,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedDoorLockClusterDoorStateAttributeCallback(), readDoorLockDoorStateCommandParams); - readDoorLockInteractionInfo.put( - "readDoorStateAttribute", readDoorLockDoorStateAttributeInteractionInfo); + result.put("readDoorStateAttribute", readDoorLockDoorStateAttributeInteractionInfo); Map readDoorLockDoorOpenEventsCommandParams = new LinkedHashMap(); InteractionInfo readDoorLockDoorOpenEventsAttributeInteractionInfo = @@ -7045,8 +7032,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readDoorLockDoorOpenEventsCommandParams); - readDoorLockInteractionInfo.put( - "readDoorOpenEventsAttribute", readDoorLockDoorOpenEventsAttributeInteractionInfo); + result.put("readDoorOpenEventsAttribute", readDoorLockDoorOpenEventsAttributeInteractionInfo); Map readDoorLockDoorClosedEventsCommandParams = new LinkedHashMap(); InteractionInfo readDoorLockDoorClosedEventsAttributeInteractionInfo = @@ -7057,7 +7043,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readDoorLockDoorClosedEventsCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readDoorClosedEventsAttribute", readDoorLockDoorClosedEventsAttributeInteractionInfo); Map readDoorLockOpenPeriodCommandParams = new LinkedHashMap(); @@ -7069,8 +7055,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockOpenPeriodCommandParams); - readDoorLockInteractionInfo.put( - "readOpenPeriodAttribute", readDoorLockOpenPeriodAttributeInteractionInfo); + result.put("readOpenPeriodAttribute", readDoorLockOpenPeriodAttributeInteractionInfo); Map readDoorLockNumberOfTotalUsersSupportedCommandParams = new LinkedHashMap(); InteractionInfo readDoorLockNumberOfTotalUsersSupportedAttributeInteractionInfo = @@ -7082,7 +7067,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockNumberOfTotalUsersSupportedCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readNumberOfTotalUsersSupportedAttribute", readDoorLockNumberOfTotalUsersSupportedAttributeInteractionInfo); Map readDoorLockNumberOfPINUsersSupportedCommandParams = @@ -7096,7 +7081,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockNumberOfPINUsersSupportedCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readNumberOfPINUsersSupportedAttribute", readDoorLockNumberOfPINUsersSupportedAttributeInteractionInfo); Map readDoorLockNumberOfRFIDUsersSupportedCommandParams = @@ -7110,7 +7095,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockNumberOfRFIDUsersSupportedCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readNumberOfRFIDUsersSupportedAttribute", readDoorLockNumberOfRFIDUsersSupportedAttributeInteractionInfo); Map @@ -7125,7 +7110,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockNumberOfWeekDaySchedulesSupportedPerUserCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readNumberOfWeekDaySchedulesSupportedPerUserAttribute", readDoorLockNumberOfWeekDaySchedulesSupportedPerUserAttributeInteractionInfo); Map @@ -7140,7 +7125,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockNumberOfYearDaySchedulesSupportedPerUserCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readNumberOfYearDaySchedulesSupportedPerUserAttribute", readDoorLockNumberOfYearDaySchedulesSupportedPerUserAttributeInteractionInfo); Map readDoorLockNumberOfHolidaySchedulesSupportedCommandParams = @@ -7154,7 +7139,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockNumberOfHolidaySchedulesSupportedCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readNumberOfHolidaySchedulesSupportedAttribute", readDoorLockNumberOfHolidaySchedulesSupportedAttributeInteractionInfo); Map readDoorLockMaxPINCodeLengthCommandParams = @@ -7167,7 +7152,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockMaxPINCodeLengthCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readMaxPINCodeLengthAttribute", readDoorLockMaxPINCodeLengthAttributeInteractionInfo); Map readDoorLockMinPINCodeLengthCommandParams = new LinkedHashMap(); @@ -7179,7 +7164,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockMinPINCodeLengthCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readMinPINCodeLengthAttribute", readDoorLockMinPINCodeLengthAttributeInteractionInfo); Map readDoorLockMaxRFIDCodeLengthCommandParams = new LinkedHashMap(); @@ -7191,7 +7176,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockMaxRFIDCodeLengthCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readMaxRFIDCodeLengthAttribute", readDoorLockMaxRFIDCodeLengthAttributeInteractionInfo); Map readDoorLockMinRFIDCodeLengthCommandParams = new LinkedHashMap(); @@ -7203,7 +7188,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockMinRFIDCodeLengthCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readMinRFIDCodeLengthAttribute", readDoorLockMinRFIDCodeLengthAttributeInteractionInfo); Map readDoorLockCredentialRulesSupportCommandParams = new LinkedHashMap(); @@ -7216,7 +7201,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockCredentialRulesSupportCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readCredentialRulesSupportAttribute", readDoorLockCredentialRulesSupportAttributeInteractionInfo); Map readDoorLockNumberOfCredentialsSupportedPerUserCommandParams = @@ -7230,7 +7215,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockNumberOfCredentialsSupportedPerUserCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readNumberOfCredentialsSupportedPerUserAttribute", readDoorLockNumberOfCredentialsSupportedPerUserAttributeInteractionInfo); Map readDoorLockLanguageCommandParams = @@ -7243,8 +7228,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readDoorLockLanguageCommandParams); - readDoorLockInteractionInfo.put( - "readLanguageAttribute", readDoorLockLanguageAttributeInteractionInfo); + result.put("readLanguageAttribute", readDoorLockLanguageAttributeInteractionInfo); Map readDoorLockLEDSettingsCommandParams = new LinkedHashMap(); InteractionInfo readDoorLockLEDSettingsAttributeInteractionInfo = @@ -7255,8 +7239,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockLEDSettingsCommandParams); - readDoorLockInteractionInfo.put( - "readLEDSettingsAttribute", readDoorLockLEDSettingsAttributeInteractionInfo); + result.put("readLEDSettingsAttribute", readDoorLockLEDSettingsAttributeInteractionInfo); Map readDoorLockAutoRelockTimeCommandParams = new LinkedHashMap(); InteractionInfo readDoorLockAutoRelockTimeAttributeInteractionInfo = @@ -7267,8 +7250,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readDoorLockAutoRelockTimeCommandParams); - readDoorLockInteractionInfo.put( - "readAutoRelockTimeAttribute", readDoorLockAutoRelockTimeAttributeInteractionInfo); + result.put("readAutoRelockTimeAttribute", readDoorLockAutoRelockTimeAttributeInteractionInfo); Map readDoorLockSoundVolumeCommandParams = new LinkedHashMap(); InteractionInfo readDoorLockSoundVolumeAttributeInteractionInfo = @@ -7279,8 +7261,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockSoundVolumeCommandParams); - readDoorLockInteractionInfo.put( - "readSoundVolumeAttribute", readDoorLockSoundVolumeAttributeInteractionInfo); + result.put("readSoundVolumeAttribute", readDoorLockSoundVolumeAttributeInteractionInfo); Map readDoorLockOperatingModeCommandParams = new LinkedHashMap(); InteractionInfo readDoorLockOperatingModeAttributeInteractionInfo = @@ -7291,8 +7272,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockOperatingModeCommandParams); - readDoorLockInteractionInfo.put( - "readOperatingModeAttribute", readDoorLockOperatingModeAttributeInteractionInfo); + result.put("readOperatingModeAttribute", readDoorLockOperatingModeAttributeInteractionInfo); Map readDoorLockSupportedOperatingModesCommandParams = new LinkedHashMap(); InteractionInfo readDoorLockSupportedOperatingModesAttributeInteractionInfo = @@ -7304,7 +7284,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockSupportedOperatingModesCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readSupportedOperatingModesAttribute", readDoorLockSupportedOperatingModesAttributeInteractionInfo); Map readDoorLockDefaultConfigurationRegisterCommandParams = @@ -7318,7 +7298,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockDefaultConfigurationRegisterCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readDefaultConfigurationRegisterAttribute", readDoorLockDefaultConfigurationRegisterAttributeInteractionInfo); Map readDoorLockEnableLocalProgrammingCommandParams = @@ -7332,7 +7312,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readDoorLockEnableLocalProgrammingCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readEnableLocalProgrammingAttribute", readDoorLockEnableLocalProgrammingAttributeInteractionInfo); Map readDoorLockEnableOneTouchLockingCommandParams = @@ -7346,7 +7326,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readDoorLockEnableOneTouchLockingCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readEnableOneTouchLockingAttribute", readDoorLockEnableOneTouchLockingAttributeInteractionInfo); Map readDoorLockEnableInsideStatusLEDCommandParams = @@ -7360,7 +7340,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readDoorLockEnableInsideStatusLEDCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readEnableInsideStatusLEDAttribute", readDoorLockEnableInsideStatusLEDAttributeInteractionInfo); Map readDoorLockEnablePrivacyModeButtonCommandParams = @@ -7374,7 +7354,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readDoorLockEnablePrivacyModeButtonCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readEnablePrivacyModeButtonAttribute", readDoorLockEnablePrivacyModeButtonAttributeInteractionInfo); Map readDoorLockLocalProgrammingFeaturesCommandParams = @@ -7388,7 +7368,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockLocalProgrammingFeaturesCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readLocalProgrammingFeaturesAttribute", readDoorLockLocalProgrammingFeaturesAttributeInteractionInfo); Map readDoorLockWrongCodeEntryLimitCommandParams = @@ -7402,7 +7382,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockWrongCodeEntryLimitCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readWrongCodeEntryLimitAttribute", readDoorLockWrongCodeEntryLimitAttributeInteractionInfo); Map readDoorLockUserCodeTemporaryDisableTimeCommandParams = @@ -7416,7 +7396,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockUserCodeTemporaryDisableTimeCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readUserCodeTemporaryDisableTimeAttribute", readDoorLockUserCodeTemporaryDisableTimeAttributeInteractionInfo); Map readDoorLockSendPINOverTheAirCommandParams = @@ -7429,7 +7409,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readDoorLockSendPINOverTheAirCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readSendPINOverTheAirAttribute", readDoorLockSendPINOverTheAirAttributeInteractionInfo); Map readDoorLockRequirePINforRemoteOperationCommandParams = new LinkedHashMap(); @@ -7442,7 +7422,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readDoorLockRequirePINforRemoteOperationCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readRequirePINforRemoteOperationAttribute", readDoorLockRequirePINforRemoteOperationAttributeInteractionInfo); Map readDoorLockExpiringUserTimeoutCommandParams = @@ -7456,7 +7436,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockExpiringUserTimeoutCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readExpiringUserTimeoutAttribute", readDoorLockExpiringUserTimeoutAttributeInteractionInfo); Map readDoorLockGeneratedCommandListCommandParams = @@ -7473,7 +7453,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedDoorLockClusterGeneratedCommandListAttributeCallback(), readDoorLockGeneratedCommandListCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readDoorLockGeneratedCommandListAttributeInteractionInfo); Map readDoorLockAcceptedCommandListCommandParams = @@ -7489,7 +7469,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedDoorLockClusterAcceptedCommandListAttributeCallback(), readDoorLockAcceptedCommandListCommandParams); - readDoorLockInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readDoorLockAcceptedCommandListAttributeInteractionInfo); Map readDoorLockEventListCommandParams = @@ -7503,8 +7483,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedDoorLockClusterEventListAttributeCallback(), readDoorLockEventListCommandParams); - readDoorLockInteractionInfo.put( - "readEventListAttribute", readDoorLockEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readDoorLockEventListAttributeInteractionInfo); Map readDoorLockAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readDoorLockAttributeListAttributeInteractionInfo = @@ -7516,8 +7495,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedDoorLockClusterAttributeListAttributeCallback(), readDoorLockAttributeListCommandParams); - readDoorLockInteractionInfo.put( - "readAttributeListAttribute", readDoorLockAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readDoorLockAttributeListAttributeInteractionInfo); Map readDoorLockFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readDoorLockFeatureMapAttributeInteractionInfo = @@ -7528,8 +7506,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readDoorLockFeatureMapCommandParams); - readDoorLockInteractionInfo.put( - "readFeatureMapAttribute", readDoorLockFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readDoorLockFeatureMapAttributeInteractionInfo); Map readDoorLockClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readDoorLockClusterRevisionAttributeInteractionInfo = @@ -7540,10 +7517,13 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readDoorLockClusterRevisionCommandParams); - readDoorLockInteractionInfo.put( - "readClusterRevisionAttribute", readDoorLockClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("doorLock", readDoorLockInteractionInfo); - Map readWindowCoveringInteractionInfo = new LinkedHashMap<>(); + result.put("readClusterRevisionAttribute", readDoorLockClusterRevisionAttributeInteractionInfo); + + return result; + } + + private static Map readWindowCoveringInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readWindowCoveringTypeCommandParams = new LinkedHashMap(); InteractionInfo readWindowCoveringTypeAttributeInteractionInfo = @@ -7554,8 +7534,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readWindowCoveringTypeCommandParams); - readWindowCoveringInteractionInfo.put( - "readTypeAttribute", readWindowCoveringTypeAttributeInteractionInfo); + result.put("readTypeAttribute", readWindowCoveringTypeAttributeInteractionInfo); Map readWindowCoveringPhysicalClosedLimitLiftCommandParams = new LinkedHashMap(); InteractionInfo readWindowCoveringPhysicalClosedLimitLiftAttributeInteractionInfo = @@ -7567,7 +7546,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readWindowCoveringPhysicalClosedLimitLiftCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readPhysicalClosedLimitLiftAttribute", readWindowCoveringPhysicalClosedLimitLiftAttributeInteractionInfo); Map readWindowCoveringPhysicalClosedLimitTiltCommandParams = @@ -7581,7 +7560,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readWindowCoveringPhysicalClosedLimitTiltCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readPhysicalClosedLimitTiltAttribute", readWindowCoveringPhysicalClosedLimitTiltAttributeInteractionInfo); Map readWindowCoveringCurrentPositionLiftCommandParams = @@ -7598,7 +7577,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWindowCoveringClusterCurrentPositionLiftAttributeCallback(), readWindowCoveringCurrentPositionLiftCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readCurrentPositionLiftAttribute", readWindowCoveringCurrentPositionLiftAttributeInteractionInfo); Map readWindowCoveringCurrentPositionTiltCommandParams = @@ -7615,7 +7594,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWindowCoveringClusterCurrentPositionTiltAttributeCallback(), readWindowCoveringCurrentPositionTiltCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readCurrentPositionTiltAttribute", readWindowCoveringCurrentPositionTiltAttributeInteractionInfo); Map readWindowCoveringNumberOfActuationsLiftCommandParams = @@ -7629,7 +7608,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readWindowCoveringNumberOfActuationsLiftCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readNumberOfActuationsLiftAttribute", readWindowCoveringNumberOfActuationsLiftAttributeInteractionInfo); Map readWindowCoveringNumberOfActuationsTiltCommandParams = @@ -7643,7 +7622,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readWindowCoveringNumberOfActuationsTiltCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readNumberOfActuationsTiltAttribute", readWindowCoveringNumberOfActuationsTiltAttributeInteractionInfo); Map readWindowCoveringConfigStatusCommandParams = @@ -7656,8 +7635,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readWindowCoveringConfigStatusCommandParams); - readWindowCoveringInteractionInfo.put( - "readConfigStatusAttribute", readWindowCoveringConfigStatusAttributeInteractionInfo); + result.put("readConfigStatusAttribute", readWindowCoveringConfigStatusAttributeInteractionInfo); Map readWindowCoveringCurrentPositionLiftPercentageCommandParams = new LinkedHashMap(); InteractionInfo readWindowCoveringCurrentPositionLiftPercentageAttributeInteractionInfo = @@ -7673,7 +7651,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWindowCoveringClusterCurrentPositionLiftPercentageAttributeCallback(), readWindowCoveringCurrentPositionLiftPercentageCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readCurrentPositionLiftPercentageAttribute", readWindowCoveringCurrentPositionLiftPercentageAttributeInteractionInfo); Map readWindowCoveringCurrentPositionTiltPercentageCommandParams = @@ -7691,7 +7669,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWindowCoveringClusterCurrentPositionTiltPercentageAttributeCallback(), readWindowCoveringCurrentPositionTiltPercentageCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readCurrentPositionTiltPercentageAttribute", readWindowCoveringCurrentPositionTiltPercentageAttributeInteractionInfo); Map readWindowCoveringOperationalStatusCommandParams = @@ -7704,7 +7682,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readWindowCoveringOperationalStatusCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readOperationalStatusAttribute", readWindowCoveringOperationalStatusAttributeInteractionInfo); Map @@ -7723,7 +7701,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWindowCoveringClusterTargetPositionLiftPercent100thsAttributeCallback(), readWindowCoveringTargetPositionLiftPercent100thsCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readTargetPositionLiftPercent100thsAttribute", readWindowCoveringTargetPositionLiftPercent100thsAttributeInteractionInfo); Map @@ -7742,7 +7720,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWindowCoveringClusterTargetPositionTiltPercent100thsAttributeCallback(), readWindowCoveringTargetPositionTiltPercent100thsCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readTargetPositionTiltPercent100thsAttribute", readWindowCoveringTargetPositionTiltPercent100thsAttributeInteractionInfo); Map readWindowCoveringEndProductTypeCommandParams = @@ -7755,7 +7733,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readWindowCoveringEndProductTypeCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readEndProductTypeAttribute", readWindowCoveringEndProductTypeAttributeInteractionInfo); Map readWindowCoveringCurrentPositionLiftPercent100thsCommandParams = @@ -7773,7 +7751,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWindowCoveringClusterCurrentPositionLiftPercent100thsAttributeCallback(), readWindowCoveringCurrentPositionLiftPercent100thsCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readCurrentPositionLiftPercent100thsAttribute", readWindowCoveringCurrentPositionLiftPercent100thsAttributeInteractionInfo); Map @@ -7792,7 +7770,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWindowCoveringClusterCurrentPositionTiltPercent100thsAttributeCallback(), readWindowCoveringCurrentPositionTiltPercent100thsCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readCurrentPositionTiltPercent100thsAttribute", readWindowCoveringCurrentPositionTiltPercent100thsAttributeInteractionInfo); Map readWindowCoveringInstalledOpenLimitLiftCommandParams = @@ -7806,7 +7784,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readWindowCoveringInstalledOpenLimitLiftCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readInstalledOpenLimitLiftAttribute", readWindowCoveringInstalledOpenLimitLiftAttributeInteractionInfo); Map readWindowCoveringInstalledClosedLimitLiftCommandParams = @@ -7820,7 +7798,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readWindowCoveringInstalledClosedLimitLiftCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readInstalledClosedLimitLiftAttribute", readWindowCoveringInstalledClosedLimitLiftAttributeInteractionInfo); Map readWindowCoveringInstalledOpenLimitTiltCommandParams = @@ -7834,7 +7812,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readWindowCoveringInstalledOpenLimitTiltCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readInstalledOpenLimitTiltAttribute", readWindowCoveringInstalledOpenLimitTiltAttributeInteractionInfo); Map readWindowCoveringInstalledClosedLimitTiltCommandParams = @@ -7848,7 +7826,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readWindowCoveringInstalledClosedLimitTiltCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readInstalledClosedLimitTiltAttribute", readWindowCoveringInstalledClosedLimitTiltAttributeInteractionInfo); Map readWindowCoveringModeCommandParams = @@ -7861,8 +7839,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readWindowCoveringModeCommandParams); - readWindowCoveringInteractionInfo.put( - "readModeAttribute", readWindowCoveringModeAttributeInteractionInfo); + result.put("readModeAttribute", readWindowCoveringModeAttributeInteractionInfo); Map readWindowCoveringSafetyStatusCommandParams = new LinkedHashMap(); InteractionInfo readWindowCoveringSafetyStatusAttributeInteractionInfo = @@ -7873,8 +7850,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readWindowCoveringSafetyStatusCommandParams); - readWindowCoveringInteractionInfo.put( - "readSafetyStatusAttribute", readWindowCoveringSafetyStatusAttributeInteractionInfo); + result.put("readSafetyStatusAttribute", readWindowCoveringSafetyStatusAttributeInteractionInfo); Map readWindowCoveringGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readWindowCoveringGeneratedCommandListAttributeInteractionInfo = @@ -7889,7 +7865,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWindowCoveringClusterGeneratedCommandListAttributeCallback(), readWindowCoveringGeneratedCommandListCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readWindowCoveringGeneratedCommandListAttributeInteractionInfo); Map readWindowCoveringAcceptedCommandListCommandParams = @@ -7906,7 +7882,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWindowCoveringClusterAcceptedCommandListAttributeCallback(), readWindowCoveringAcceptedCommandListCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readWindowCoveringAcceptedCommandListAttributeInteractionInfo); Map readWindowCoveringEventListCommandParams = @@ -7920,8 +7896,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedWindowCoveringClusterEventListAttributeCallback(), readWindowCoveringEventListCommandParams); - readWindowCoveringInteractionInfo.put( - "readEventListAttribute", readWindowCoveringEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readWindowCoveringEventListAttributeInteractionInfo); Map readWindowCoveringAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readWindowCoveringAttributeListAttributeInteractionInfo = @@ -7935,7 +7910,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWindowCoveringClusterAttributeListAttributeCallback(), readWindowCoveringAttributeListCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readAttributeListAttribute", readWindowCoveringAttributeListAttributeInteractionInfo); Map readWindowCoveringFeatureMapCommandParams = new LinkedHashMap(); @@ -7947,8 +7922,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readWindowCoveringFeatureMapCommandParams); - readWindowCoveringInteractionInfo.put( - "readFeatureMapAttribute", readWindowCoveringFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readWindowCoveringFeatureMapAttributeInteractionInfo); Map readWindowCoveringClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readWindowCoveringClusterRevisionAttributeInteractionInfo = @@ -7959,10 +7933,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readWindowCoveringClusterRevisionCommandParams); - readWindowCoveringInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readWindowCoveringClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("windowCovering", readWindowCoveringInteractionInfo); - Map readBarrierControlInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readBarrierControlInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readBarrierControlBarrierMovingStateCommandParams = new LinkedHashMap(); InteractionInfo readBarrierControlBarrierMovingStateAttributeInteractionInfo = @@ -7974,7 +7952,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBarrierControlBarrierMovingStateCommandParams); - readBarrierControlInteractionInfo.put( + result.put( "readBarrierMovingStateAttribute", readBarrierControlBarrierMovingStateAttributeInteractionInfo); Map readBarrierControlBarrierSafetyStatusCommandParams = @@ -7988,7 +7966,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBarrierControlBarrierSafetyStatusCommandParams); - readBarrierControlInteractionInfo.put( + result.put( "readBarrierSafetyStatusAttribute", readBarrierControlBarrierSafetyStatusAttributeInteractionInfo); Map readBarrierControlBarrierCapabilitiesCommandParams = @@ -8002,7 +7980,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBarrierControlBarrierCapabilitiesCommandParams); - readBarrierControlInteractionInfo.put( + result.put( "readBarrierCapabilitiesAttribute", readBarrierControlBarrierCapabilitiesAttributeInteractionInfo); Map readBarrierControlBarrierOpenEventsCommandParams = @@ -8015,7 +7993,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBarrierControlBarrierOpenEventsCommandParams); - readBarrierControlInteractionInfo.put( + result.put( "readBarrierOpenEventsAttribute", readBarrierControlBarrierOpenEventsAttributeInteractionInfo); Map readBarrierControlBarrierCloseEventsCommandParams = @@ -8029,7 +8007,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBarrierControlBarrierCloseEventsCommandParams); - readBarrierControlInteractionInfo.put( + result.put( "readBarrierCloseEventsAttribute", readBarrierControlBarrierCloseEventsAttributeInteractionInfo); Map readBarrierControlBarrierCommandOpenEventsCommandParams = @@ -8043,7 +8021,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBarrierControlBarrierCommandOpenEventsCommandParams); - readBarrierControlInteractionInfo.put( + result.put( "readBarrierCommandOpenEventsAttribute", readBarrierControlBarrierCommandOpenEventsAttributeInteractionInfo); Map readBarrierControlBarrierCommandCloseEventsCommandParams = @@ -8057,7 +8035,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBarrierControlBarrierCommandCloseEventsCommandParams); - readBarrierControlInteractionInfo.put( + result.put( "readBarrierCommandCloseEventsAttribute", readBarrierControlBarrierCommandCloseEventsAttributeInteractionInfo); Map readBarrierControlBarrierOpenPeriodCommandParams = @@ -8070,7 +8048,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBarrierControlBarrierOpenPeriodCommandParams); - readBarrierControlInteractionInfo.put( + result.put( "readBarrierOpenPeriodAttribute", readBarrierControlBarrierOpenPeriodAttributeInteractionInfo); Map readBarrierControlBarrierClosePeriodCommandParams = @@ -8084,7 +8062,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBarrierControlBarrierClosePeriodCommandParams); - readBarrierControlInteractionInfo.put( + result.put( "readBarrierClosePeriodAttribute", readBarrierControlBarrierClosePeriodAttributeInteractionInfo); Map readBarrierControlBarrierPositionCommandParams = @@ -8097,7 +8075,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBarrierControlBarrierPositionCommandParams); - readBarrierControlInteractionInfo.put( + result.put( "readBarrierPositionAttribute", readBarrierControlBarrierPositionAttributeInteractionInfo); Map readBarrierControlGeneratedCommandListCommandParams = new LinkedHashMap(); @@ -8113,7 +8091,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBarrierControlClusterGeneratedCommandListAttributeCallback(), readBarrierControlGeneratedCommandListCommandParams); - readBarrierControlInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readBarrierControlGeneratedCommandListAttributeInteractionInfo); Map readBarrierControlAcceptedCommandListCommandParams = @@ -8130,7 +8108,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBarrierControlClusterAcceptedCommandListAttributeCallback(), readBarrierControlAcceptedCommandListCommandParams); - readBarrierControlInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readBarrierControlAcceptedCommandListAttributeInteractionInfo); Map readBarrierControlEventListCommandParams = @@ -8144,8 +8122,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBarrierControlClusterEventListAttributeCallback(), readBarrierControlEventListCommandParams); - readBarrierControlInteractionInfo.put( - "readEventListAttribute", readBarrierControlEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readBarrierControlEventListAttributeInteractionInfo); Map readBarrierControlAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readBarrierControlAttributeListAttributeInteractionInfo = @@ -8159,7 +8136,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBarrierControlClusterAttributeListAttributeCallback(), readBarrierControlAttributeListCommandParams); - readBarrierControlInteractionInfo.put( + result.put( "readAttributeListAttribute", readBarrierControlAttributeListAttributeInteractionInfo); Map readBarrierControlFeatureMapCommandParams = new LinkedHashMap(); @@ -8171,8 +8148,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readBarrierControlFeatureMapCommandParams); - readBarrierControlInteractionInfo.put( - "readFeatureMapAttribute", readBarrierControlFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readBarrierControlFeatureMapAttributeInteractionInfo); Map readBarrierControlClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readBarrierControlClusterRevisionAttributeInteractionInfo = @@ -8183,11 +8159,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBarrierControlClusterRevisionCommandParams); - readBarrierControlInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readBarrierControlClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("barrierControl", readBarrierControlInteractionInfo); - Map readPumpConfigurationAndControlInteractionInfo = - new LinkedHashMap<>(); + + return result; + } + + private static Map readPumpConfigurationAndControlInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readPumpConfigurationAndControlMaxPressureCommandParams = new LinkedHashMap(); InteractionInfo readPumpConfigurationAndControlMaxPressureAttributeInteractionInfo = @@ -8202,7 +8181,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterMaxPressureAttributeCallback(), readPumpConfigurationAndControlMaxPressureCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readMaxPressureAttribute", readPumpConfigurationAndControlMaxPressureAttributeInteractionInfo); Map readPumpConfigurationAndControlMaxSpeedCommandParams = @@ -8219,7 +8198,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterMaxSpeedAttributeCallback(), readPumpConfigurationAndControlMaxSpeedCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readMaxSpeedAttribute", readPumpConfigurationAndControlMaxSpeedAttributeInteractionInfo); Map readPumpConfigurationAndControlMaxFlowCommandParams = new LinkedHashMap(); @@ -8235,7 +8214,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterMaxFlowAttributeCallback(), readPumpConfigurationAndControlMaxFlowCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readMaxFlowAttribute", readPumpConfigurationAndControlMaxFlowAttributeInteractionInfo); Map readPumpConfigurationAndControlMinConstPressureCommandParams = new LinkedHashMap(); @@ -8252,7 +8231,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterMinConstPressureAttributeCallback(), readPumpConfigurationAndControlMinConstPressureCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readMinConstPressureAttribute", readPumpConfigurationAndControlMinConstPressureAttributeInteractionInfo); Map readPumpConfigurationAndControlMaxConstPressureCommandParams = @@ -8270,7 +8249,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterMaxConstPressureAttributeCallback(), readPumpConfigurationAndControlMaxConstPressureCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readMaxConstPressureAttribute", readPumpConfigurationAndControlMaxConstPressureAttributeInteractionInfo); Map readPumpConfigurationAndControlMinCompPressureCommandParams = @@ -8288,7 +8267,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterMinCompPressureAttributeCallback(), readPumpConfigurationAndControlMinCompPressureCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readMinCompPressureAttribute", readPumpConfigurationAndControlMinCompPressureAttributeInteractionInfo); Map readPumpConfigurationAndControlMaxCompPressureCommandParams = @@ -8306,7 +8285,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterMaxCompPressureAttributeCallback(), readPumpConfigurationAndControlMaxCompPressureCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readMaxCompPressureAttribute", readPumpConfigurationAndControlMaxCompPressureAttributeInteractionInfo); Map readPumpConfigurationAndControlMinConstSpeedCommandParams = @@ -8324,7 +8303,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterMinConstSpeedAttributeCallback(), readPumpConfigurationAndControlMinConstSpeedCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readMinConstSpeedAttribute", readPumpConfigurationAndControlMinConstSpeedAttributeInteractionInfo); Map readPumpConfigurationAndControlMaxConstSpeedCommandParams = @@ -8342,7 +8321,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterMaxConstSpeedAttributeCallback(), readPumpConfigurationAndControlMaxConstSpeedCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readMaxConstSpeedAttribute", readPumpConfigurationAndControlMaxConstSpeedAttributeInteractionInfo); Map readPumpConfigurationAndControlMinConstFlowCommandParams = @@ -8360,7 +8339,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterMinConstFlowAttributeCallback(), readPumpConfigurationAndControlMinConstFlowCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readMinConstFlowAttribute", readPumpConfigurationAndControlMinConstFlowAttributeInteractionInfo); Map readPumpConfigurationAndControlMaxConstFlowCommandParams = @@ -8378,7 +8357,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterMaxConstFlowAttributeCallback(), readPumpConfigurationAndControlMaxConstFlowCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readMaxConstFlowAttribute", readPumpConfigurationAndControlMaxConstFlowAttributeInteractionInfo); Map readPumpConfigurationAndControlMinConstTempCommandParams = @@ -8396,7 +8375,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterMinConstTempAttributeCallback(), readPumpConfigurationAndControlMinConstTempCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readMinConstTempAttribute", readPumpConfigurationAndControlMinConstTempAttributeInteractionInfo); Map readPumpConfigurationAndControlMaxConstTempCommandParams = @@ -8414,7 +8393,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterMaxConstTempAttributeCallback(), readPumpConfigurationAndControlMaxConstTempCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readMaxConstTempAttribute", readPumpConfigurationAndControlMaxConstTempAttributeInteractionInfo); Map readPumpConfigurationAndControlPumpStatusCommandParams = @@ -8427,7 +8406,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPumpConfigurationAndControlPumpStatusCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readPumpStatusAttribute", readPumpConfigurationAndControlPumpStatusAttributeInteractionInfo); Map @@ -8442,7 +8421,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPumpConfigurationAndControlEffectiveOperationModeCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readEffectiveOperationModeAttribute", readPumpConfigurationAndControlEffectiveOperationModeAttributeInteractionInfo); Map @@ -8457,7 +8436,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPumpConfigurationAndControlEffectiveControlModeCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readEffectiveControlModeAttribute", readPumpConfigurationAndControlEffectiveControlModeAttributeInteractionInfo); Map readPumpConfigurationAndControlCapacityCommandParams = @@ -8474,7 +8453,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterCapacityAttributeCallback(), readPumpConfigurationAndControlCapacityCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readCapacityAttribute", readPumpConfigurationAndControlCapacityAttributeInteractionInfo); Map readPumpConfigurationAndControlSpeedCommandParams = new LinkedHashMap(); @@ -8490,8 +8469,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterSpeedAttributeCallback(), readPumpConfigurationAndControlSpeedCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( - "readSpeedAttribute", readPumpConfigurationAndControlSpeedAttributeInteractionInfo); + result.put("readSpeedAttribute", readPumpConfigurationAndControlSpeedAttributeInteractionInfo); Map readPumpConfigurationAndControlLifetimeRunningHoursCommandParams = new LinkedHashMap(); @@ -8508,7 +8486,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterLifetimeRunningHoursAttributeCallback(), readPumpConfigurationAndControlLifetimeRunningHoursCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readLifetimeRunningHoursAttribute", readPumpConfigurationAndControlLifetimeRunningHoursAttributeInteractionInfo); Map readPumpConfigurationAndControlPowerCommandParams = @@ -8525,8 +8503,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterPowerAttributeCallback(), readPumpConfigurationAndControlPowerCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( - "readPowerAttribute", readPumpConfigurationAndControlPowerAttributeInteractionInfo); + result.put("readPowerAttribute", readPumpConfigurationAndControlPowerAttributeInteractionInfo); Map readPumpConfigurationAndControlLifetimeEnergyConsumedCommandParams = new LinkedHashMap(); @@ -8543,7 +8520,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterLifetimeEnergyConsumedAttributeCallback(), readPumpConfigurationAndControlLifetimeEnergyConsumedCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readLifetimeEnergyConsumedAttribute", readPumpConfigurationAndControlLifetimeEnergyConsumedAttributeInteractionInfo); Map readPumpConfigurationAndControlOperationModeCommandParams = @@ -8556,7 +8533,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPumpConfigurationAndControlOperationModeCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readOperationModeAttribute", readPumpConfigurationAndControlOperationModeAttributeInteractionInfo); Map readPumpConfigurationAndControlControlModeCommandParams = @@ -8569,7 +8546,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPumpConfigurationAndControlControlModeCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readControlModeAttribute", readPumpConfigurationAndControlControlModeAttributeInteractionInfo); Map @@ -8588,7 +8565,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterGeneratedCommandListAttributeCallback(), readPumpConfigurationAndControlGeneratedCommandListCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readPumpConfigurationAndControlGeneratedCommandListAttributeInteractionInfo); Map @@ -8607,7 +8584,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterAcceptedCommandListAttributeCallback(), readPumpConfigurationAndControlAcceptedCommandListCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readPumpConfigurationAndControlAcceptedCommandListAttributeInteractionInfo); Map readPumpConfigurationAndControlEventListCommandParams = @@ -8624,7 +8601,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterEventListAttributeCallback(), readPumpConfigurationAndControlEventListCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readEventListAttribute", readPumpConfigurationAndControlEventListAttributeInteractionInfo); Map readPumpConfigurationAndControlAttributeListCommandParams = new LinkedHashMap(); @@ -8641,7 +8618,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPumpConfigurationAndControlClusterAttributeListAttributeCallback(), readPumpConfigurationAndControlAttributeListCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readAttributeListAttribute", readPumpConfigurationAndControlAttributeListAttributeInteractionInfo); Map readPumpConfigurationAndControlFeatureMapCommandParams = @@ -8654,7 +8631,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readPumpConfigurationAndControlFeatureMapCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readFeatureMapAttribute", readPumpConfigurationAndControlFeatureMapAttributeInteractionInfo); Map readPumpConfigurationAndControlClusterRevisionCommandParams = @@ -8667,12 +8644,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPumpConfigurationAndControlClusterRevisionCommandParams); - readPumpConfigurationAndControlInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readPumpConfigurationAndControlClusterRevisionAttributeInteractionInfo); - readAttributeMap.put( - "pumpConfigurationAndControl", readPumpConfigurationAndControlInteractionInfo); - Map readThermostatInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readThermostatInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readThermostatLocalTemperatureCommandParams = new LinkedHashMap(); InteractionInfo readThermostatLocalTemperatureAttributeInteractionInfo = @@ -8686,7 +8666,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThermostatClusterLocalTemperatureAttributeCallback(), readThermostatLocalTemperatureCommandParams); - readThermostatInteractionInfo.put( + result.put( "readLocalTemperatureAttribute", readThermostatLocalTemperatureAttributeInteractionInfo); Map readThermostatOutdoorTemperatureCommandParams = new LinkedHashMap(); @@ -8702,7 +8682,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThermostatClusterOutdoorTemperatureAttributeCallback(), readThermostatOutdoorTemperatureCommandParams); - readThermostatInteractionInfo.put( + result.put( "readOutdoorTemperatureAttribute", readThermostatOutdoorTemperatureAttributeInteractionInfo); Map readThermostatOccupancyCommandParams = @@ -8715,8 +8695,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatOccupancyCommandParams); - readThermostatInteractionInfo.put( - "readOccupancyAttribute", readThermostatOccupancyAttributeInteractionInfo); + result.put("readOccupancyAttribute", readThermostatOccupancyAttributeInteractionInfo); Map readThermostatAbsMinHeatSetpointLimitCommandParams = new LinkedHashMap(); InteractionInfo readThermostatAbsMinHeatSetpointLimitAttributeInteractionInfo = @@ -8728,7 +8707,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatAbsMinHeatSetpointLimitCommandParams); - readThermostatInteractionInfo.put( + result.put( "readAbsMinHeatSetpointLimitAttribute", readThermostatAbsMinHeatSetpointLimitAttributeInteractionInfo); Map readThermostatAbsMaxHeatSetpointLimitCommandParams = @@ -8742,7 +8721,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatAbsMaxHeatSetpointLimitCommandParams); - readThermostatInteractionInfo.put( + result.put( "readAbsMaxHeatSetpointLimitAttribute", readThermostatAbsMaxHeatSetpointLimitAttributeInteractionInfo); Map readThermostatAbsMinCoolSetpointLimitCommandParams = @@ -8756,7 +8735,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatAbsMinCoolSetpointLimitCommandParams); - readThermostatInteractionInfo.put( + result.put( "readAbsMinCoolSetpointLimitAttribute", readThermostatAbsMinCoolSetpointLimitAttributeInteractionInfo); Map readThermostatAbsMaxCoolSetpointLimitCommandParams = @@ -8770,7 +8749,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatAbsMaxCoolSetpointLimitCommandParams); - readThermostatInteractionInfo.put( + result.put( "readAbsMaxCoolSetpointLimitAttribute", readThermostatAbsMaxCoolSetpointLimitAttributeInteractionInfo); Map readThermostatPICoolingDemandCommandParams = @@ -8783,7 +8762,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatPICoolingDemandCommandParams); - readThermostatInteractionInfo.put( + result.put( "readPICoolingDemandAttribute", readThermostatPICoolingDemandAttributeInteractionInfo); Map readThermostatPIHeatingDemandCommandParams = new LinkedHashMap(); @@ -8795,7 +8774,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatPIHeatingDemandCommandParams); - readThermostatInteractionInfo.put( + result.put( "readPIHeatingDemandAttribute", readThermostatPIHeatingDemandAttributeInteractionInfo); Map readThermostatHVACSystemTypeConfigurationCommandParams = new LinkedHashMap(); @@ -8808,7 +8787,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatHVACSystemTypeConfigurationCommandParams); - readThermostatInteractionInfo.put( + result.put( "readHVACSystemTypeConfigurationAttribute", readThermostatHVACSystemTypeConfigurationAttributeInteractionInfo); Map readThermostatLocalTemperatureCalibrationCommandParams = @@ -8822,7 +8801,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatLocalTemperatureCalibrationCommandParams); - readThermostatInteractionInfo.put( + result.put( "readLocalTemperatureCalibrationAttribute", readThermostatLocalTemperatureCalibrationAttributeInteractionInfo); Map readThermostatOccupiedCoolingSetpointCommandParams = @@ -8836,7 +8815,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatOccupiedCoolingSetpointCommandParams); - readThermostatInteractionInfo.put( + result.put( "readOccupiedCoolingSetpointAttribute", readThermostatOccupiedCoolingSetpointAttributeInteractionInfo); Map readThermostatOccupiedHeatingSetpointCommandParams = @@ -8850,7 +8829,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatOccupiedHeatingSetpointCommandParams); - readThermostatInteractionInfo.put( + result.put( "readOccupiedHeatingSetpointAttribute", readThermostatOccupiedHeatingSetpointAttributeInteractionInfo); Map readThermostatUnoccupiedCoolingSetpointCommandParams = @@ -8864,7 +8843,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatUnoccupiedCoolingSetpointCommandParams); - readThermostatInteractionInfo.put( + result.put( "readUnoccupiedCoolingSetpointAttribute", readThermostatUnoccupiedCoolingSetpointAttributeInteractionInfo); Map readThermostatUnoccupiedHeatingSetpointCommandParams = @@ -8878,7 +8857,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatUnoccupiedHeatingSetpointCommandParams); - readThermostatInteractionInfo.put( + result.put( "readUnoccupiedHeatingSetpointAttribute", readThermostatUnoccupiedHeatingSetpointAttributeInteractionInfo); Map readThermostatMinHeatSetpointLimitCommandParams = @@ -8892,7 +8871,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatMinHeatSetpointLimitCommandParams); - readThermostatInteractionInfo.put( + result.put( "readMinHeatSetpointLimitAttribute", readThermostatMinHeatSetpointLimitAttributeInteractionInfo); Map readThermostatMaxHeatSetpointLimitCommandParams = @@ -8906,7 +8885,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatMaxHeatSetpointLimitCommandParams); - readThermostatInteractionInfo.put( + result.put( "readMaxHeatSetpointLimitAttribute", readThermostatMaxHeatSetpointLimitAttributeInteractionInfo); Map readThermostatMinCoolSetpointLimitCommandParams = @@ -8920,7 +8899,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatMinCoolSetpointLimitCommandParams); - readThermostatInteractionInfo.put( + result.put( "readMinCoolSetpointLimitAttribute", readThermostatMinCoolSetpointLimitAttributeInteractionInfo); Map readThermostatMaxCoolSetpointLimitCommandParams = @@ -8934,7 +8913,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatMaxCoolSetpointLimitCommandParams); - readThermostatInteractionInfo.put( + result.put( "readMaxCoolSetpointLimitAttribute", readThermostatMaxCoolSetpointLimitAttributeInteractionInfo); Map readThermostatMinSetpointDeadBandCommandParams = @@ -8948,7 +8927,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatMinSetpointDeadBandCommandParams); - readThermostatInteractionInfo.put( + result.put( "readMinSetpointDeadBandAttribute", readThermostatMinSetpointDeadBandAttributeInteractionInfo); Map readThermostatRemoteSensingCommandParams = @@ -8961,8 +8940,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatRemoteSensingCommandParams); - readThermostatInteractionInfo.put( - "readRemoteSensingAttribute", readThermostatRemoteSensingAttributeInteractionInfo); + result.put("readRemoteSensingAttribute", readThermostatRemoteSensingAttributeInteractionInfo); Map readThermostatControlSequenceOfOperationCommandParams = new LinkedHashMap(); InteractionInfo readThermostatControlSequenceOfOperationAttributeInteractionInfo = @@ -8974,7 +8952,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatControlSequenceOfOperationCommandParams); - readThermostatInteractionInfo.put( + result.put( "readControlSequenceOfOperationAttribute", readThermostatControlSequenceOfOperationAttributeInteractionInfo); Map readThermostatSystemModeCommandParams = @@ -8987,8 +8965,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatSystemModeCommandParams); - readThermostatInteractionInfo.put( - "readSystemModeAttribute", readThermostatSystemModeAttributeInteractionInfo); + result.put("readSystemModeAttribute", readThermostatSystemModeAttributeInteractionInfo); Map readThermostatThermostatRunningModeCommandParams = new LinkedHashMap(); InteractionInfo readThermostatThermostatRunningModeAttributeInteractionInfo = @@ -9000,7 +8977,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatThermostatRunningModeCommandParams); - readThermostatInteractionInfo.put( + result.put( "readThermostatRunningModeAttribute", readThermostatThermostatRunningModeAttributeInteractionInfo); Map readThermostatStartOfWeekCommandParams = @@ -9013,8 +8990,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatStartOfWeekCommandParams); - readThermostatInteractionInfo.put( - "readStartOfWeekAttribute", readThermostatStartOfWeekAttributeInteractionInfo); + result.put("readStartOfWeekAttribute", readThermostatStartOfWeekAttributeInteractionInfo); Map readThermostatNumberOfWeeklyTransitionsCommandParams = new LinkedHashMap(); InteractionInfo readThermostatNumberOfWeeklyTransitionsAttributeInteractionInfo = @@ -9026,7 +9002,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatNumberOfWeeklyTransitionsCommandParams); - readThermostatInteractionInfo.put( + result.put( "readNumberOfWeeklyTransitionsAttribute", readThermostatNumberOfWeeklyTransitionsAttributeInteractionInfo); Map readThermostatNumberOfDailyTransitionsCommandParams = @@ -9040,7 +9016,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatNumberOfDailyTransitionsCommandParams); - readThermostatInteractionInfo.put( + result.put( "readNumberOfDailyTransitionsAttribute", readThermostatNumberOfDailyTransitionsAttributeInteractionInfo); Map readThermostatTemperatureSetpointHoldCommandParams = @@ -9054,7 +9030,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatTemperatureSetpointHoldCommandParams); - readThermostatInteractionInfo.put( + result.put( "readTemperatureSetpointHoldAttribute", readThermostatTemperatureSetpointHoldAttributeInteractionInfo); Map readThermostatTemperatureSetpointHoldDurationCommandParams = @@ -9072,7 +9048,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThermostatClusterTemperatureSetpointHoldDurationAttributeCallback(), readThermostatTemperatureSetpointHoldDurationCommandParams); - readThermostatInteractionInfo.put( + result.put( "readTemperatureSetpointHoldDurationAttribute", readThermostatTemperatureSetpointHoldDurationAttributeInteractionInfo); Map @@ -9087,7 +9063,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatThermostatProgrammingOperationModeCommandParams); - readThermostatInteractionInfo.put( + result.put( "readThermostatProgrammingOperationModeAttribute", readThermostatThermostatProgrammingOperationModeAttributeInteractionInfo); Map readThermostatThermostatRunningStateCommandParams = @@ -9101,7 +9077,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatThermostatRunningStateCommandParams); - readThermostatInteractionInfo.put( + result.put( "readThermostatRunningStateAttribute", readThermostatThermostatRunningStateAttributeInteractionInfo); Map readThermostatSetpointChangeSourceCommandParams = @@ -9115,7 +9091,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatSetpointChangeSourceCommandParams); - readThermostatInteractionInfo.put( + result.put( "readSetpointChangeSourceAttribute", readThermostatSetpointChangeSourceAttributeInteractionInfo); Map readThermostatSetpointChangeAmountCommandParams = @@ -9132,7 +9108,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThermostatClusterSetpointChangeAmountAttributeCallback(), readThermostatSetpointChangeAmountCommandParams); - readThermostatInteractionInfo.put( + result.put( "readSetpointChangeAmountAttribute", readThermostatSetpointChangeAmountAttributeInteractionInfo); Map readThermostatSetpointChangeSourceTimestampCommandParams = @@ -9146,7 +9122,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThermostatSetpointChangeSourceTimestampCommandParams); - readThermostatInteractionInfo.put( + result.put( "readSetpointChangeSourceTimestampAttribute", readThermostatSetpointChangeSourceTimestampAttributeInteractionInfo); Map readThermostatOccupiedSetbackCommandParams = @@ -9161,7 +9137,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedThermostatClusterOccupiedSetbackAttributeCallback(), readThermostatOccupiedSetbackCommandParams); - readThermostatInteractionInfo.put( + result.put( "readOccupiedSetbackAttribute", readThermostatOccupiedSetbackAttributeInteractionInfo); Map readThermostatOccupiedSetbackMinCommandParams = new LinkedHashMap(); @@ -9177,7 +9153,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThermostatClusterOccupiedSetbackMinAttributeCallback(), readThermostatOccupiedSetbackMinCommandParams); - readThermostatInteractionInfo.put( + result.put( "readOccupiedSetbackMinAttribute", readThermostatOccupiedSetbackMinAttributeInteractionInfo); Map readThermostatOccupiedSetbackMaxCommandParams = @@ -9194,7 +9170,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThermostatClusterOccupiedSetbackMaxAttributeCallback(), readThermostatOccupiedSetbackMaxCommandParams); - readThermostatInteractionInfo.put( + result.put( "readOccupiedSetbackMaxAttribute", readThermostatOccupiedSetbackMaxAttributeInteractionInfo); Map readThermostatUnoccupiedSetbackCommandParams = @@ -9210,7 +9186,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThermostatClusterUnoccupiedSetbackAttributeCallback(), readThermostatUnoccupiedSetbackCommandParams); - readThermostatInteractionInfo.put( + result.put( "readUnoccupiedSetbackAttribute", readThermostatUnoccupiedSetbackAttributeInteractionInfo); Map readThermostatUnoccupiedSetbackMinCommandParams = new LinkedHashMap(); @@ -9226,7 +9202,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThermostatClusterUnoccupiedSetbackMinAttributeCallback(), readThermostatUnoccupiedSetbackMinCommandParams); - readThermostatInteractionInfo.put( + result.put( "readUnoccupiedSetbackMinAttribute", readThermostatUnoccupiedSetbackMinAttributeInteractionInfo); Map readThermostatUnoccupiedSetbackMaxCommandParams = @@ -9243,7 +9219,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThermostatClusterUnoccupiedSetbackMaxAttributeCallback(), readThermostatUnoccupiedSetbackMaxCommandParams); - readThermostatInteractionInfo.put( + result.put( "readUnoccupiedSetbackMaxAttribute", readThermostatUnoccupiedSetbackMaxAttributeInteractionInfo); Map readThermostatEmergencyHeatDeltaCommandParams = @@ -9257,7 +9233,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatEmergencyHeatDeltaCommandParams); - readThermostatInteractionInfo.put( + result.put( "readEmergencyHeatDeltaAttribute", readThermostatEmergencyHeatDeltaAttributeInteractionInfo); Map readThermostatACTypeCommandParams = @@ -9270,8 +9246,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatACTypeCommandParams); - readThermostatInteractionInfo.put( - "readACTypeAttribute", readThermostatACTypeAttributeInteractionInfo); + result.put("readACTypeAttribute", readThermostatACTypeAttributeInteractionInfo); Map readThermostatACCapacityCommandParams = new LinkedHashMap(); InteractionInfo readThermostatACCapacityAttributeInteractionInfo = @@ -9282,8 +9257,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatACCapacityCommandParams); - readThermostatInteractionInfo.put( - "readACCapacityAttribute", readThermostatACCapacityAttributeInteractionInfo); + result.put("readACCapacityAttribute", readThermostatACCapacityAttributeInteractionInfo); Map readThermostatACRefrigerantTypeCommandParams = new LinkedHashMap(); InteractionInfo readThermostatACRefrigerantTypeAttributeInteractionInfo = @@ -9294,7 +9268,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatACRefrigerantTypeCommandParams); - readThermostatInteractionInfo.put( + result.put( "readACRefrigerantTypeAttribute", readThermostatACRefrigerantTypeAttributeInteractionInfo); Map readThermostatACCompressorTypeCommandParams = new LinkedHashMap(); @@ -9306,7 +9280,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatACCompressorTypeCommandParams); - readThermostatInteractionInfo.put( + result.put( "readACCompressorTypeAttribute", readThermostatACCompressorTypeAttributeInteractionInfo); Map readThermostatACErrorCodeCommandParams = new LinkedHashMap(); @@ -9318,8 +9292,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThermostatACErrorCodeCommandParams); - readThermostatInteractionInfo.put( - "readACErrorCodeAttribute", readThermostatACErrorCodeAttributeInteractionInfo); + result.put("readACErrorCodeAttribute", readThermostatACErrorCodeAttributeInteractionInfo); Map readThermostatACLouverPositionCommandParams = new LinkedHashMap(); InteractionInfo readThermostatACLouverPositionAttributeInteractionInfo = @@ -9330,7 +9303,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatACLouverPositionCommandParams); - readThermostatInteractionInfo.put( + result.put( "readACLouverPositionAttribute", readThermostatACLouverPositionAttributeInteractionInfo); Map readThermostatACCoilTemperatureCommandParams = new LinkedHashMap(); @@ -9345,7 +9318,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThermostatClusterACCoilTemperatureAttributeCallback(), readThermostatACCoilTemperatureCommandParams); - readThermostatInteractionInfo.put( + result.put( "readACCoilTemperatureAttribute", readThermostatACCoilTemperatureAttributeInteractionInfo); Map readThermostatACCapacityformatCommandParams = new LinkedHashMap(); @@ -9357,7 +9330,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatACCapacityformatCommandParams); - readThermostatInteractionInfo.put( + result.put( "readACCapacityformatAttribute", readThermostatACCapacityformatAttributeInteractionInfo); Map readThermostatGeneratedCommandListCommandParams = new LinkedHashMap(); @@ -9373,7 +9346,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThermostatClusterGeneratedCommandListAttributeCallback(), readThermostatGeneratedCommandListCommandParams); - readThermostatInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readThermostatGeneratedCommandListAttributeInteractionInfo); Map readThermostatAcceptedCommandListCommandParams = @@ -9390,7 +9363,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThermostatClusterAcceptedCommandListAttributeCallback(), readThermostatAcceptedCommandListCommandParams); - readThermostatInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readThermostatAcceptedCommandListAttributeInteractionInfo); Map readThermostatEventListCommandParams = @@ -9404,8 +9377,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedThermostatClusterEventListAttributeCallback(), readThermostatEventListCommandParams); - readThermostatInteractionInfo.put( - "readEventListAttribute", readThermostatEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readThermostatEventListAttributeInteractionInfo); Map readThermostatAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readThermostatAttributeListAttributeInteractionInfo = @@ -9417,8 +9389,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedThermostatClusterAttributeListAttributeCallback(), readThermostatAttributeListCommandParams); - readThermostatInteractionInfo.put( - "readAttributeListAttribute", readThermostatAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readThermostatAttributeListAttributeInteractionInfo); Map readThermostatFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readThermostatFeatureMapAttributeInteractionInfo = @@ -9429,8 +9400,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThermostatFeatureMapCommandParams); - readThermostatInteractionInfo.put( - "readFeatureMapAttribute", readThermostatFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readThermostatFeatureMapAttributeInteractionInfo); Map readThermostatClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readThermostatClusterRevisionAttributeInteractionInfo = @@ -9441,10 +9411,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatClusterRevisionCommandParams); - readThermostatInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readThermostatClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("thermostat", readThermostatInteractionInfo); - Map readFanControlInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readFanControlInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readFanControlFanModeCommandParams = new LinkedHashMap(); InteractionInfo readFanControlFanModeAttributeInteractionInfo = @@ -9455,8 +9429,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readFanControlFanModeCommandParams); - readFanControlInteractionInfo.put( - "readFanModeAttribute", readFanControlFanModeAttributeInteractionInfo); + result.put("readFanModeAttribute", readFanControlFanModeAttributeInteractionInfo); Map readFanControlFanModeSequenceCommandParams = new LinkedHashMap(); InteractionInfo readFanControlFanModeSequenceAttributeInteractionInfo = @@ -9467,7 +9440,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readFanControlFanModeSequenceCommandParams); - readFanControlInteractionInfo.put( + result.put( "readFanModeSequenceAttribute", readFanControlFanModeSequenceAttributeInteractionInfo); Map readFanControlPercentSettingCommandParams = new LinkedHashMap(); @@ -9481,8 +9454,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedFanControlClusterPercentSettingAttributeCallback(), readFanControlPercentSettingCommandParams); - readFanControlInteractionInfo.put( - "readPercentSettingAttribute", readFanControlPercentSettingAttributeInteractionInfo); + result.put("readPercentSettingAttribute", readFanControlPercentSettingAttributeInteractionInfo); Map readFanControlPercentCurrentCommandParams = new LinkedHashMap(); InteractionInfo readFanControlPercentCurrentAttributeInteractionInfo = @@ -9493,8 +9465,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readFanControlPercentCurrentCommandParams); - readFanControlInteractionInfo.put( - "readPercentCurrentAttribute", readFanControlPercentCurrentAttributeInteractionInfo); + result.put("readPercentCurrentAttribute", readFanControlPercentCurrentAttributeInteractionInfo); Map readFanControlSpeedMaxCommandParams = new LinkedHashMap(); InteractionInfo readFanControlSpeedMaxAttributeInteractionInfo = @@ -9505,8 +9476,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readFanControlSpeedMaxCommandParams); - readFanControlInteractionInfo.put( - "readSpeedMaxAttribute", readFanControlSpeedMaxAttributeInteractionInfo); + result.put("readSpeedMaxAttribute", readFanControlSpeedMaxAttributeInteractionInfo); Map readFanControlSpeedSettingCommandParams = new LinkedHashMap(); InteractionInfo readFanControlSpeedSettingAttributeInteractionInfo = @@ -9518,8 +9488,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedFanControlClusterSpeedSettingAttributeCallback(), readFanControlSpeedSettingCommandParams); - readFanControlInteractionInfo.put( - "readSpeedSettingAttribute", readFanControlSpeedSettingAttributeInteractionInfo); + result.put("readSpeedSettingAttribute", readFanControlSpeedSettingAttributeInteractionInfo); Map readFanControlSpeedCurrentCommandParams = new LinkedHashMap(); InteractionInfo readFanControlSpeedCurrentAttributeInteractionInfo = @@ -9530,8 +9499,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readFanControlSpeedCurrentCommandParams); - readFanControlInteractionInfo.put( - "readSpeedCurrentAttribute", readFanControlSpeedCurrentAttributeInteractionInfo); + result.put("readSpeedCurrentAttribute", readFanControlSpeedCurrentAttributeInteractionInfo); Map readFanControlRockSupportCommandParams = new LinkedHashMap(); InteractionInfo readFanControlRockSupportAttributeInteractionInfo = @@ -9542,8 +9510,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readFanControlRockSupportCommandParams); - readFanControlInteractionInfo.put( - "readRockSupportAttribute", readFanControlRockSupportAttributeInteractionInfo); + result.put("readRockSupportAttribute", readFanControlRockSupportAttributeInteractionInfo); Map readFanControlRockSettingCommandParams = new LinkedHashMap(); InteractionInfo readFanControlRockSettingAttributeInteractionInfo = @@ -9554,8 +9521,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readFanControlRockSettingCommandParams); - readFanControlInteractionInfo.put( - "readRockSettingAttribute", readFanControlRockSettingAttributeInteractionInfo); + result.put("readRockSettingAttribute", readFanControlRockSettingAttributeInteractionInfo); Map readFanControlWindSupportCommandParams = new LinkedHashMap(); InteractionInfo readFanControlWindSupportAttributeInteractionInfo = @@ -9566,8 +9532,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readFanControlWindSupportCommandParams); - readFanControlInteractionInfo.put( - "readWindSupportAttribute", readFanControlWindSupportAttributeInteractionInfo); + result.put("readWindSupportAttribute", readFanControlWindSupportAttributeInteractionInfo); Map readFanControlWindSettingCommandParams = new LinkedHashMap(); InteractionInfo readFanControlWindSettingAttributeInteractionInfo = @@ -9578,8 +9543,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readFanControlWindSettingCommandParams); - readFanControlInteractionInfo.put( - "readWindSettingAttribute", readFanControlWindSettingAttributeInteractionInfo); + result.put("readWindSettingAttribute", readFanControlWindSettingAttributeInteractionInfo); Map readFanControlGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readFanControlGeneratedCommandListAttributeInteractionInfo = @@ -9594,7 +9558,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedFanControlClusterGeneratedCommandListAttributeCallback(), readFanControlGeneratedCommandListCommandParams); - readFanControlInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readFanControlGeneratedCommandListAttributeInteractionInfo); Map readFanControlAcceptedCommandListCommandParams = @@ -9611,7 +9575,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedFanControlClusterAcceptedCommandListAttributeCallback(), readFanControlAcceptedCommandListCommandParams); - readFanControlInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readFanControlAcceptedCommandListAttributeInteractionInfo); Map readFanControlEventListCommandParams = @@ -9625,8 +9589,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedFanControlClusterEventListAttributeCallback(), readFanControlEventListCommandParams); - readFanControlInteractionInfo.put( - "readEventListAttribute", readFanControlEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readFanControlEventListAttributeInteractionInfo); Map readFanControlAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readFanControlAttributeListAttributeInteractionInfo = @@ -9638,8 +9601,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedFanControlClusterAttributeListAttributeCallback(), readFanControlAttributeListCommandParams); - readFanControlInteractionInfo.put( - "readAttributeListAttribute", readFanControlAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readFanControlAttributeListAttributeInteractionInfo); Map readFanControlFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readFanControlFeatureMapAttributeInteractionInfo = @@ -9650,8 +9612,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readFanControlFeatureMapCommandParams); - readFanControlInteractionInfo.put( - "readFeatureMapAttribute", readFanControlFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readFanControlFeatureMapAttributeInteractionInfo); Map readFanControlClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readFanControlClusterRevisionAttributeInteractionInfo = @@ -9662,11 +9623,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readFanControlClusterRevisionCommandParams); - readFanControlInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readFanControlClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("fanControl", readFanControlInteractionInfo); - Map readThermostatUserInterfaceConfigurationInteractionInfo = - new LinkedHashMap<>(); + + return result; + } + + private static Map + readThermostatUserInterfaceConfigurationInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readThermostatUserInterfaceConfigurationTemperatureDisplayModeCommandParams = new LinkedHashMap(); @@ -9680,7 +9645,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatUserInterfaceConfigurationTemperatureDisplayModeCommandParams); - readThermostatUserInterfaceConfigurationInteractionInfo.put( + result.put( "readTemperatureDisplayModeAttribute", readThermostatUserInterfaceConfigurationTemperatureDisplayModeAttributeInteractionInfo); Map @@ -9694,7 +9659,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatUserInterfaceConfigurationKeypadLockoutCommandParams); - readThermostatUserInterfaceConfigurationInteractionInfo.put( + result.put( "readKeypadLockoutAttribute", readThermostatUserInterfaceConfigurationKeypadLockoutAttributeInteractionInfo); Map @@ -9710,7 +9675,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityCommandParams); - readThermostatUserInterfaceConfigurationInteractionInfo.put( + result.put( "readScheduleProgrammingVisibilityAttribute", readThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityAttributeInteractionInfo); Map @@ -9730,7 +9695,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThermostatUserInterfaceConfigurationClusterGeneratedCommandListAttributeCallback(), readThermostatUserInterfaceConfigurationGeneratedCommandListCommandParams); - readThermostatUserInterfaceConfigurationInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readThermostatUserInterfaceConfigurationGeneratedCommandListAttributeInteractionInfo); Map @@ -9750,7 +9715,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThermostatUserInterfaceConfigurationClusterAcceptedCommandListAttributeCallback(), readThermostatUserInterfaceConfigurationAcceptedCommandListCommandParams); - readThermostatUserInterfaceConfigurationInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readThermostatUserInterfaceConfigurationAcceptedCommandListAttributeInteractionInfo); Map @@ -9769,7 +9734,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThermostatUserInterfaceConfigurationClusterEventListAttributeCallback(), readThermostatUserInterfaceConfigurationEventListCommandParams); - readThermostatUserInterfaceConfigurationInteractionInfo.put( + result.put( "readEventListAttribute", readThermostatUserInterfaceConfigurationEventListAttributeInteractionInfo); Map @@ -9788,7 +9753,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedThermostatUserInterfaceConfigurationClusterAttributeListAttributeCallback(), readThermostatUserInterfaceConfigurationAttributeListCommandParams); - readThermostatUserInterfaceConfigurationInteractionInfo.put( + result.put( "readAttributeListAttribute", readThermostatUserInterfaceConfigurationAttributeListAttributeInteractionInfo); Map @@ -9802,7 +9767,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readThermostatUserInterfaceConfigurationFeatureMapCommandParams); - readThermostatUserInterfaceConfigurationInteractionInfo.put( + result.put( "readFeatureMapAttribute", readThermostatUserInterfaceConfigurationFeatureMapAttributeInteractionInfo); Map @@ -9818,13 +9783,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readThermostatUserInterfaceConfigurationClusterRevisionCommandParams); - readThermostatUserInterfaceConfigurationInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readThermostatUserInterfaceConfigurationClusterRevisionAttributeInteractionInfo); - readAttributeMap.put( - "thermostatUserInterfaceConfiguration", - readThermostatUserInterfaceConfigurationInteractionInfo); - Map readColorControlInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readColorControlInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readColorControlCurrentHueCommandParams = new LinkedHashMap(); InteractionInfo readColorControlCurrentHueAttributeInteractionInfo = @@ -9835,8 +9802,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlCurrentHueCommandParams); - readColorControlInteractionInfo.put( - "readCurrentHueAttribute", readColorControlCurrentHueAttributeInteractionInfo); + result.put("readCurrentHueAttribute", readColorControlCurrentHueAttributeInteractionInfo); Map readColorControlCurrentSaturationCommandParams = new LinkedHashMap(); InteractionInfo readColorControlCurrentSaturationAttributeInteractionInfo = @@ -9847,7 +9813,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlCurrentSaturationCommandParams); - readColorControlInteractionInfo.put( + result.put( "readCurrentSaturationAttribute", readColorControlCurrentSaturationAttributeInteractionInfo); Map readColorControlRemainingTimeCommandParams = @@ -9860,8 +9826,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlRemainingTimeCommandParams); - readColorControlInteractionInfo.put( - "readRemainingTimeAttribute", readColorControlRemainingTimeAttributeInteractionInfo); + result.put("readRemainingTimeAttribute", readColorControlRemainingTimeAttributeInteractionInfo); Map readColorControlCurrentXCommandParams = new LinkedHashMap(); InteractionInfo readColorControlCurrentXAttributeInteractionInfo = @@ -9872,8 +9837,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlCurrentXCommandParams); - readColorControlInteractionInfo.put( - "readCurrentXAttribute", readColorControlCurrentXAttributeInteractionInfo); + result.put("readCurrentXAttribute", readColorControlCurrentXAttributeInteractionInfo); Map readColorControlCurrentYCommandParams = new LinkedHashMap(); InteractionInfo readColorControlCurrentYAttributeInteractionInfo = @@ -9884,8 +9848,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlCurrentYCommandParams); - readColorControlInteractionInfo.put( - "readCurrentYAttribute", readColorControlCurrentYAttributeInteractionInfo); + result.put("readCurrentYAttribute", readColorControlCurrentYAttributeInteractionInfo); Map readColorControlDriftCompensationCommandParams = new LinkedHashMap(); InteractionInfo readColorControlDriftCompensationAttributeInteractionInfo = @@ -9896,7 +9859,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlDriftCompensationCommandParams); - readColorControlInteractionInfo.put( + result.put( "readDriftCompensationAttribute", readColorControlDriftCompensationAttributeInteractionInfo); Map readColorControlCompensationTextCommandParams = @@ -9910,7 +9873,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readColorControlCompensationTextCommandParams); - readColorControlInteractionInfo.put( + result.put( "readCompensationTextAttribute", readColorControlCompensationTextAttributeInteractionInfo); Map readColorControlColorTemperatureMiredsCommandParams = new LinkedHashMap(); @@ -9923,7 +9886,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlColorTemperatureMiredsCommandParams); - readColorControlInteractionInfo.put( + result.put( "readColorTemperatureMiredsAttribute", readColorControlColorTemperatureMiredsAttributeInteractionInfo); Map readColorControlColorModeCommandParams = @@ -9936,8 +9899,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlColorModeCommandParams); - readColorControlInteractionInfo.put( - "readColorModeAttribute", readColorControlColorModeAttributeInteractionInfo); + result.put("readColorModeAttribute", readColorControlColorModeAttributeInteractionInfo); Map readColorControlOptionsCommandParams = new LinkedHashMap(); InteractionInfo readColorControlOptionsAttributeInteractionInfo = @@ -9948,8 +9910,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlOptionsCommandParams); - readColorControlInteractionInfo.put( - "readOptionsAttribute", readColorControlOptionsAttributeInteractionInfo); + result.put("readOptionsAttribute", readColorControlOptionsAttributeInteractionInfo); Map readColorControlNumberOfPrimariesCommandParams = new LinkedHashMap(); InteractionInfo readColorControlNumberOfPrimariesAttributeInteractionInfo = @@ -9964,7 +9925,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedColorControlClusterNumberOfPrimariesAttributeCallback(), readColorControlNumberOfPrimariesCommandParams); - readColorControlInteractionInfo.put( + result.put( "readNumberOfPrimariesAttribute", readColorControlNumberOfPrimariesAttributeInteractionInfo); Map readColorControlPrimary1XCommandParams = @@ -9977,8 +9938,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlPrimary1XCommandParams); - readColorControlInteractionInfo.put( - "readPrimary1XAttribute", readColorControlPrimary1XAttributeInteractionInfo); + result.put("readPrimary1XAttribute", readColorControlPrimary1XAttributeInteractionInfo); Map readColorControlPrimary1YCommandParams = new LinkedHashMap(); InteractionInfo readColorControlPrimary1YAttributeInteractionInfo = @@ -9989,8 +9949,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlPrimary1YCommandParams); - readColorControlInteractionInfo.put( - "readPrimary1YAttribute", readColorControlPrimary1YAttributeInteractionInfo); + result.put("readPrimary1YAttribute", readColorControlPrimary1YAttributeInteractionInfo); Map readColorControlPrimary1IntensityCommandParams = new LinkedHashMap(); InteractionInfo readColorControlPrimary1IntensityAttributeInteractionInfo = @@ -10005,7 +9964,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedColorControlClusterPrimary1IntensityAttributeCallback(), readColorControlPrimary1IntensityCommandParams); - readColorControlInteractionInfo.put( + result.put( "readPrimary1IntensityAttribute", readColorControlPrimary1IntensityAttributeInteractionInfo); Map readColorControlPrimary2XCommandParams = @@ -10018,8 +9977,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlPrimary2XCommandParams); - readColorControlInteractionInfo.put( - "readPrimary2XAttribute", readColorControlPrimary2XAttributeInteractionInfo); + result.put("readPrimary2XAttribute", readColorControlPrimary2XAttributeInteractionInfo); Map readColorControlPrimary2YCommandParams = new LinkedHashMap(); InteractionInfo readColorControlPrimary2YAttributeInteractionInfo = @@ -10030,8 +9988,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlPrimary2YCommandParams); - readColorControlInteractionInfo.put( - "readPrimary2YAttribute", readColorControlPrimary2YAttributeInteractionInfo); + result.put("readPrimary2YAttribute", readColorControlPrimary2YAttributeInteractionInfo); Map readColorControlPrimary2IntensityCommandParams = new LinkedHashMap(); InteractionInfo readColorControlPrimary2IntensityAttributeInteractionInfo = @@ -10046,7 +10003,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedColorControlClusterPrimary2IntensityAttributeCallback(), readColorControlPrimary2IntensityCommandParams); - readColorControlInteractionInfo.put( + result.put( "readPrimary2IntensityAttribute", readColorControlPrimary2IntensityAttributeInteractionInfo); Map readColorControlPrimary3XCommandParams = @@ -10059,8 +10016,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlPrimary3XCommandParams); - readColorControlInteractionInfo.put( - "readPrimary3XAttribute", readColorControlPrimary3XAttributeInteractionInfo); + result.put("readPrimary3XAttribute", readColorControlPrimary3XAttributeInteractionInfo); Map readColorControlPrimary3YCommandParams = new LinkedHashMap(); InteractionInfo readColorControlPrimary3YAttributeInteractionInfo = @@ -10071,8 +10027,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlPrimary3YCommandParams); - readColorControlInteractionInfo.put( - "readPrimary3YAttribute", readColorControlPrimary3YAttributeInteractionInfo); + result.put("readPrimary3YAttribute", readColorControlPrimary3YAttributeInteractionInfo); Map readColorControlPrimary3IntensityCommandParams = new LinkedHashMap(); InteractionInfo readColorControlPrimary3IntensityAttributeInteractionInfo = @@ -10087,7 +10042,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedColorControlClusterPrimary3IntensityAttributeCallback(), readColorControlPrimary3IntensityCommandParams); - readColorControlInteractionInfo.put( + result.put( "readPrimary3IntensityAttribute", readColorControlPrimary3IntensityAttributeInteractionInfo); Map readColorControlPrimary4XCommandParams = @@ -10100,8 +10055,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlPrimary4XCommandParams); - readColorControlInteractionInfo.put( - "readPrimary4XAttribute", readColorControlPrimary4XAttributeInteractionInfo); + result.put("readPrimary4XAttribute", readColorControlPrimary4XAttributeInteractionInfo); Map readColorControlPrimary4YCommandParams = new LinkedHashMap(); InteractionInfo readColorControlPrimary4YAttributeInteractionInfo = @@ -10112,8 +10066,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlPrimary4YCommandParams); - readColorControlInteractionInfo.put( - "readPrimary4YAttribute", readColorControlPrimary4YAttributeInteractionInfo); + result.put("readPrimary4YAttribute", readColorControlPrimary4YAttributeInteractionInfo); Map readColorControlPrimary4IntensityCommandParams = new LinkedHashMap(); InteractionInfo readColorControlPrimary4IntensityAttributeInteractionInfo = @@ -10128,7 +10081,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedColorControlClusterPrimary4IntensityAttributeCallback(), readColorControlPrimary4IntensityCommandParams); - readColorControlInteractionInfo.put( + result.put( "readPrimary4IntensityAttribute", readColorControlPrimary4IntensityAttributeInteractionInfo); Map readColorControlPrimary5XCommandParams = @@ -10141,8 +10094,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlPrimary5XCommandParams); - readColorControlInteractionInfo.put( - "readPrimary5XAttribute", readColorControlPrimary5XAttributeInteractionInfo); + result.put("readPrimary5XAttribute", readColorControlPrimary5XAttributeInteractionInfo); Map readColorControlPrimary5YCommandParams = new LinkedHashMap(); InteractionInfo readColorControlPrimary5YAttributeInteractionInfo = @@ -10153,8 +10105,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlPrimary5YCommandParams); - readColorControlInteractionInfo.put( - "readPrimary5YAttribute", readColorControlPrimary5YAttributeInteractionInfo); + result.put("readPrimary5YAttribute", readColorControlPrimary5YAttributeInteractionInfo); Map readColorControlPrimary5IntensityCommandParams = new LinkedHashMap(); InteractionInfo readColorControlPrimary5IntensityAttributeInteractionInfo = @@ -10169,7 +10120,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedColorControlClusterPrimary5IntensityAttributeCallback(), readColorControlPrimary5IntensityCommandParams); - readColorControlInteractionInfo.put( + result.put( "readPrimary5IntensityAttribute", readColorControlPrimary5IntensityAttributeInteractionInfo); Map readColorControlPrimary6XCommandParams = @@ -10182,8 +10133,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlPrimary6XCommandParams); - readColorControlInteractionInfo.put( - "readPrimary6XAttribute", readColorControlPrimary6XAttributeInteractionInfo); + result.put("readPrimary6XAttribute", readColorControlPrimary6XAttributeInteractionInfo); Map readColorControlPrimary6YCommandParams = new LinkedHashMap(); InteractionInfo readColorControlPrimary6YAttributeInteractionInfo = @@ -10194,8 +10144,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlPrimary6YCommandParams); - readColorControlInteractionInfo.put( - "readPrimary6YAttribute", readColorControlPrimary6YAttributeInteractionInfo); + result.put("readPrimary6YAttribute", readColorControlPrimary6YAttributeInteractionInfo); Map readColorControlPrimary6IntensityCommandParams = new LinkedHashMap(); InteractionInfo readColorControlPrimary6IntensityAttributeInteractionInfo = @@ -10210,7 +10159,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedColorControlClusterPrimary6IntensityAttributeCallback(), readColorControlPrimary6IntensityCommandParams); - readColorControlInteractionInfo.put( + result.put( "readPrimary6IntensityAttribute", readColorControlPrimary6IntensityAttributeInteractionInfo); Map readColorControlWhitePointXCommandParams = @@ -10223,8 +10172,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlWhitePointXCommandParams); - readColorControlInteractionInfo.put( - "readWhitePointXAttribute", readColorControlWhitePointXAttributeInteractionInfo); + result.put("readWhitePointXAttribute", readColorControlWhitePointXAttributeInteractionInfo); Map readColorControlWhitePointYCommandParams = new LinkedHashMap(); InteractionInfo readColorControlWhitePointYAttributeInteractionInfo = @@ -10235,8 +10183,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlWhitePointYCommandParams); - readColorControlInteractionInfo.put( - "readWhitePointYAttribute", readColorControlWhitePointYAttributeInteractionInfo); + result.put("readWhitePointYAttribute", readColorControlWhitePointYAttributeInteractionInfo); Map readColorControlColorPointRXCommandParams = new LinkedHashMap(); InteractionInfo readColorControlColorPointRXAttributeInteractionInfo = @@ -10247,8 +10194,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlColorPointRXCommandParams); - readColorControlInteractionInfo.put( - "readColorPointRXAttribute", readColorControlColorPointRXAttributeInteractionInfo); + result.put("readColorPointRXAttribute", readColorControlColorPointRXAttributeInteractionInfo); Map readColorControlColorPointRYCommandParams = new LinkedHashMap(); InteractionInfo readColorControlColorPointRYAttributeInteractionInfo = @@ -10259,8 +10205,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlColorPointRYCommandParams); - readColorControlInteractionInfo.put( - "readColorPointRYAttribute", readColorControlColorPointRYAttributeInteractionInfo); + result.put("readColorPointRYAttribute", readColorControlColorPointRYAttributeInteractionInfo); Map readColorControlColorPointRIntensityCommandParams = new LinkedHashMap(); InteractionInfo readColorControlColorPointRIntensityAttributeInteractionInfo = @@ -10275,7 +10220,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedColorControlClusterColorPointRIntensityAttributeCallback(), readColorControlColorPointRIntensityCommandParams); - readColorControlInteractionInfo.put( + result.put( "readColorPointRIntensityAttribute", readColorControlColorPointRIntensityAttributeInteractionInfo); Map readColorControlColorPointGXCommandParams = @@ -10288,8 +10233,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlColorPointGXCommandParams); - readColorControlInteractionInfo.put( - "readColorPointGXAttribute", readColorControlColorPointGXAttributeInteractionInfo); + result.put("readColorPointGXAttribute", readColorControlColorPointGXAttributeInteractionInfo); Map readColorControlColorPointGYCommandParams = new LinkedHashMap(); InteractionInfo readColorControlColorPointGYAttributeInteractionInfo = @@ -10300,8 +10244,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlColorPointGYCommandParams); - readColorControlInteractionInfo.put( - "readColorPointGYAttribute", readColorControlColorPointGYAttributeInteractionInfo); + result.put("readColorPointGYAttribute", readColorControlColorPointGYAttributeInteractionInfo); Map readColorControlColorPointGIntensityCommandParams = new LinkedHashMap(); InteractionInfo readColorControlColorPointGIntensityAttributeInteractionInfo = @@ -10316,7 +10259,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedColorControlClusterColorPointGIntensityAttributeCallback(), readColorControlColorPointGIntensityCommandParams); - readColorControlInteractionInfo.put( + result.put( "readColorPointGIntensityAttribute", readColorControlColorPointGIntensityAttributeInteractionInfo); Map readColorControlColorPointBXCommandParams = @@ -10329,8 +10272,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlColorPointBXCommandParams); - readColorControlInteractionInfo.put( - "readColorPointBXAttribute", readColorControlColorPointBXAttributeInteractionInfo); + result.put("readColorPointBXAttribute", readColorControlColorPointBXAttributeInteractionInfo); Map readColorControlColorPointBYCommandParams = new LinkedHashMap(); InteractionInfo readColorControlColorPointBYAttributeInteractionInfo = @@ -10341,8 +10283,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlColorPointBYCommandParams); - readColorControlInteractionInfo.put( - "readColorPointBYAttribute", readColorControlColorPointBYAttributeInteractionInfo); + result.put("readColorPointBYAttribute", readColorControlColorPointBYAttributeInteractionInfo); Map readColorControlColorPointBIntensityCommandParams = new LinkedHashMap(); InteractionInfo readColorControlColorPointBIntensityAttributeInteractionInfo = @@ -10357,7 +10298,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedColorControlClusterColorPointBIntensityAttributeCallback(), readColorControlColorPointBIntensityCommandParams); - readColorControlInteractionInfo.put( + result.put( "readColorPointBIntensityAttribute", readColorControlColorPointBIntensityAttributeInteractionInfo); Map readColorControlEnhancedCurrentHueCommandParams = @@ -10371,7 +10312,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlEnhancedCurrentHueCommandParams); - readColorControlInteractionInfo.put( + result.put( "readEnhancedCurrentHueAttribute", readColorControlEnhancedCurrentHueAttributeInteractionInfo); Map readColorControlEnhancedColorModeCommandParams = @@ -10384,7 +10325,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlEnhancedColorModeCommandParams); - readColorControlInteractionInfo.put( + result.put( "readEnhancedColorModeAttribute", readColorControlEnhancedColorModeAttributeInteractionInfo); Map readColorControlColorLoopActiveCommandParams = @@ -10397,7 +10338,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlColorLoopActiveCommandParams); - readColorControlInteractionInfo.put( + result.put( "readColorLoopActiveAttribute", readColorControlColorLoopActiveAttributeInteractionInfo); Map readColorControlColorLoopDirectionCommandParams = new LinkedHashMap(); @@ -10410,7 +10351,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlColorLoopDirectionCommandParams); - readColorControlInteractionInfo.put( + result.put( "readColorLoopDirectionAttribute", readColorControlColorLoopDirectionAttributeInteractionInfo); Map readColorControlColorLoopTimeCommandParams = @@ -10423,8 +10364,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlColorLoopTimeCommandParams); - readColorControlInteractionInfo.put( - "readColorLoopTimeAttribute", readColorControlColorLoopTimeAttributeInteractionInfo); + result.put("readColorLoopTimeAttribute", readColorControlColorLoopTimeAttributeInteractionInfo); Map readColorControlColorLoopStartEnhancedHueCommandParams = new LinkedHashMap(); InteractionInfo readColorControlColorLoopStartEnhancedHueAttributeInteractionInfo = @@ -10436,7 +10376,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlColorLoopStartEnhancedHueCommandParams); - readColorControlInteractionInfo.put( + result.put( "readColorLoopStartEnhancedHueAttribute", readColorControlColorLoopStartEnhancedHueAttributeInteractionInfo); Map readColorControlColorLoopStoredEnhancedHueCommandParams = @@ -10450,7 +10390,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlColorLoopStoredEnhancedHueCommandParams); - readColorControlInteractionInfo.put( + result.put( "readColorLoopStoredEnhancedHueAttribute", readColorControlColorLoopStoredEnhancedHueAttributeInteractionInfo); Map readColorControlColorCapabilitiesCommandParams = @@ -10463,7 +10403,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlColorCapabilitiesCommandParams); - readColorControlInteractionInfo.put( + result.put( "readColorCapabilitiesAttribute", readColorControlColorCapabilitiesAttributeInteractionInfo); Map readColorControlColorTempPhysicalMinMiredsCommandParams = @@ -10477,7 +10417,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlColorTempPhysicalMinMiredsCommandParams); - readColorControlInteractionInfo.put( + result.put( "readColorTempPhysicalMinMiredsAttribute", readColorControlColorTempPhysicalMinMiredsAttributeInteractionInfo); Map readColorControlColorTempPhysicalMaxMiredsCommandParams = @@ -10491,7 +10431,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlColorTempPhysicalMaxMiredsCommandParams); - readColorControlInteractionInfo.put( + result.put( "readColorTempPhysicalMaxMiredsAttribute", readColorControlColorTempPhysicalMaxMiredsAttributeInteractionInfo); Map readColorControlCoupleColorTempToLevelMinMiredsCommandParams = @@ -10505,7 +10445,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlCoupleColorTempToLevelMinMiredsCommandParams); - readColorControlInteractionInfo.put( + result.put( "readCoupleColorTempToLevelMinMiredsAttribute", readColorControlCoupleColorTempToLevelMinMiredsAttributeInteractionInfo); Map readColorControlStartUpColorTemperatureMiredsCommandParams = @@ -10523,7 +10463,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedColorControlClusterStartUpColorTemperatureMiredsAttributeCallback(), readColorControlStartUpColorTemperatureMiredsCommandParams); - readColorControlInteractionInfo.put( + result.put( "readStartUpColorTemperatureMiredsAttribute", readColorControlStartUpColorTemperatureMiredsAttributeInteractionInfo); Map readColorControlGeneratedCommandListCommandParams = @@ -10540,7 +10480,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedColorControlClusterGeneratedCommandListAttributeCallback(), readColorControlGeneratedCommandListCommandParams); - readColorControlInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readColorControlGeneratedCommandListAttributeInteractionInfo); Map readColorControlAcceptedCommandListCommandParams = @@ -10557,7 +10497,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedColorControlClusterAcceptedCommandListAttributeCallback(), readColorControlAcceptedCommandListCommandParams); - readColorControlInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readColorControlAcceptedCommandListAttributeInteractionInfo); Map readColorControlEventListCommandParams = @@ -10571,8 +10511,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedColorControlClusterEventListAttributeCallback(), readColorControlEventListCommandParams); - readColorControlInteractionInfo.put( - "readEventListAttribute", readColorControlEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readColorControlEventListAttributeInteractionInfo); Map readColorControlAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readColorControlAttributeListAttributeInteractionInfo = @@ -10585,8 +10524,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedColorControlClusterAttributeListAttributeCallback(), readColorControlAttributeListCommandParams); - readColorControlInteractionInfo.put( - "readAttributeListAttribute", readColorControlAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readColorControlAttributeListAttributeInteractionInfo); Map readColorControlFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readColorControlFeatureMapAttributeInteractionInfo = @@ -10597,8 +10535,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readColorControlFeatureMapCommandParams); - readColorControlInteractionInfo.put( - "readFeatureMapAttribute", readColorControlFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readColorControlFeatureMapAttributeInteractionInfo); Map readColorControlClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readColorControlClusterRevisionAttributeInteractionInfo = @@ -10609,10 +10546,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readColorControlClusterRevisionCommandParams); - readColorControlInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readColorControlClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("colorControl", readColorControlInteractionInfo); - Map readBallastConfigurationInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readBallastConfigurationInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readBallastConfigurationPhysicalMinLevelCommandParams = new LinkedHashMap(); InteractionInfo readBallastConfigurationPhysicalMinLevelAttributeInteractionInfo = @@ -10623,7 +10564,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBallastConfigurationPhysicalMinLevelCommandParams); - readBallastConfigurationInteractionInfo.put( + result.put( "readPhysicalMinLevelAttribute", readBallastConfigurationPhysicalMinLevelAttributeInteractionInfo); Map readBallastConfigurationPhysicalMaxLevelCommandParams = @@ -10636,7 +10577,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBallastConfigurationPhysicalMaxLevelCommandParams); - readBallastConfigurationInteractionInfo.put( + result.put( "readPhysicalMaxLevelAttribute", readBallastConfigurationPhysicalMaxLevelAttributeInteractionInfo); Map readBallastConfigurationBallastStatusCommandParams = @@ -10649,7 +10590,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBallastConfigurationBallastStatusCommandParams); - readBallastConfigurationInteractionInfo.put( + result.put( "readBallastStatusAttribute", readBallastConfigurationBallastStatusAttributeInteractionInfo); Map readBallastConfigurationMinLevelCommandParams = @@ -10662,8 +10603,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBallastConfigurationMinLevelCommandParams); - readBallastConfigurationInteractionInfo.put( - "readMinLevelAttribute", readBallastConfigurationMinLevelAttributeInteractionInfo); + result.put("readMinLevelAttribute", readBallastConfigurationMinLevelAttributeInteractionInfo); Map readBallastConfigurationMaxLevelCommandParams = new LinkedHashMap(); InteractionInfo readBallastConfigurationMaxLevelAttributeInteractionInfo = @@ -10674,8 +10614,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBallastConfigurationMaxLevelCommandParams); - readBallastConfigurationInteractionInfo.put( - "readMaxLevelAttribute", readBallastConfigurationMaxLevelAttributeInteractionInfo); + result.put("readMaxLevelAttribute", readBallastConfigurationMaxLevelAttributeInteractionInfo); Map readBallastConfigurationIntrinsicBallastFactorCommandParams = new LinkedHashMap(); InteractionInfo readBallastConfigurationIntrinsicBallastFactorAttributeInteractionInfo = @@ -10691,7 +10630,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBallastConfigurationClusterIntrinsicBallastFactorAttributeCallback(), readBallastConfigurationIntrinsicBallastFactorCommandParams); - readBallastConfigurationInteractionInfo.put( + result.put( "readIntrinsicBallastFactorAttribute", readBallastConfigurationIntrinsicBallastFactorAttributeInteractionInfo); Map readBallastConfigurationBallastFactorAdjustmentCommandParams = @@ -10709,7 +10648,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBallastConfigurationClusterBallastFactorAdjustmentAttributeCallback(), readBallastConfigurationBallastFactorAdjustmentCommandParams); - readBallastConfigurationInteractionInfo.put( + result.put( "readBallastFactorAdjustmentAttribute", readBallastConfigurationBallastFactorAdjustmentAttributeInteractionInfo); Map readBallastConfigurationLampQuantityCommandParams = @@ -10722,7 +10661,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBallastConfigurationLampQuantityCommandParams); - readBallastConfigurationInteractionInfo.put( + result.put( "readLampQuantityAttribute", readBallastConfigurationLampQuantityAttributeInteractionInfo); Map readBallastConfigurationLampTypeCommandParams = new LinkedHashMap(); @@ -10734,8 +10673,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBallastConfigurationLampTypeCommandParams); - readBallastConfigurationInteractionInfo.put( - "readLampTypeAttribute", readBallastConfigurationLampTypeAttributeInteractionInfo); + result.put("readLampTypeAttribute", readBallastConfigurationLampTypeAttributeInteractionInfo); Map readBallastConfigurationLampManufacturerCommandParams = new LinkedHashMap(); InteractionInfo readBallastConfigurationLampManufacturerAttributeInteractionInfo = @@ -10747,7 +10685,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readBallastConfigurationLampManufacturerCommandParams); - readBallastConfigurationInteractionInfo.put( + result.put( "readLampManufacturerAttribute", readBallastConfigurationLampManufacturerAttributeInteractionInfo); Map readBallastConfigurationLampRatedHoursCommandParams = @@ -10764,7 +10702,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBallastConfigurationClusterLampRatedHoursAttributeCallback(), readBallastConfigurationLampRatedHoursCommandParams); - readBallastConfigurationInteractionInfo.put( + result.put( "readLampRatedHoursAttribute", readBallastConfigurationLampRatedHoursAttributeInteractionInfo); Map readBallastConfigurationLampBurnHoursCommandParams = @@ -10781,7 +10719,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBallastConfigurationClusterLampBurnHoursAttributeCallback(), readBallastConfigurationLampBurnHoursCommandParams); - readBallastConfigurationInteractionInfo.put( + result.put( "readLampBurnHoursAttribute", readBallastConfigurationLampBurnHoursAttributeInteractionInfo); Map readBallastConfigurationLampAlarmModeCommandParams = @@ -10794,7 +10732,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBallastConfigurationLampAlarmModeCommandParams); - readBallastConfigurationInteractionInfo.put( + result.put( "readLampAlarmModeAttribute", readBallastConfigurationLampAlarmModeAttributeInteractionInfo); Map readBallastConfigurationLampBurnHoursTripPointCommandParams = @@ -10812,7 +10750,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBallastConfigurationClusterLampBurnHoursTripPointAttributeCallback(), readBallastConfigurationLampBurnHoursTripPointCommandParams); - readBallastConfigurationInteractionInfo.put( + result.put( "readLampBurnHoursTripPointAttribute", readBallastConfigurationLampBurnHoursTripPointAttributeInteractionInfo); Map readBallastConfigurationGeneratedCommandListCommandParams = @@ -10830,7 +10768,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBallastConfigurationClusterGeneratedCommandListAttributeCallback(), readBallastConfigurationGeneratedCommandListCommandParams); - readBallastConfigurationInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readBallastConfigurationGeneratedCommandListAttributeInteractionInfo); Map readBallastConfigurationAcceptedCommandListCommandParams = @@ -10848,7 +10786,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBallastConfigurationClusterAcceptedCommandListAttributeCallback(), readBallastConfigurationAcceptedCommandListCommandParams); - readBallastConfigurationInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readBallastConfigurationAcceptedCommandListAttributeInteractionInfo); Map readBallastConfigurationEventListCommandParams = @@ -10865,8 +10803,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBallastConfigurationClusterEventListAttributeCallback(), readBallastConfigurationEventListCommandParams); - readBallastConfigurationInteractionInfo.put( - "readEventListAttribute", readBallastConfigurationEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readBallastConfigurationEventListAttributeInteractionInfo); Map readBallastConfigurationAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readBallastConfigurationAttributeListAttributeInteractionInfo = @@ -10881,7 +10818,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedBallastConfigurationClusterAttributeListAttributeCallback(), readBallastConfigurationAttributeListCommandParams); - readBallastConfigurationInteractionInfo.put( + result.put( "readAttributeListAttribute", readBallastConfigurationAttributeListAttributeInteractionInfo); Map readBallastConfigurationFeatureMapCommandParams = @@ -10894,7 +10831,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readBallastConfigurationFeatureMapCommandParams); - readBallastConfigurationInteractionInfo.put( + result.put( "readFeatureMapAttribute", readBallastConfigurationFeatureMapAttributeInteractionInfo); Map readBallastConfigurationClusterRevisionCommandParams = new LinkedHashMap(); @@ -10906,11 +10843,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readBallastConfigurationClusterRevisionCommandParams); - readBallastConfigurationInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readBallastConfigurationClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("ballastConfiguration", readBallastConfigurationInteractionInfo); - Map readIlluminanceMeasurementInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readIlluminanceMeasurementInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readIlluminanceMeasurementMeasuredValueCommandParams = new LinkedHashMap(); InteractionInfo readIlluminanceMeasurementMeasuredValueAttributeInteractionInfo = @@ -10925,7 +10866,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedIlluminanceMeasurementClusterMeasuredValueAttributeCallback(), readIlluminanceMeasurementMeasuredValueCommandParams); - readIlluminanceMeasurementInteractionInfo.put( + result.put( "readMeasuredValueAttribute", readIlluminanceMeasurementMeasuredValueAttributeInteractionInfo); Map readIlluminanceMeasurementMinMeasuredValueCommandParams = @@ -10942,7 +10883,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedIlluminanceMeasurementClusterMinMeasuredValueAttributeCallback(), readIlluminanceMeasurementMinMeasuredValueCommandParams); - readIlluminanceMeasurementInteractionInfo.put( + result.put( "readMinMeasuredValueAttribute", readIlluminanceMeasurementMinMeasuredValueAttributeInteractionInfo); Map readIlluminanceMeasurementMaxMeasuredValueCommandParams = @@ -10959,7 +10900,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedIlluminanceMeasurementClusterMaxMeasuredValueAttributeCallback(), readIlluminanceMeasurementMaxMeasuredValueCommandParams); - readIlluminanceMeasurementInteractionInfo.put( + result.put( "readMaxMeasuredValueAttribute", readIlluminanceMeasurementMaxMeasuredValueAttributeInteractionInfo); Map readIlluminanceMeasurementToleranceCommandParams = @@ -10972,7 +10913,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readIlluminanceMeasurementToleranceCommandParams); - readIlluminanceMeasurementInteractionInfo.put( + result.put( "readToleranceAttribute", readIlluminanceMeasurementToleranceAttributeInteractionInfo); Map readIlluminanceMeasurementLightSensorTypeCommandParams = new LinkedHashMap(); @@ -10988,7 +10929,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedIlluminanceMeasurementClusterLightSensorTypeAttributeCallback(), readIlluminanceMeasurementLightSensorTypeCommandParams); - readIlluminanceMeasurementInteractionInfo.put( + result.put( "readLightSensorTypeAttribute", readIlluminanceMeasurementLightSensorTypeAttributeInteractionInfo); Map readIlluminanceMeasurementGeneratedCommandListCommandParams = @@ -11006,7 +10947,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedIlluminanceMeasurementClusterGeneratedCommandListAttributeCallback(), readIlluminanceMeasurementGeneratedCommandListCommandParams); - readIlluminanceMeasurementInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readIlluminanceMeasurementGeneratedCommandListAttributeInteractionInfo); Map readIlluminanceMeasurementAcceptedCommandListCommandParams = @@ -11024,7 +10965,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedIlluminanceMeasurementClusterAcceptedCommandListAttributeCallback(), readIlluminanceMeasurementAcceptedCommandListCommandParams); - readIlluminanceMeasurementInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readIlluminanceMeasurementAcceptedCommandListAttributeInteractionInfo); Map readIlluminanceMeasurementEventListCommandParams = @@ -11041,7 +10982,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedIlluminanceMeasurementClusterEventListAttributeCallback(), readIlluminanceMeasurementEventListCommandParams); - readIlluminanceMeasurementInteractionInfo.put( + result.put( "readEventListAttribute", readIlluminanceMeasurementEventListAttributeInteractionInfo); Map readIlluminanceMeasurementAttributeListCommandParams = new LinkedHashMap(); @@ -11057,7 +10998,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedIlluminanceMeasurementClusterAttributeListAttributeCallback(), readIlluminanceMeasurementAttributeListCommandParams); - readIlluminanceMeasurementInteractionInfo.put( + result.put( "readAttributeListAttribute", readIlluminanceMeasurementAttributeListAttributeInteractionInfo); Map readIlluminanceMeasurementFeatureMapCommandParams = @@ -11070,7 +11011,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readIlluminanceMeasurementFeatureMapCommandParams); - readIlluminanceMeasurementInteractionInfo.put( + result.put( "readFeatureMapAttribute", readIlluminanceMeasurementFeatureMapAttributeInteractionInfo); Map readIlluminanceMeasurementClusterRevisionCommandParams = new LinkedHashMap(); @@ -11082,11 +11023,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readIlluminanceMeasurementClusterRevisionCommandParams); - readIlluminanceMeasurementInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readIlluminanceMeasurementClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("illuminanceMeasurement", readIlluminanceMeasurementInteractionInfo); - Map readTemperatureMeasurementInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readTemperatureMeasurementInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readTemperatureMeasurementMeasuredValueCommandParams = new LinkedHashMap(); InteractionInfo readTemperatureMeasurementMeasuredValueAttributeInteractionInfo = @@ -11101,7 +11046,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedTemperatureMeasurementClusterMeasuredValueAttributeCallback(), readTemperatureMeasurementMeasuredValueCommandParams); - readTemperatureMeasurementInteractionInfo.put( + result.put( "readMeasuredValueAttribute", readTemperatureMeasurementMeasuredValueAttributeInteractionInfo); Map readTemperatureMeasurementMinMeasuredValueCommandParams = @@ -11118,7 +11063,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedTemperatureMeasurementClusterMinMeasuredValueAttributeCallback(), readTemperatureMeasurementMinMeasuredValueCommandParams); - readTemperatureMeasurementInteractionInfo.put( + result.put( "readMinMeasuredValueAttribute", readTemperatureMeasurementMinMeasuredValueAttributeInteractionInfo); Map readTemperatureMeasurementMaxMeasuredValueCommandParams = @@ -11135,7 +11080,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedTemperatureMeasurementClusterMaxMeasuredValueAttributeCallback(), readTemperatureMeasurementMaxMeasuredValueCommandParams); - readTemperatureMeasurementInteractionInfo.put( + result.put( "readMaxMeasuredValueAttribute", readTemperatureMeasurementMaxMeasuredValueAttributeInteractionInfo); Map readTemperatureMeasurementToleranceCommandParams = @@ -11148,7 +11093,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readTemperatureMeasurementToleranceCommandParams); - readTemperatureMeasurementInteractionInfo.put( + result.put( "readToleranceAttribute", readTemperatureMeasurementToleranceAttributeInteractionInfo); Map readTemperatureMeasurementGeneratedCommandListCommandParams = new LinkedHashMap(); @@ -11165,7 +11110,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedTemperatureMeasurementClusterGeneratedCommandListAttributeCallback(), readTemperatureMeasurementGeneratedCommandListCommandParams); - readTemperatureMeasurementInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readTemperatureMeasurementGeneratedCommandListAttributeInteractionInfo); Map readTemperatureMeasurementAcceptedCommandListCommandParams = @@ -11183,7 +11128,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedTemperatureMeasurementClusterAcceptedCommandListAttributeCallback(), readTemperatureMeasurementAcceptedCommandListCommandParams); - readTemperatureMeasurementInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readTemperatureMeasurementAcceptedCommandListAttributeInteractionInfo); Map readTemperatureMeasurementEventListCommandParams = @@ -11200,7 +11145,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedTemperatureMeasurementClusterEventListAttributeCallback(), readTemperatureMeasurementEventListCommandParams); - readTemperatureMeasurementInteractionInfo.put( + result.put( "readEventListAttribute", readTemperatureMeasurementEventListAttributeInteractionInfo); Map readTemperatureMeasurementAttributeListCommandParams = new LinkedHashMap(); @@ -11216,7 +11161,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedTemperatureMeasurementClusterAttributeListAttributeCallback(), readTemperatureMeasurementAttributeListCommandParams); - readTemperatureMeasurementInteractionInfo.put( + result.put( "readAttributeListAttribute", readTemperatureMeasurementAttributeListAttributeInteractionInfo); Map readTemperatureMeasurementFeatureMapCommandParams = @@ -11229,7 +11174,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readTemperatureMeasurementFeatureMapCommandParams); - readTemperatureMeasurementInteractionInfo.put( + result.put( "readFeatureMapAttribute", readTemperatureMeasurementFeatureMapAttributeInteractionInfo); Map readTemperatureMeasurementClusterRevisionCommandParams = new LinkedHashMap(); @@ -11241,11 +11186,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readTemperatureMeasurementClusterRevisionCommandParams); - readTemperatureMeasurementInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readTemperatureMeasurementClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("temperatureMeasurement", readTemperatureMeasurementInteractionInfo); - Map readPressureMeasurementInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readPressureMeasurementInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readPressureMeasurementMeasuredValueCommandParams = new LinkedHashMap(); InteractionInfo readPressureMeasurementMeasuredValueAttributeInteractionInfo = @@ -11260,7 +11209,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPressureMeasurementClusterMeasuredValueAttributeCallback(), readPressureMeasurementMeasuredValueCommandParams); - readPressureMeasurementInteractionInfo.put( + result.put( "readMeasuredValueAttribute", readPressureMeasurementMeasuredValueAttributeInteractionInfo); Map readPressureMeasurementMinMeasuredValueCommandParams = new LinkedHashMap(); @@ -11276,7 +11225,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPressureMeasurementClusterMinMeasuredValueAttributeCallback(), readPressureMeasurementMinMeasuredValueCommandParams); - readPressureMeasurementInteractionInfo.put( + result.put( "readMinMeasuredValueAttribute", readPressureMeasurementMinMeasuredValueAttributeInteractionInfo); Map readPressureMeasurementMaxMeasuredValueCommandParams = @@ -11293,7 +11242,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPressureMeasurementClusterMaxMeasuredValueAttributeCallback(), readPressureMeasurementMaxMeasuredValueCommandParams); - readPressureMeasurementInteractionInfo.put( + result.put( "readMaxMeasuredValueAttribute", readPressureMeasurementMaxMeasuredValueAttributeInteractionInfo); Map readPressureMeasurementToleranceCommandParams = @@ -11306,8 +11255,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPressureMeasurementToleranceCommandParams); - readPressureMeasurementInteractionInfo.put( - "readToleranceAttribute", readPressureMeasurementToleranceAttributeInteractionInfo); + result.put("readToleranceAttribute", readPressureMeasurementToleranceAttributeInteractionInfo); Map readPressureMeasurementScaledValueCommandParams = new LinkedHashMap(); InteractionInfo readPressureMeasurementScaledValueAttributeInteractionInfo = @@ -11322,7 +11270,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPressureMeasurementClusterScaledValueAttributeCallback(), readPressureMeasurementScaledValueCommandParams); - readPressureMeasurementInteractionInfo.put( + result.put( "readScaledValueAttribute", readPressureMeasurementScaledValueAttributeInteractionInfo); Map readPressureMeasurementMinScaledValueCommandParams = new LinkedHashMap(); @@ -11338,7 +11286,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPressureMeasurementClusterMinScaledValueAttributeCallback(), readPressureMeasurementMinScaledValueCommandParams); - readPressureMeasurementInteractionInfo.put( + result.put( "readMinScaledValueAttribute", readPressureMeasurementMinScaledValueAttributeInteractionInfo); Map readPressureMeasurementMaxScaledValueCommandParams = @@ -11355,7 +11303,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPressureMeasurementClusterMaxScaledValueAttributeCallback(), readPressureMeasurementMaxScaledValueCommandParams); - readPressureMeasurementInteractionInfo.put( + result.put( "readMaxScaledValueAttribute", readPressureMeasurementMaxScaledValueAttributeInteractionInfo); Map readPressureMeasurementScaledToleranceCommandParams = @@ -11368,7 +11316,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPressureMeasurementScaledToleranceCommandParams); - readPressureMeasurementInteractionInfo.put( + result.put( "readScaledToleranceAttribute", readPressureMeasurementScaledToleranceAttributeInteractionInfo); Map readPressureMeasurementScaleCommandParams = @@ -11381,8 +11329,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPressureMeasurementScaleCommandParams); - readPressureMeasurementInteractionInfo.put( - "readScaleAttribute", readPressureMeasurementScaleAttributeInteractionInfo); + result.put("readScaleAttribute", readPressureMeasurementScaleAttributeInteractionInfo); Map readPressureMeasurementGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readPressureMeasurementGeneratedCommandListAttributeInteractionInfo = @@ -11398,7 +11345,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPressureMeasurementClusterGeneratedCommandListAttributeCallback(), readPressureMeasurementGeneratedCommandListCommandParams); - readPressureMeasurementInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readPressureMeasurementGeneratedCommandListAttributeInteractionInfo); Map readPressureMeasurementAcceptedCommandListCommandParams = @@ -11415,7 +11362,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPressureMeasurementClusterAcceptedCommandListAttributeCallback(), readPressureMeasurementAcceptedCommandListCommandParams); - readPressureMeasurementInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readPressureMeasurementAcceptedCommandListAttributeInteractionInfo); Map readPressureMeasurementEventListCommandParams = @@ -11432,8 +11379,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPressureMeasurementClusterEventListAttributeCallback(), readPressureMeasurementEventListCommandParams); - readPressureMeasurementInteractionInfo.put( - "readEventListAttribute", readPressureMeasurementEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readPressureMeasurementEventListAttributeInteractionInfo); Map readPressureMeasurementAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readPressureMeasurementAttributeListAttributeInteractionInfo = @@ -11448,7 +11394,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedPressureMeasurementClusterAttributeListAttributeCallback(), readPressureMeasurementAttributeListCommandParams); - readPressureMeasurementInteractionInfo.put( + result.put( "readAttributeListAttribute", readPressureMeasurementAttributeListAttributeInteractionInfo); Map readPressureMeasurementFeatureMapCommandParams = new LinkedHashMap(); @@ -11460,7 +11406,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readPressureMeasurementFeatureMapCommandParams); - readPressureMeasurementInteractionInfo.put( + result.put( "readFeatureMapAttribute", readPressureMeasurementFeatureMapAttributeInteractionInfo); Map readPressureMeasurementClusterRevisionCommandParams = new LinkedHashMap(); @@ -11472,11 +11418,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readPressureMeasurementClusterRevisionCommandParams); - readPressureMeasurementInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readPressureMeasurementClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("pressureMeasurement", readPressureMeasurementInteractionInfo); - Map readFlowMeasurementInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readFlowMeasurementInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readFlowMeasurementMeasuredValueCommandParams = new LinkedHashMap(); InteractionInfo readFlowMeasurementMeasuredValueAttributeInteractionInfo = @@ -11491,7 +11441,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedFlowMeasurementClusterMeasuredValueAttributeCallback(), readFlowMeasurementMeasuredValueCommandParams); - readFlowMeasurementInteractionInfo.put( + result.put( "readMeasuredValueAttribute", readFlowMeasurementMeasuredValueAttributeInteractionInfo); Map readFlowMeasurementMinMeasuredValueCommandParams = new LinkedHashMap(); @@ -11507,7 +11457,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedFlowMeasurementClusterMinMeasuredValueAttributeCallback(), readFlowMeasurementMinMeasuredValueCommandParams); - readFlowMeasurementInteractionInfo.put( + result.put( "readMinMeasuredValueAttribute", readFlowMeasurementMinMeasuredValueAttributeInteractionInfo); Map readFlowMeasurementMaxMeasuredValueCommandParams = @@ -11524,7 +11474,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedFlowMeasurementClusterMaxMeasuredValueAttributeCallback(), readFlowMeasurementMaxMeasuredValueCommandParams); - readFlowMeasurementInteractionInfo.put( + result.put( "readMaxMeasuredValueAttribute", readFlowMeasurementMaxMeasuredValueAttributeInteractionInfo); Map readFlowMeasurementToleranceCommandParams = @@ -11537,8 +11487,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readFlowMeasurementToleranceCommandParams); - readFlowMeasurementInteractionInfo.put( - "readToleranceAttribute", readFlowMeasurementToleranceAttributeInteractionInfo); + result.put("readToleranceAttribute", readFlowMeasurementToleranceAttributeInteractionInfo); Map readFlowMeasurementGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readFlowMeasurementGeneratedCommandListAttributeInteractionInfo = @@ -11553,7 +11502,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedFlowMeasurementClusterGeneratedCommandListAttributeCallback(), readFlowMeasurementGeneratedCommandListCommandParams); - readFlowMeasurementInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readFlowMeasurementGeneratedCommandListAttributeInteractionInfo); Map readFlowMeasurementAcceptedCommandListCommandParams = @@ -11570,7 +11519,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedFlowMeasurementClusterAcceptedCommandListAttributeCallback(), readFlowMeasurementAcceptedCommandListCommandParams); - readFlowMeasurementInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readFlowMeasurementAcceptedCommandListAttributeInteractionInfo); Map readFlowMeasurementEventListCommandParams = @@ -11585,8 +11534,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedFlowMeasurementClusterEventListAttributeCallback(), readFlowMeasurementEventListCommandParams); - readFlowMeasurementInteractionInfo.put( - "readEventListAttribute", readFlowMeasurementEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readFlowMeasurementEventListAttributeInteractionInfo); Map readFlowMeasurementAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readFlowMeasurementAttributeListAttributeInteractionInfo = @@ -11601,7 +11549,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedFlowMeasurementClusterAttributeListAttributeCallback(), readFlowMeasurementAttributeListCommandParams); - readFlowMeasurementInteractionInfo.put( + result.put( "readAttributeListAttribute", readFlowMeasurementAttributeListAttributeInteractionInfo); Map readFlowMeasurementFeatureMapCommandParams = new LinkedHashMap(); @@ -11613,8 +11561,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readFlowMeasurementFeatureMapCommandParams); - readFlowMeasurementInteractionInfo.put( - "readFeatureMapAttribute", readFlowMeasurementFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readFlowMeasurementFeatureMapAttributeInteractionInfo); Map readFlowMeasurementClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readFlowMeasurementClusterRevisionAttributeInteractionInfo = @@ -11625,11 +11572,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readFlowMeasurementClusterRevisionCommandParams); - readFlowMeasurementInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readFlowMeasurementClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("flowMeasurement", readFlowMeasurementInteractionInfo); - Map readRelativeHumidityMeasurementInteractionInfo = - new LinkedHashMap<>(); + + return result; + } + + private static Map readRelativeHumidityMeasurementInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readRelativeHumidityMeasurementMeasuredValueCommandParams = new LinkedHashMap(); InteractionInfo readRelativeHumidityMeasurementMeasuredValueAttributeInteractionInfo = @@ -11645,7 +11595,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedRelativeHumidityMeasurementClusterMeasuredValueAttributeCallback(), readRelativeHumidityMeasurementMeasuredValueCommandParams); - readRelativeHumidityMeasurementInteractionInfo.put( + result.put( "readMeasuredValueAttribute", readRelativeHumidityMeasurementMeasuredValueAttributeInteractionInfo); Map readRelativeHumidityMeasurementMinMeasuredValueCommandParams = @@ -11663,7 +11613,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedRelativeHumidityMeasurementClusterMinMeasuredValueAttributeCallback(), readRelativeHumidityMeasurementMinMeasuredValueCommandParams); - readRelativeHumidityMeasurementInteractionInfo.put( + result.put( "readMinMeasuredValueAttribute", readRelativeHumidityMeasurementMinMeasuredValueAttributeInteractionInfo); Map readRelativeHumidityMeasurementMaxMeasuredValueCommandParams = @@ -11681,7 +11631,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedRelativeHumidityMeasurementClusterMaxMeasuredValueAttributeCallback(), readRelativeHumidityMeasurementMaxMeasuredValueCommandParams); - readRelativeHumidityMeasurementInteractionInfo.put( + result.put( "readMaxMeasuredValueAttribute", readRelativeHumidityMeasurementMaxMeasuredValueAttributeInteractionInfo); Map readRelativeHumidityMeasurementToleranceCommandParams = @@ -11694,7 +11644,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readRelativeHumidityMeasurementToleranceCommandParams); - readRelativeHumidityMeasurementInteractionInfo.put( + result.put( "readToleranceAttribute", readRelativeHumidityMeasurementToleranceAttributeInteractionInfo); Map readRelativeHumidityMeasurementGeneratedCommandListCommandParams = @@ -11712,7 +11662,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedRelativeHumidityMeasurementClusterGeneratedCommandListAttributeCallback(), readRelativeHumidityMeasurementGeneratedCommandListCommandParams); - readRelativeHumidityMeasurementInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readRelativeHumidityMeasurementGeneratedCommandListAttributeInteractionInfo); Map @@ -11731,7 +11681,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedRelativeHumidityMeasurementClusterAcceptedCommandListAttributeCallback(), readRelativeHumidityMeasurementAcceptedCommandListCommandParams); - readRelativeHumidityMeasurementInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readRelativeHumidityMeasurementAcceptedCommandListAttributeInteractionInfo); Map readRelativeHumidityMeasurementEventListCommandParams = @@ -11748,7 +11698,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedRelativeHumidityMeasurementClusterEventListAttributeCallback(), readRelativeHumidityMeasurementEventListCommandParams); - readRelativeHumidityMeasurementInteractionInfo.put( + result.put( "readEventListAttribute", readRelativeHumidityMeasurementEventListAttributeInteractionInfo); Map readRelativeHumidityMeasurementAttributeListCommandParams = new LinkedHashMap(); @@ -11765,7 +11715,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedRelativeHumidityMeasurementClusterAttributeListAttributeCallback(), readRelativeHumidityMeasurementAttributeListCommandParams); - readRelativeHumidityMeasurementInteractionInfo.put( + result.put( "readAttributeListAttribute", readRelativeHumidityMeasurementAttributeListAttributeInteractionInfo); Map readRelativeHumidityMeasurementFeatureMapCommandParams = @@ -11778,7 +11728,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readRelativeHumidityMeasurementFeatureMapCommandParams); - readRelativeHumidityMeasurementInteractionInfo.put( + result.put( "readFeatureMapAttribute", readRelativeHumidityMeasurementFeatureMapAttributeInteractionInfo); Map readRelativeHumidityMeasurementClusterRevisionCommandParams = @@ -11791,12 +11741,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readRelativeHumidityMeasurementClusterRevisionCommandParams); - readRelativeHumidityMeasurementInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readRelativeHumidityMeasurementClusterRevisionAttributeInteractionInfo); - readAttributeMap.put( - "relativeHumidityMeasurement", readRelativeHumidityMeasurementInteractionInfo); - Map readOccupancySensingInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readOccupancySensingInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readOccupancySensingOccupancyCommandParams = new LinkedHashMap(); InteractionInfo readOccupancySensingOccupancyAttributeInteractionInfo = @@ -11807,8 +11760,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOccupancySensingOccupancyCommandParams); - readOccupancySensingInteractionInfo.put( - "readOccupancyAttribute", readOccupancySensingOccupancyAttributeInteractionInfo); + result.put("readOccupancyAttribute", readOccupancySensingOccupancyAttributeInteractionInfo); Map readOccupancySensingOccupancySensorTypeCommandParams = new LinkedHashMap(); InteractionInfo readOccupancySensingOccupancySensorTypeAttributeInteractionInfo = @@ -11820,7 +11772,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOccupancySensingOccupancySensorTypeCommandParams); - readOccupancySensingInteractionInfo.put( + result.put( "readOccupancySensorTypeAttribute", readOccupancySensingOccupancySensorTypeAttributeInteractionInfo); Map readOccupancySensingOccupancySensorTypeBitmapCommandParams = @@ -11834,7 +11786,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOccupancySensingOccupancySensorTypeBitmapCommandParams); - readOccupancySensingInteractionInfo.put( + result.put( "readOccupancySensorTypeBitmapAttribute", readOccupancySensingOccupancySensorTypeBitmapAttributeInteractionInfo); Map @@ -11849,7 +11801,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOccupancySensingPIROccupiedToUnoccupiedDelayCommandParams); - readOccupancySensingInteractionInfo.put( + result.put( "readPIROccupiedToUnoccupiedDelayAttribute", readOccupancySensingPIROccupiedToUnoccupiedDelayAttributeInteractionInfo); Map @@ -11864,7 +11816,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOccupancySensingPIRUnoccupiedToOccupiedDelayCommandParams); - readOccupancySensingInteractionInfo.put( + result.put( "readPIRUnoccupiedToOccupiedDelayAttribute", readOccupancySensingPIRUnoccupiedToOccupiedDelayAttributeInteractionInfo); Map @@ -11879,7 +11831,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOccupancySensingPIRUnoccupiedToOccupiedThresholdCommandParams); - readOccupancySensingInteractionInfo.put( + result.put( "readPIRUnoccupiedToOccupiedThresholdAttribute", readOccupancySensingPIRUnoccupiedToOccupiedThresholdAttributeInteractionInfo); Map @@ -11895,7 +11847,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOccupancySensingUltrasonicOccupiedToUnoccupiedDelayCommandParams); - readOccupancySensingInteractionInfo.put( + result.put( "readUltrasonicOccupiedToUnoccupiedDelayAttribute", readOccupancySensingUltrasonicOccupiedToUnoccupiedDelayAttributeInteractionInfo); Map @@ -11911,7 +11863,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOccupancySensingUltrasonicUnoccupiedToOccupiedDelayCommandParams); - readOccupancySensingInteractionInfo.put( + result.put( "readUltrasonicUnoccupiedToOccupiedDelayAttribute", readOccupancySensingUltrasonicUnoccupiedToOccupiedDelayAttributeInteractionInfo); Map @@ -11927,7 +11879,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOccupancySensingUltrasonicUnoccupiedToOccupiedThresholdCommandParams); - readOccupancySensingInteractionInfo.put( + result.put( "readUltrasonicUnoccupiedToOccupiedThresholdAttribute", readOccupancySensingUltrasonicUnoccupiedToOccupiedThresholdAttributeInteractionInfo); Map @@ -11943,7 +11895,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOccupancySensingPhysicalContactOccupiedToUnoccupiedDelayCommandParams); - readOccupancySensingInteractionInfo.put( + result.put( "readPhysicalContactOccupiedToUnoccupiedDelayAttribute", readOccupancySensingPhysicalContactOccupiedToUnoccupiedDelayAttributeInteractionInfo); Map @@ -11959,7 +11911,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOccupancySensingPhysicalContactUnoccupiedToOccupiedDelayCommandParams); - readOccupancySensingInteractionInfo.put( + result.put( "readPhysicalContactUnoccupiedToOccupiedDelayAttribute", readOccupancySensingPhysicalContactUnoccupiedToOccupiedDelayAttributeInteractionInfo); Map @@ -11975,7 +11927,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOccupancySensingPhysicalContactUnoccupiedToOccupiedThresholdCommandParams); - readOccupancySensingInteractionInfo.put( + result.put( "readPhysicalContactUnoccupiedToOccupiedThresholdAttribute", readOccupancySensingPhysicalContactUnoccupiedToOccupiedThresholdAttributeInteractionInfo); Map readOccupancySensingGeneratedCommandListCommandParams = @@ -11992,7 +11944,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOccupancySensingClusterGeneratedCommandListAttributeCallback(), readOccupancySensingGeneratedCommandListCommandParams); - readOccupancySensingInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readOccupancySensingGeneratedCommandListAttributeInteractionInfo); Map readOccupancySensingAcceptedCommandListCommandParams = @@ -12009,7 +11961,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOccupancySensingClusterAcceptedCommandListAttributeCallback(), readOccupancySensingAcceptedCommandListCommandParams); - readOccupancySensingInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readOccupancySensingAcceptedCommandListAttributeInteractionInfo); Map readOccupancySensingEventListCommandParams = @@ -12024,8 +11976,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedOccupancySensingClusterEventListAttributeCallback(), readOccupancySensingEventListCommandParams); - readOccupancySensingInteractionInfo.put( - "readEventListAttribute", readOccupancySensingEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readOccupancySensingEventListAttributeInteractionInfo); Map readOccupancySensingAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readOccupancySensingAttributeListAttributeInteractionInfo = @@ -12040,7 +11991,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedOccupancySensingClusterAttributeListAttributeCallback(), readOccupancySensingAttributeListCommandParams); - readOccupancySensingInteractionInfo.put( + result.put( "readAttributeListAttribute", readOccupancySensingAttributeListAttributeInteractionInfo); Map readOccupancySensingFeatureMapCommandParams = new LinkedHashMap(); @@ -12052,8 +12003,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readOccupancySensingFeatureMapCommandParams); - readOccupancySensingInteractionInfo.put( - "readFeatureMapAttribute", readOccupancySensingFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readOccupancySensingFeatureMapAttributeInteractionInfo); Map readOccupancySensingClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readOccupancySensingClusterRevisionAttributeInteractionInfo = @@ -12064,11 +12014,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOccupancySensingClusterRevisionCommandParams); - readOccupancySensingInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readOccupancySensingClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("occupancySensing", readOccupancySensingInteractionInfo); - Map readWakeOnLanInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readWakeOnLanInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readWakeOnLanMACAddressCommandParams = new LinkedHashMap(); InteractionInfo readWakeOnLanMACAddressAttributeInteractionInfo = @@ -12079,8 +12033,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readWakeOnLanMACAddressCommandParams); - readWakeOnLanInteractionInfo.put( - "readMACAddressAttribute", readWakeOnLanMACAddressAttributeInteractionInfo); + result.put("readMACAddressAttribute", readWakeOnLanMACAddressAttributeInteractionInfo); Map readWakeOnLanGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readWakeOnLanGeneratedCommandListAttributeInteractionInfo = @@ -12095,7 +12048,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWakeOnLanClusterGeneratedCommandListAttributeCallback(), readWakeOnLanGeneratedCommandListCommandParams); - readWakeOnLanInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readWakeOnLanGeneratedCommandListAttributeInteractionInfo); Map readWakeOnLanAcceptedCommandListCommandParams = @@ -12112,7 +12065,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedWakeOnLanClusterAcceptedCommandListAttributeCallback(), readWakeOnLanAcceptedCommandListCommandParams); - readWakeOnLanInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readWakeOnLanAcceptedCommandListAttributeInteractionInfo); Map readWakeOnLanEventListCommandParams = @@ -12126,8 +12079,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedWakeOnLanClusterEventListAttributeCallback(), readWakeOnLanEventListCommandParams); - readWakeOnLanInteractionInfo.put( - "readEventListAttribute", readWakeOnLanEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readWakeOnLanEventListAttributeInteractionInfo); Map readWakeOnLanAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readWakeOnLanAttributeListAttributeInteractionInfo = @@ -12139,8 +12091,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedWakeOnLanClusterAttributeListAttributeCallback(), readWakeOnLanAttributeListCommandParams); - readWakeOnLanInteractionInfo.put( - "readAttributeListAttribute", readWakeOnLanAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readWakeOnLanAttributeListAttributeInteractionInfo); Map readWakeOnLanFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readWakeOnLanFeatureMapAttributeInteractionInfo = @@ -12151,8 +12102,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readWakeOnLanFeatureMapCommandParams); - readWakeOnLanInteractionInfo.put( - "readFeatureMapAttribute", readWakeOnLanFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readWakeOnLanFeatureMapAttributeInteractionInfo); Map readWakeOnLanClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readWakeOnLanClusterRevisionAttributeInteractionInfo = @@ -12163,10 +12113,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readWakeOnLanClusterRevisionCommandParams); - readWakeOnLanInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readWakeOnLanClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("wakeOnLan", readWakeOnLanInteractionInfo); - Map readChannelInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readChannelInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readChannelChannelListCommandParams = new LinkedHashMap(); InteractionInfo readChannelChannelListAttributeInteractionInfo = @@ -12178,8 +12132,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedChannelClusterChannelListAttributeCallback(), readChannelChannelListCommandParams); - readChannelInteractionInfo.put( - "readChannelListAttribute", readChannelChannelListAttributeInteractionInfo); + result.put("readChannelListAttribute", readChannelChannelListAttributeInteractionInfo); Map readChannelGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readChannelGeneratedCommandListAttributeInteractionInfo = @@ -12193,7 +12146,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedChannelClusterGeneratedCommandListAttributeCallback(), readChannelGeneratedCommandListCommandParams); - readChannelInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readChannelGeneratedCommandListAttributeInteractionInfo); Map readChannelAcceptedCommandListCommandParams = @@ -12209,7 +12162,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedChannelClusterAcceptedCommandListAttributeCallback(), readChannelAcceptedCommandListCommandParams); - readChannelInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readChannelAcceptedCommandListAttributeInteractionInfo); Map readChannelEventListCommandParams = new LinkedHashMap(); @@ -12222,8 +12175,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedChannelClusterEventListAttributeCallback(), readChannelEventListCommandParams); - readChannelInteractionInfo.put( - "readEventListAttribute", readChannelEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readChannelEventListAttributeInteractionInfo); Map readChannelAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readChannelAttributeListAttributeInteractionInfo = @@ -12235,8 +12187,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedChannelClusterAttributeListAttributeCallback(), readChannelAttributeListCommandParams); - readChannelInteractionInfo.put( - "readAttributeListAttribute", readChannelAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readChannelAttributeListAttributeInteractionInfo); Map readChannelFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readChannelFeatureMapAttributeInteractionInfo = @@ -12247,8 +12198,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readChannelFeatureMapCommandParams); - readChannelInteractionInfo.put( - "readFeatureMapAttribute", readChannelFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readChannelFeatureMapAttributeInteractionInfo); Map readChannelClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readChannelClusterRevisionAttributeInteractionInfo = @@ -12259,10 +12209,13 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readChannelClusterRevisionCommandParams); - readChannelInteractionInfo.put( - "readClusterRevisionAttribute", readChannelClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("channel", readChannelInteractionInfo); - Map readTargetNavigatorInteractionInfo = new LinkedHashMap<>(); + result.put("readClusterRevisionAttribute", readChannelClusterRevisionAttributeInteractionInfo); + + return result; + } + + private static Map readTargetNavigatorInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readTargetNavigatorTargetListCommandParams = new LinkedHashMap(); InteractionInfo readTargetNavigatorTargetListAttributeInteractionInfo = @@ -12275,8 +12228,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedTargetNavigatorClusterTargetListAttributeCallback(), readTargetNavigatorTargetListCommandParams); - readTargetNavigatorInteractionInfo.put( - "readTargetListAttribute", readTargetNavigatorTargetListAttributeInteractionInfo); + result.put("readTargetListAttribute", readTargetNavigatorTargetListAttributeInteractionInfo); Map readTargetNavigatorCurrentTargetCommandParams = new LinkedHashMap(); InteractionInfo readTargetNavigatorCurrentTargetAttributeInteractionInfo = @@ -12287,7 +12239,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readTargetNavigatorCurrentTargetCommandParams); - readTargetNavigatorInteractionInfo.put( + result.put( "readCurrentTargetAttribute", readTargetNavigatorCurrentTargetAttributeInteractionInfo); Map readTargetNavigatorGeneratedCommandListCommandParams = new LinkedHashMap(); @@ -12303,7 +12255,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedTargetNavigatorClusterGeneratedCommandListAttributeCallback(), readTargetNavigatorGeneratedCommandListCommandParams); - readTargetNavigatorInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readTargetNavigatorGeneratedCommandListAttributeInteractionInfo); Map readTargetNavigatorAcceptedCommandListCommandParams = @@ -12320,7 +12272,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedTargetNavigatorClusterAcceptedCommandListAttributeCallback(), readTargetNavigatorAcceptedCommandListCommandParams); - readTargetNavigatorInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readTargetNavigatorAcceptedCommandListAttributeInteractionInfo); Map readTargetNavigatorEventListCommandParams = @@ -12335,8 +12287,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedTargetNavigatorClusterEventListAttributeCallback(), readTargetNavigatorEventListCommandParams); - readTargetNavigatorInteractionInfo.put( - "readEventListAttribute", readTargetNavigatorEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readTargetNavigatorEventListAttributeInteractionInfo); Map readTargetNavigatorAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readTargetNavigatorAttributeListAttributeInteractionInfo = @@ -12351,7 +12302,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedTargetNavigatorClusterAttributeListAttributeCallback(), readTargetNavigatorAttributeListCommandParams); - readTargetNavigatorInteractionInfo.put( + result.put( "readAttributeListAttribute", readTargetNavigatorAttributeListAttributeInteractionInfo); Map readTargetNavigatorFeatureMapCommandParams = new LinkedHashMap(); @@ -12363,8 +12314,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readTargetNavigatorFeatureMapCommandParams); - readTargetNavigatorInteractionInfo.put( - "readFeatureMapAttribute", readTargetNavigatorFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readTargetNavigatorFeatureMapAttributeInteractionInfo); Map readTargetNavigatorClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readTargetNavigatorClusterRevisionAttributeInteractionInfo = @@ -12375,10 +12325,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readTargetNavigatorClusterRevisionCommandParams); - readTargetNavigatorInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readTargetNavigatorClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("targetNavigator", readTargetNavigatorInteractionInfo); - Map readMediaPlaybackInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readMediaPlaybackInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readMediaPlaybackCurrentStateCommandParams = new LinkedHashMap(); InteractionInfo readMediaPlaybackCurrentStateAttributeInteractionInfo = @@ -12389,8 +12343,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readMediaPlaybackCurrentStateCommandParams); - readMediaPlaybackInteractionInfo.put( - "readCurrentStateAttribute", readMediaPlaybackCurrentStateAttributeInteractionInfo); + result.put("readCurrentStateAttribute", readMediaPlaybackCurrentStateAttributeInteractionInfo); Map readMediaPlaybackStartTimeCommandParams = new LinkedHashMap(); InteractionInfo readMediaPlaybackStartTimeAttributeInteractionInfo = @@ -12402,8 +12355,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedMediaPlaybackClusterStartTimeAttributeCallback(), readMediaPlaybackStartTimeCommandParams); - readMediaPlaybackInteractionInfo.put( - "readStartTimeAttribute", readMediaPlaybackStartTimeAttributeInteractionInfo); + result.put("readStartTimeAttribute", readMediaPlaybackStartTimeAttributeInteractionInfo); Map readMediaPlaybackDurationCommandParams = new LinkedHashMap(); InteractionInfo readMediaPlaybackDurationAttributeInteractionInfo = @@ -12415,8 +12367,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedMediaPlaybackClusterDurationAttributeCallback(), readMediaPlaybackDurationCommandParams); - readMediaPlaybackInteractionInfo.put( - "readDurationAttribute", readMediaPlaybackDurationAttributeInteractionInfo); + result.put("readDurationAttribute", readMediaPlaybackDurationAttributeInteractionInfo); Map readMediaPlaybackPlaybackSpeedCommandParams = new LinkedHashMap(); InteractionInfo readMediaPlaybackPlaybackSpeedAttributeInteractionInfo = @@ -12427,7 +12378,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedFloatAttributeCallback(), readMediaPlaybackPlaybackSpeedCommandParams); - readMediaPlaybackInteractionInfo.put( + result.put( "readPlaybackSpeedAttribute", readMediaPlaybackPlaybackSpeedAttributeInteractionInfo); Map readMediaPlaybackSeekRangeEndCommandParams = new LinkedHashMap(); @@ -12441,8 +12392,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedMediaPlaybackClusterSeekRangeEndAttributeCallback(), readMediaPlaybackSeekRangeEndCommandParams); - readMediaPlaybackInteractionInfo.put( - "readSeekRangeEndAttribute", readMediaPlaybackSeekRangeEndAttributeInteractionInfo); + result.put("readSeekRangeEndAttribute", readMediaPlaybackSeekRangeEndAttributeInteractionInfo); Map readMediaPlaybackSeekRangeStartCommandParams = new LinkedHashMap(); InteractionInfo readMediaPlaybackSeekRangeStartAttributeInteractionInfo = @@ -12456,7 +12406,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedMediaPlaybackClusterSeekRangeStartAttributeCallback(), readMediaPlaybackSeekRangeStartCommandParams); - readMediaPlaybackInteractionInfo.put( + result.put( "readSeekRangeStartAttribute", readMediaPlaybackSeekRangeStartAttributeInteractionInfo); Map readMediaPlaybackGeneratedCommandListCommandParams = new LinkedHashMap(); @@ -12472,7 +12422,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedMediaPlaybackClusterGeneratedCommandListAttributeCallback(), readMediaPlaybackGeneratedCommandListCommandParams); - readMediaPlaybackInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readMediaPlaybackGeneratedCommandListAttributeInteractionInfo); Map readMediaPlaybackAcceptedCommandListCommandParams = @@ -12489,7 +12439,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedMediaPlaybackClusterAcceptedCommandListAttributeCallback(), readMediaPlaybackAcceptedCommandListCommandParams); - readMediaPlaybackInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readMediaPlaybackAcceptedCommandListAttributeInteractionInfo); Map readMediaPlaybackEventListCommandParams = @@ -12503,8 +12453,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedMediaPlaybackClusterEventListAttributeCallback(), readMediaPlaybackEventListCommandParams); - readMediaPlaybackInteractionInfo.put( - "readEventListAttribute", readMediaPlaybackEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readMediaPlaybackEventListAttributeInteractionInfo); Map readMediaPlaybackAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readMediaPlaybackAttributeListAttributeInteractionInfo = @@ -12518,7 +12467,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedMediaPlaybackClusterAttributeListAttributeCallback(), readMediaPlaybackAttributeListCommandParams); - readMediaPlaybackInteractionInfo.put( + result.put( "readAttributeListAttribute", readMediaPlaybackAttributeListAttributeInteractionInfo); Map readMediaPlaybackFeatureMapCommandParams = new LinkedHashMap(); @@ -12530,8 +12479,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readMediaPlaybackFeatureMapCommandParams); - readMediaPlaybackInteractionInfo.put( - "readFeatureMapAttribute", readMediaPlaybackFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readMediaPlaybackFeatureMapAttributeInteractionInfo); Map readMediaPlaybackClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readMediaPlaybackClusterRevisionAttributeInteractionInfo = @@ -12542,10 +12490,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readMediaPlaybackClusterRevisionCommandParams); - readMediaPlaybackInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readMediaPlaybackClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("mediaPlayback", readMediaPlaybackInteractionInfo); - Map readMediaInputInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readMediaInputInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readMediaInputInputListCommandParams = new LinkedHashMap(); InteractionInfo readMediaInputInputListAttributeInteractionInfo = @@ -12557,8 +12509,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedMediaInputClusterInputListAttributeCallback(), readMediaInputInputListCommandParams); - readMediaInputInteractionInfo.put( - "readInputListAttribute", readMediaInputInputListAttributeInteractionInfo); + result.put("readInputListAttribute", readMediaInputInputListAttributeInteractionInfo); Map readMediaInputCurrentInputCommandParams = new LinkedHashMap(); InteractionInfo readMediaInputCurrentInputAttributeInteractionInfo = @@ -12569,8 +12520,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readMediaInputCurrentInputCommandParams); - readMediaInputInteractionInfo.put( - "readCurrentInputAttribute", readMediaInputCurrentInputAttributeInteractionInfo); + result.put("readCurrentInputAttribute", readMediaInputCurrentInputAttributeInteractionInfo); Map readMediaInputGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readMediaInputGeneratedCommandListAttributeInteractionInfo = @@ -12585,7 +12535,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedMediaInputClusterGeneratedCommandListAttributeCallback(), readMediaInputGeneratedCommandListCommandParams); - readMediaInputInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readMediaInputGeneratedCommandListAttributeInteractionInfo); Map readMediaInputAcceptedCommandListCommandParams = @@ -12602,7 +12552,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedMediaInputClusterAcceptedCommandListAttributeCallback(), readMediaInputAcceptedCommandListCommandParams); - readMediaInputInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readMediaInputAcceptedCommandListAttributeInteractionInfo); Map readMediaInputEventListCommandParams = @@ -12616,8 +12566,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedMediaInputClusterEventListAttributeCallback(), readMediaInputEventListCommandParams); - readMediaInputInteractionInfo.put( - "readEventListAttribute", readMediaInputEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readMediaInputEventListAttributeInteractionInfo); Map readMediaInputAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readMediaInputAttributeListAttributeInteractionInfo = @@ -12629,8 +12578,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedMediaInputClusterAttributeListAttributeCallback(), readMediaInputAttributeListCommandParams); - readMediaInputInteractionInfo.put( - "readAttributeListAttribute", readMediaInputAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readMediaInputAttributeListAttributeInteractionInfo); Map readMediaInputFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readMediaInputFeatureMapAttributeInteractionInfo = @@ -12641,8 +12589,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readMediaInputFeatureMapCommandParams); - readMediaInputInteractionInfo.put( - "readFeatureMapAttribute", readMediaInputFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readMediaInputFeatureMapAttributeInteractionInfo); Map readMediaInputClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readMediaInputClusterRevisionAttributeInteractionInfo = @@ -12653,10 +12600,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readMediaInputClusterRevisionCommandParams); - readMediaInputInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readMediaInputClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("mediaInput", readMediaInputInteractionInfo); - Map readLowPowerInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readLowPowerInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readLowPowerGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readLowPowerGeneratedCommandListAttributeInteractionInfo = @@ -12671,7 +12622,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedLowPowerClusterGeneratedCommandListAttributeCallback(), readLowPowerGeneratedCommandListCommandParams); - readLowPowerInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readLowPowerGeneratedCommandListAttributeInteractionInfo); Map readLowPowerAcceptedCommandListCommandParams = @@ -12687,7 +12638,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedLowPowerClusterAcceptedCommandListAttributeCallback(), readLowPowerAcceptedCommandListCommandParams); - readLowPowerInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readLowPowerAcceptedCommandListAttributeInteractionInfo); Map readLowPowerEventListCommandParams = @@ -12701,8 +12652,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLowPowerClusterEventListAttributeCallback(), readLowPowerEventListCommandParams); - readLowPowerInteractionInfo.put( - "readEventListAttribute", readLowPowerEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readLowPowerEventListAttributeInteractionInfo); Map readLowPowerAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readLowPowerAttributeListAttributeInteractionInfo = @@ -12714,8 +12664,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLowPowerClusterAttributeListAttributeCallback(), readLowPowerAttributeListCommandParams); - readLowPowerInteractionInfo.put( - "readAttributeListAttribute", readLowPowerAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readLowPowerAttributeListAttributeInteractionInfo); Map readLowPowerFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readLowPowerFeatureMapAttributeInteractionInfo = @@ -12726,8 +12675,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readLowPowerFeatureMapCommandParams); - readLowPowerInteractionInfo.put( - "readFeatureMapAttribute", readLowPowerFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readLowPowerFeatureMapAttributeInteractionInfo); Map readLowPowerClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readLowPowerClusterRevisionAttributeInteractionInfo = @@ -12738,10 +12686,13 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readLowPowerClusterRevisionCommandParams); - readLowPowerInteractionInfo.put( - "readClusterRevisionAttribute", readLowPowerClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("lowPower", readLowPowerInteractionInfo); - Map readKeypadInputInteractionInfo = new LinkedHashMap<>(); + result.put("readClusterRevisionAttribute", readLowPowerClusterRevisionAttributeInteractionInfo); + + return result; + } + + private static Map readKeypadInputInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readKeypadInputGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readKeypadInputGeneratedCommandListAttributeInteractionInfo = @@ -12756,7 +12707,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedKeypadInputClusterGeneratedCommandListAttributeCallback(), readKeypadInputGeneratedCommandListCommandParams); - readKeypadInputInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readKeypadInputGeneratedCommandListAttributeInteractionInfo); Map readKeypadInputAcceptedCommandListCommandParams = @@ -12773,7 +12724,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedKeypadInputClusterAcceptedCommandListAttributeCallback(), readKeypadInputAcceptedCommandListCommandParams); - readKeypadInputInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readKeypadInputAcceptedCommandListAttributeInteractionInfo); Map readKeypadInputEventListCommandParams = @@ -12787,8 +12738,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedKeypadInputClusterEventListAttributeCallback(), readKeypadInputEventListCommandParams); - readKeypadInputInteractionInfo.put( - "readEventListAttribute", readKeypadInputEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readKeypadInputEventListAttributeInteractionInfo); Map readKeypadInputAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readKeypadInputAttributeListAttributeInteractionInfo = @@ -12801,8 +12751,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedKeypadInputClusterAttributeListAttributeCallback(), readKeypadInputAttributeListCommandParams); - readKeypadInputInteractionInfo.put( - "readAttributeListAttribute", readKeypadInputAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readKeypadInputAttributeListAttributeInteractionInfo); Map readKeypadInputFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readKeypadInputFeatureMapAttributeInteractionInfo = @@ -12813,8 +12762,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readKeypadInputFeatureMapCommandParams); - readKeypadInputInteractionInfo.put( - "readFeatureMapAttribute", readKeypadInputFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readKeypadInputFeatureMapAttributeInteractionInfo); Map readKeypadInputClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readKeypadInputClusterRevisionAttributeInteractionInfo = @@ -12825,10 +12773,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readKeypadInputClusterRevisionCommandParams); - readKeypadInputInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readKeypadInputClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("keypadInput", readKeypadInputInteractionInfo); - Map readContentLauncherInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readContentLauncherInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readContentLauncherAcceptHeaderCommandParams = new LinkedHashMap(); InteractionInfo readContentLauncherAcceptHeaderAttributeInteractionInfo = @@ -12842,7 +12794,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedContentLauncherClusterAcceptHeaderAttributeCallback(), readContentLauncherAcceptHeaderCommandParams); - readContentLauncherInteractionInfo.put( + result.put( "readAcceptHeaderAttribute", readContentLauncherAcceptHeaderAttributeInteractionInfo); Map readContentLauncherSupportedStreamingProtocolsCommandParams = new LinkedHashMap(); @@ -12855,7 +12807,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readContentLauncherSupportedStreamingProtocolsCommandParams); - readContentLauncherInteractionInfo.put( + result.put( "readSupportedStreamingProtocolsAttribute", readContentLauncherSupportedStreamingProtocolsAttributeInteractionInfo); Map readContentLauncherGeneratedCommandListCommandParams = @@ -12872,7 +12824,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedContentLauncherClusterGeneratedCommandListAttributeCallback(), readContentLauncherGeneratedCommandListCommandParams); - readContentLauncherInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readContentLauncherGeneratedCommandListAttributeInteractionInfo); Map readContentLauncherAcceptedCommandListCommandParams = @@ -12889,7 +12841,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedContentLauncherClusterAcceptedCommandListAttributeCallback(), readContentLauncherAcceptedCommandListCommandParams); - readContentLauncherInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readContentLauncherAcceptedCommandListAttributeInteractionInfo); Map readContentLauncherEventListCommandParams = @@ -12904,8 +12856,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedContentLauncherClusterEventListAttributeCallback(), readContentLauncherEventListCommandParams); - readContentLauncherInteractionInfo.put( - "readEventListAttribute", readContentLauncherEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readContentLauncherEventListAttributeInteractionInfo); Map readContentLauncherAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readContentLauncherAttributeListAttributeInteractionInfo = @@ -12920,7 +12871,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedContentLauncherClusterAttributeListAttributeCallback(), readContentLauncherAttributeListCommandParams); - readContentLauncherInteractionInfo.put( + result.put( "readAttributeListAttribute", readContentLauncherAttributeListAttributeInteractionInfo); Map readContentLauncherFeatureMapCommandParams = new LinkedHashMap(); @@ -12932,8 +12883,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readContentLauncherFeatureMapCommandParams); - readContentLauncherInteractionInfo.put( - "readFeatureMapAttribute", readContentLauncherFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readContentLauncherFeatureMapAttributeInteractionInfo); Map readContentLauncherClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readContentLauncherClusterRevisionAttributeInteractionInfo = @@ -12944,10 +12894,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readContentLauncherClusterRevisionCommandParams); - readContentLauncherInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readContentLauncherClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("contentLauncher", readContentLauncherInteractionInfo); - Map readAudioOutputInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readAudioOutputInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readAudioOutputOutputListCommandParams = new LinkedHashMap(); InteractionInfo readAudioOutputOutputListAttributeInteractionInfo = @@ -12959,8 +12913,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedAudioOutputClusterOutputListAttributeCallback(), readAudioOutputOutputListCommandParams); - readAudioOutputInteractionInfo.put( - "readOutputListAttribute", readAudioOutputOutputListAttributeInteractionInfo); + result.put("readOutputListAttribute", readAudioOutputOutputListAttributeInteractionInfo); Map readAudioOutputCurrentOutputCommandParams = new LinkedHashMap(); InteractionInfo readAudioOutputCurrentOutputAttributeInteractionInfo = @@ -12971,8 +12924,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readAudioOutputCurrentOutputCommandParams); - readAudioOutputInteractionInfo.put( - "readCurrentOutputAttribute", readAudioOutputCurrentOutputAttributeInteractionInfo); + result.put("readCurrentOutputAttribute", readAudioOutputCurrentOutputAttributeInteractionInfo); Map readAudioOutputGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readAudioOutputGeneratedCommandListAttributeInteractionInfo = @@ -12987,7 +12939,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedAudioOutputClusterGeneratedCommandListAttributeCallback(), readAudioOutputGeneratedCommandListCommandParams); - readAudioOutputInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readAudioOutputGeneratedCommandListAttributeInteractionInfo); Map readAudioOutputAcceptedCommandListCommandParams = @@ -13004,7 +12956,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedAudioOutputClusterAcceptedCommandListAttributeCallback(), readAudioOutputAcceptedCommandListCommandParams); - readAudioOutputInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readAudioOutputAcceptedCommandListAttributeInteractionInfo); Map readAudioOutputEventListCommandParams = @@ -13018,8 +12970,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedAudioOutputClusterEventListAttributeCallback(), readAudioOutputEventListCommandParams); - readAudioOutputInteractionInfo.put( - "readEventListAttribute", readAudioOutputEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readAudioOutputEventListAttributeInteractionInfo); Map readAudioOutputAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readAudioOutputAttributeListAttributeInteractionInfo = @@ -13032,8 +12983,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedAudioOutputClusterAttributeListAttributeCallback(), readAudioOutputAttributeListCommandParams); - readAudioOutputInteractionInfo.put( - "readAttributeListAttribute", readAudioOutputAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readAudioOutputAttributeListAttributeInteractionInfo); Map readAudioOutputFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readAudioOutputFeatureMapAttributeInteractionInfo = @@ -13044,8 +12994,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readAudioOutputFeatureMapCommandParams); - readAudioOutputInteractionInfo.put( - "readFeatureMapAttribute", readAudioOutputFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readAudioOutputFeatureMapAttributeInteractionInfo); Map readAudioOutputClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readAudioOutputClusterRevisionAttributeInteractionInfo = @@ -13056,10 +13005,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readAudioOutputClusterRevisionCommandParams); - readAudioOutputInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readAudioOutputClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("audioOutput", readAudioOutputInteractionInfo); - Map readApplicationLauncherInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readApplicationLauncherInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readApplicationLauncherCatalogListCommandParams = new LinkedHashMap(); InteractionInfo readApplicationLauncherCatalogListAttributeInteractionInfo = @@ -13074,7 +13027,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedApplicationLauncherClusterCatalogListAttributeCallback(), readApplicationLauncherCatalogListCommandParams); - readApplicationLauncherInteractionInfo.put( + result.put( "readCatalogListAttribute", readApplicationLauncherCatalogListAttributeInteractionInfo); Map readApplicationLauncherGeneratedCommandListCommandParams = new LinkedHashMap(); @@ -13091,7 +13044,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedApplicationLauncherClusterGeneratedCommandListAttributeCallback(), readApplicationLauncherGeneratedCommandListCommandParams); - readApplicationLauncherInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readApplicationLauncherGeneratedCommandListAttributeInteractionInfo); Map readApplicationLauncherAcceptedCommandListCommandParams = @@ -13108,7 +13061,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedApplicationLauncherClusterAcceptedCommandListAttributeCallback(), readApplicationLauncherAcceptedCommandListCommandParams); - readApplicationLauncherInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readApplicationLauncherAcceptedCommandListAttributeInteractionInfo); Map readApplicationLauncherEventListCommandParams = @@ -13125,8 +13078,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedApplicationLauncherClusterEventListAttributeCallback(), readApplicationLauncherEventListCommandParams); - readApplicationLauncherInteractionInfo.put( - "readEventListAttribute", readApplicationLauncherEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readApplicationLauncherEventListAttributeInteractionInfo); Map readApplicationLauncherAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readApplicationLauncherAttributeListAttributeInteractionInfo = @@ -13141,7 +13093,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedApplicationLauncherClusterAttributeListAttributeCallback(), readApplicationLauncherAttributeListCommandParams); - readApplicationLauncherInteractionInfo.put( + result.put( "readAttributeListAttribute", readApplicationLauncherAttributeListAttributeInteractionInfo); Map readApplicationLauncherFeatureMapCommandParams = new LinkedHashMap(); @@ -13153,7 +13105,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readApplicationLauncherFeatureMapCommandParams); - readApplicationLauncherInteractionInfo.put( + result.put( "readFeatureMapAttribute", readApplicationLauncherFeatureMapAttributeInteractionInfo); Map readApplicationLauncherClusterRevisionCommandParams = new LinkedHashMap(); @@ -13165,11 +13117,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readApplicationLauncherClusterRevisionCommandParams); - readApplicationLauncherInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readApplicationLauncherClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("applicationLauncher", readApplicationLauncherInteractionInfo); - Map readApplicationBasicInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readApplicationBasicInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readApplicationBasicVendorNameCommandParams = new LinkedHashMap(); InteractionInfo readApplicationBasicVendorNameAttributeInteractionInfo = @@ -13180,8 +13136,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readApplicationBasicVendorNameCommandParams); - readApplicationBasicInteractionInfo.put( - "readVendorNameAttribute", readApplicationBasicVendorNameAttributeInteractionInfo); + result.put("readVendorNameAttribute", readApplicationBasicVendorNameAttributeInteractionInfo); Map readApplicationBasicVendorIDCommandParams = new LinkedHashMap(); InteractionInfo readApplicationBasicVendorIDAttributeInteractionInfo = @@ -13192,8 +13147,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readApplicationBasicVendorIDCommandParams); - readApplicationBasicInteractionInfo.put( - "readVendorIDAttribute", readApplicationBasicVendorIDAttributeInteractionInfo); + result.put("readVendorIDAttribute", readApplicationBasicVendorIDAttributeInteractionInfo); Map readApplicationBasicApplicationNameCommandParams = new LinkedHashMap(); InteractionInfo readApplicationBasicApplicationNameAttributeInteractionInfo = @@ -13205,7 +13159,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readApplicationBasicApplicationNameCommandParams); - readApplicationBasicInteractionInfo.put( + result.put( "readApplicationNameAttribute", readApplicationBasicApplicationNameAttributeInteractionInfo); Map readApplicationBasicProductIDCommandParams = @@ -13218,8 +13172,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readApplicationBasicProductIDCommandParams); - readApplicationBasicInteractionInfo.put( - "readProductIDAttribute", readApplicationBasicProductIDAttributeInteractionInfo); + result.put("readProductIDAttribute", readApplicationBasicProductIDAttributeInteractionInfo); Map readApplicationBasicStatusCommandParams = new LinkedHashMap(); InteractionInfo readApplicationBasicStatusAttributeInteractionInfo = @@ -13230,8 +13183,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readApplicationBasicStatusCommandParams); - readApplicationBasicInteractionInfo.put( - "readStatusAttribute", readApplicationBasicStatusAttributeInteractionInfo); + result.put("readStatusAttribute", readApplicationBasicStatusAttributeInteractionInfo); Map readApplicationBasicApplicationVersionCommandParams = new LinkedHashMap(); InteractionInfo readApplicationBasicApplicationVersionAttributeInteractionInfo = @@ -13243,7 +13195,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readApplicationBasicApplicationVersionCommandParams); - readApplicationBasicInteractionInfo.put( + result.put( "readApplicationVersionAttribute", readApplicationBasicApplicationVersionAttributeInteractionInfo); Map readApplicationBasicAllowedVendorListCommandParams = @@ -13260,7 +13212,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedApplicationBasicClusterAllowedVendorListAttributeCallback(), readApplicationBasicAllowedVendorListCommandParams); - readApplicationBasicInteractionInfo.put( + result.put( "readAllowedVendorListAttribute", readApplicationBasicAllowedVendorListAttributeInteractionInfo); Map readApplicationBasicGeneratedCommandListCommandParams = @@ -13277,7 +13229,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedApplicationBasicClusterGeneratedCommandListAttributeCallback(), readApplicationBasicGeneratedCommandListCommandParams); - readApplicationBasicInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readApplicationBasicGeneratedCommandListAttributeInteractionInfo); Map readApplicationBasicAcceptedCommandListCommandParams = @@ -13294,7 +13246,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedApplicationBasicClusterAcceptedCommandListAttributeCallback(), readApplicationBasicAcceptedCommandListCommandParams); - readApplicationBasicInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readApplicationBasicAcceptedCommandListAttributeInteractionInfo); Map readApplicationBasicEventListCommandParams = @@ -13309,8 +13261,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedApplicationBasicClusterEventListAttributeCallback(), readApplicationBasicEventListCommandParams); - readApplicationBasicInteractionInfo.put( - "readEventListAttribute", readApplicationBasicEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readApplicationBasicEventListAttributeInteractionInfo); Map readApplicationBasicAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readApplicationBasicAttributeListAttributeInteractionInfo = @@ -13325,7 +13276,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedApplicationBasicClusterAttributeListAttributeCallback(), readApplicationBasicAttributeListCommandParams); - readApplicationBasicInteractionInfo.put( + result.put( "readAttributeListAttribute", readApplicationBasicAttributeListAttributeInteractionInfo); Map readApplicationBasicFeatureMapCommandParams = new LinkedHashMap(); @@ -13337,8 +13288,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readApplicationBasicFeatureMapCommandParams); - readApplicationBasicInteractionInfo.put( - "readFeatureMapAttribute", readApplicationBasicFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readApplicationBasicFeatureMapAttributeInteractionInfo); Map readApplicationBasicClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readApplicationBasicClusterRevisionAttributeInteractionInfo = @@ -13349,11 +13299,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readApplicationBasicClusterRevisionCommandParams); - readApplicationBasicInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readApplicationBasicClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("applicationBasic", readApplicationBasicInteractionInfo); - Map readAccountLoginInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readAccountLoginInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readAccountLoginGeneratedCommandListCommandParams = new LinkedHashMap(); InteractionInfo readAccountLoginGeneratedCommandListAttributeInteractionInfo = @@ -13368,7 +13322,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedAccountLoginClusterGeneratedCommandListAttributeCallback(), readAccountLoginGeneratedCommandListCommandParams); - readAccountLoginInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readAccountLoginGeneratedCommandListAttributeInteractionInfo); Map readAccountLoginAcceptedCommandListCommandParams = @@ -13385,7 +13339,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedAccountLoginClusterAcceptedCommandListAttributeCallback(), readAccountLoginAcceptedCommandListCommandParams); - readAccountLoginInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readAccountLoginAcceptedCommandListAttributeInteractionInfo); Map readAccountLoginEventListCommandParams = @@ -13399,8 +13353,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedAccountLoginClusterEventListAttributeCallback(), readAccountLoginEventListCommandParams); - readAccountLoginInteractionInfo.put( - "readEventListAttribute", readAccountLoginEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readAccountLoginEventListAttributeInteractionInfo); Map readAccountLoginAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readAccountLoginAttributeListAttributeInteractionInfo = @@ -13413,8 +13366,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedAccountLoginClusterAttributeListAttributeCallback(), readAccountLoginAttributeListCommandParams); - readAccountLoginInteractionInfo.put( - "readAttributeListAttribute", readAccountLoginAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readAccountLoginAttributeListAttributeInteractionInfo); Map readAccountLoginFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readAccountLoginFeatureMapAttributeInteractionInfo = @@ -13425,8 +13377,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readAccountLoginFeatureMapCommandParams); - readAccountLoginInteractionInfo.put( - "readFeatureMapAttribute", readAccountLoginFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readAccountLoginFeatureMapAttributeInteractionInfo); Map readAccountLoginClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readAccountLoginClusterRevisionAttributeInteractionInfo = @@ -13437,10 +13388,14 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readAccountLoginClusterRevisionCommandParams); - readAccountLoginInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readAccountLoginClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("accountLogin", readAccountLoginInteractionInfo); - Map readElectricalMeasurementInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readElectricalMeasurementInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readElectricalMeasurementMeasurementTypeCommandParams = new LinkedHashMap(); InteractionInfo readElectricalMeasurementMeasurementTypeAttributeInteractionInfo = @@ -13451,7 +13406,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readElectricalMeasurementMeasurementTypeCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readMeasurementTypeAttribute", readElectricalMeasurementMeasurementTypeAttributeInteractionInfo); Map readElectricalMeasurementDcVoltageCommandParams = @@ -13464,7 +13419,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementDcVoltageCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readDcVoltageAttribute", readElectricalMeasurementDcVoltageAttributeInteractionInfo); Map readElectricalMeasurementDcVoltageMinCommandParams = new LinkedHashMap(); @@ -13476,7 +13431,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementDcVoltageMinCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readDcVoltageMinAttribute", readElectricalMeasurementDcVoltageMinAttributeInteractionInfo); Map readElectricalMeasurementDcVoltageMaxCommandParams = new LinkedHashMap(); @@ -13488,7 +13443,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementDcVoltageMaxCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readDcVoltageMaxAttribute", readElectricalMeasurementDcVoltageMaxAttributeInteractionInfo); Map readElectricalMeasurementDcCurrentCommandParams = new LinkedHashMap(); @@ -13500,7 +13455,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementDcCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readDcCurrentAttribute", readElectricalMeasurementDcCurrentAttributeInteractionInfo); Map readElectricalMeasurementDcCurrentMinCommandParams = new LinkedHashMap(); @@ -13512,7 +13467,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementDcCurrentMinCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readDcCurrentMinAttribute", readElectricalMeasurementDcCurrentMinAttributeInteractionInfo); Map readElectricalMeasurementDcCurrentMaxCommandParams = new LinkedHashMap(); @@ -13524,7 +13479,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementDcCurrentMaxCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readDcCurrentMaxAttribute", readElectricalMeasurementDcCurrentMaxAttributeInteractionInfo); Map readElectricalMeasurementDcPowerCommandParams = new LinkedHashMap(); @@ -13536,8 +13491,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementDcPowerCommandParams); - readElectricalMeasurementInteractionInfo.put( - "readDcPowerAttribute", readElectricalMeasurementDcPowerAttributeInteractionInfo); + result.put("readDcPowerAttribute", readElectricalMeasurementDcPowerAttributeInteractionInfo); Map readElectricalMeasurementDcPowerMinCommandParams = new LinkedHashMap(); InteractionInfo readElectricalMeasurementDcPowerMinAttributeInteractionInfo = @@ -13548,7 +13502,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementDcPowerMinCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readDcPowerMinAttribute", readElectricalMeasurementDcPowerMinAttributeInteractionInfo); Map readElectricalMeasurementDcPowerMaxCommandParams = new LinkedHashMap(); @@ -13560,7 +13514,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementDcPowerMaxCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readDcPowerMaxAttribute", readElectricalMeasurementDcPowerMaxAttributeInteractionInfo); Map readElectricalMeasurementDcVoltageMultiplierCommandParams = new LinkedHashMap(); @@ -13573,7 +13527,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementDcVoltageMultiplierCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readDcVoltageMultiplierAttribute", readElectricalMeasurementDcVoltageMultiplierAttributeInteractionInfo); Map readElectricalMeasurementDcVoltageDivisorCommandParams = @@ -13586,7 +13540,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementDcVoltageDivisorCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readDcVoltageDivisorAttribute", readElectricalMeasurementDcVoltageDivisorAttributeInteractionInfo); Map readElectricalMeasurementDcCurrentMultiplierCommandParams = @@ -13600,7 +13554,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementDcCurrentMultiplierCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readDcCurrentMultiplierAttribute", readElectricalMeasurementDcCurrentMultiplierAttributeInteractionInfo); Map readElectricalMeasurementDcCurrentDivisorCommandParams = @@ -13613,7 +13567,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementDcCurrentDivisorCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readDcCurrentDivisorAttribute", readElectricalMeasurementDcCurrentDivisorAttributeInteractionInfo); Map readElectricalMeasurementDcPowerMultiplierCommandParams = @@ -13626,7 +13580,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementDcPowerMultiplierCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readDcPowerMultiplierAttribute", readElectricalMeasurementDcPowerMultiplierAttributeInteractionInfo); Map readElectricalMeasurementDcPowerDivisorCommandParams = @@ -13639,7 +13593,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementDcPowerDivisorCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readDcPowerDivisorAttribute", readElectricalMeasurementDcPowerDivisorAttributeInteractionInfo); Map readElectricalMeasurementAcFrequencyCommandParams = @@ -13652,7 +13606,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAcFrequencyCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAcFrequencyAttribute", readElectricalMeasurementAcFrequencyAttributeInteractionInfo); Map readElectricalMeasurementAcFrequencyMinCommandParams = new LinkedHashMap(); @@ -13664,7 +13618,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAcFrequencyMinCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAcFrequencyMinAttribute", readElectricalMeasurementAcFrequencyMinAttributeInteractionInfo); Map readElectricalMeasurementAcFrequencyMaxCommandParams = @@ -13677,7 +13631,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAcFrequencyMaxCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAcFrequencyMaxAttribute", readElectricalMeasurementAcFrequencyMaxAttributeInteractionInfo); Map readElectricalMeasurementNeutralCurrentCommandParams = @@ -13690,7 +13644,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementNeutralCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readNeutralCurrentAttribute", readElectricalMeasurementNeutralCurrentAttributeInteractionInfo); Map readElectricalMeasurementTotalActivePowerCommandParams = @@ -13703,7 +13657,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readElectricalMeasurementTotalActivePowerCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readTotalActivePowerAttribute", readElectricalMeasurementTotalActivePowerAttributeInteractionInfo); Map readElectricalMeasurementTotalReactivePowerCommandParams = @@ -13716,7 +13670,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readElectricalMeasurementTotalReactivePowerCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readTotalReactivePowerAttribute", readElectricalMeasurementTotalReactivePowerAttributeInteractionInfo); Map readElectricalMeasurementTotalApparentPowerCommandParams = @@ -13729,7 +13683,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readElectricalMeasurementTotalApparentPowerCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readTotalApparentPowerAttribute", readElectricalMeasurementTotalApparentPowerAttributeInteractionInfo); Map @@ -13744,7 +13698,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementMeasured1stHarmonicCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readMeasured1stHarmonicCurrentAttribute", readElectricalMeasurementMeasured1stHarmonicCurrentAttributeInteractionInfo); Map @@ -13759,7 +13713,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementMeasured3rdHarmonicCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readMeasured3rdHarmonicCurrentAttribute", readElectricalMeasurementMeasured3rdHarmonicCurrentAttributeInteractionInfo); Map @@ -13774,7 +13728,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementMeasured5thHarmonicCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readMeasured5thHarmonicCurrentAttribute", readElectricalMeasurementMeasured5thHarmonicCurrentAttributeInteractionInfo); Map @@ -13789,7 +13743,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementMeasured7thHarmonicCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readMeasured7thHarmonicCurrentAttribute", readElectricalMeasurementMeasured7thHarmonicCurrentAttributeInteractionInfo); Map @@ -13804,7 +13758,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementMeasured9thHarmonicCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readMeasured9thHarmonicCurrentAttribute", readElectricalMeasurementMeasured9thHarmonicCurrentAttributeInteractionInfo); Map @@ -13819,7 +13773,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementMeasured11thHarmonicCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readMeasured11thHarmonicCurrentAttribute", readElectricalMeasurementMeasured11thHarmonicCurrentAttributeInteractionInfo); Map @@ -13835,7 +13789,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementMeasuredPhase1stHarmonicCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readMeasuredPhase1stHarmonicCurrentAttribute", readElectricalMeasurementMeasuredPhase1stHarmonicCurrentAttributeInteractionInfo); Map @@ -13851,7 +13805,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementMeasuredPhase3rdHarmonicCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readMeasuredPhase3rdHarmonicCurrentAttribute", readElectricalMeasurementMeasuredPhase3rdHarmonicCurrentAttributeInteractionInfo); Map @@ -13867,7 +13821,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementMeasuredPhase5thHarmonicCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readMeasuredPhase5thHarmonicCurrentAttribute", readElectricalMeasurementMeasuredPhase5thHarmonicCurrentAttributeInteractionInfo); Map @@ -13883,7 +13837,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementMeasuredPhase7thHarmonicCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readMeasuredPhase7thHarmonicCurrentAttribute", readElectricalMeasurementMeasuredPhase7thHarmonicCurrentAttributeInteractionInfo); Map @@ -13899,7 +13853,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementMeasuredPhase9thHarmonicCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readMeasuredPhase9thHarmonicCurrentAttribute", readElectricalMeasurementMeasuredPhase9thHarmonicCurrentAttributeInteractionInfo); Map @@ -13915,7 +13869,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementMeasuredPhase11thHarmonicCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readMeasuredPhase11thHarmonicCurrentAttribute", readElectricalMeasurementMeasuredPhase11thHarmonicCurrentAttributeInteractionInfo); Map readElectricalMeasurementAcFrequencyMultiplierCommandParams = @@ -13929,7 +13883,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAcFrequencyMultiplierCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAcFrequencyMultiplierAttribute", readElectricalMeasurementAcFrequencyMultiplierAttributeInteractionInfo); Map readElectricalMeasurementAcFrequencyDivisorCommandParams = @@ -13943,7 +13897,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAcFrequencyDivisorCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAcFrequencyDivisorAttribute", readElectricalMeasurementAcFrequencyDivisorAttributeInteractionInfo); Map readElectricalMeasurementPowerMultiplierCommandParams = @@ -13956,7 +13910,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readElectricalMeasurementPowerMultiplierCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readPowerMultiplierAttribute", readElectricalMeasurementPowerMultiplierAttributeInteractionInfo); Map readElectricalMeasurementPowerDivisorCommandParams = @@ -13969,7 +13923,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readElectricalMeasurementPowerDivisorCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readPowerDivisorAttribute", readElectricalMeasurementPowerDivisorAttributeInteractionInfo); Map readElectricalMeasurementHarmonicCurrentMultiplierCommandParams = @@ -13983,7 +13937,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementHarmonicCurrentMultiplierCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readHarmonicCurrentMultiplierAttribute", readElectricalMeasurementHarmonicCurrentMultiplierAttributeInteractionInfo); Map @@ -13999,7 +13953,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementPhaseHarmonicCurrentMultiplierCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readPhaseHarmonicCurrentMultiplierAttribute", readElectricalMeasurementPhaseHarmonicCurrentMultiplierAttributeInteractionInfo); Map readElectricalMeasurementInstantaneousVoltageCommandParams = @@ -14013,7 +13967,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementInstantaneousVoltageCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readInstantaneousVoltageAttribute", readElectricalMeasurementInstantaneousVoltageAttributeInteractionInfo); Map @@ -14028,7 +13982,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementInstantaneousLineCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readInstantaneousLineCurrentAttribute", readElectricalMeasurementInstantaneousLineCurrentAttributeInteractionInfo); Map @@ -14043,7 +13997,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementInstantaneousActiveCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readInstantaneousActiveCurrentAttribute", readElectricalMeasurementInstantaneousActiveCurrentAttributeInteractionInfo); Map @@ -14058,7 +14012,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementInstantaneousReactiveCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readInstantaneousReactiveCurrentAttribute", readElectricalMeasurementInstantaneousReactiveCurrentAttributeInteractionInfo); Map readElectricalMeasurementInstantaneousPowerCommandParams = @@ -14072,7 +14026,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementInstantaneousPowerCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readInstantaneousPowerAttribute", readElectricalMeasurementInstantaneousPowerAttributeInteractionInfo); Map readElectricalMeasurementRmsVoltageCommandParams = @@ -14085,7 +14039,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsVoltageCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsVoltageAttribute", readElectricalMeasurementRmsVoltageAttributeInteractionInfo); Map readElectricalMeasurementRmsVoltageMinCommandParams = new LinkedHashMap(); @@ -14097,7 +14051,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsVoltageMinCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsVoltageMinAttribute", readElectricalMeasurementRmsVoltageMinAttributeInteractionInfo); Map readElectricalMeasurementRmsVoltageMaxCommandParams = @@ -14110,7 +14064,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsVoltageMaxCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsVoltageMaxAttribute", readElectricalMeasurementRmsVoltageMaxAttributeInteractionInfo); Map readElectricalMeasurementRmsCurrentCommandParams = @@ -14123,7 +14077,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsCurrentCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsCurrentAttribute", readElectricalMeasurementRmsCurrentAttributeInteractionInfo); Map readElectricalMeasurementRmsCurrentMinCommandParams = new LinkedHashMap(); @@ -14135,7 +14089,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsCurrentMinCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsCurrentMinAttribute", readElectricalMeasurementRmsCurrentMinAttributeInteractionInfo); Map readElectricalMeasurementRmsCurrentMaxCommandParams = @@ -14148,7 +14102,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsCurrentMaxCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsCurrentMaxAttribute", readElectricalMeasurementRmsCurrentMaxAttributeInteractionInfo); Map readElectricalMeasurementActivePowerCommandParams = @@ -14161,7 +14115,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementActivePowerCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readActivePowerAttribute", readElectricalMeasurementActivePowerAttributeInteractionInfo); Map readElectricalMeasurementActivePowerMinCommandParams = new LinkedHashMap(); @@ -14173,7 +14127,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementActivePowerMinCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readActivePowerMinAttribute", readElectricalMeasurementActivePowerMinAttributeInteractionInfo); Map readElectricalMeasurementActivePowerMaxCommandParams = @@ -14186,7 +14140,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementActivePowerMaxCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readActivePowerMaxAttribute", readElectricalMeasurementActivePowerMaxAttributeInteractionInfo); Map readElectricalMeasurementReactivePowerCommandParams = @@ -14199,7 +14153,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementReactivePowerCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readReactivePowerAttribute", readElectricalMeasurementReactivePowerAttributeInteractionInfo); Map readElectricalMeasurementApparentPowerCommandParams = @@ -14212,7 +14166,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementApparentPowerCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readApparentPowerAttribute", readElectricalMeasurementApparentPowerAttributeInteractionInfo); Map readElectricalMeasurementPowerFactorCommandParams = @@ -14225,7 +14179,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementPowerFactorCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readPowerFactorAttribute", readElectricalMeasurementPowerFactorAttributeInteractionInfo); Map readElectricalMeasurementAverageRmsVoltageMeasurementPeriodCommandParams = @@ -14240,7 +14194,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAverageRmsVoltageMeasurementPeriodCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAverageRmsVoltageMeasurementPeriodAttribute", readElectricalMeasurementAverageRmsVoltageMeasurementPeriodAttributeInteractionInfo); Map @@ -14255,7 +14209,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAverageRmsUnderVoltageCounterCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAverageRmsUnderVoltageCounterAttribute", readElectricalMeasurementAverageRmsUnderVoltageCounterAttributeInteractionInfo); Map @@ -14270,7 +14224,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsExtremeOverVoltagePeriodCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsExtremeOverVoltagePeriodAttribute", readElectricalMeasurementRmsExtremeOverVoltagePeriodAttributeInteractionInfo); Map @@ -14285,7 +14239,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsExtremeUnderVoltagePeriodCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsExtremeUnderVoltagePeriodAttribute", readElectricalMeasurementRmsExtremeUnderVoltagePeriodAttributeInteractionInfo); Map readElectricalMeasurementRmsVoltageSagPeriodCommandParams = @@ -14299,7 +14253,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsVoltageSagPeriodCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsVoltageSagPeriodAttribute", readElectricalMeasurementRmsVoltageSagPeriodAttributeInteractionInfo); Map readElectricalMeasurementRmsVoltageSwellPeriodCommandParams = @@ -14313,7 +14267,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsVoltageSwellPeriodCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsVoltageSwellPeriodAttribute", readElectricalMeasurementRmsVoltageSwellPeriodAttributeInteractionInfo); Map readElectricalMeasurementAcVoltageMultiplierCommandParams = @@ -14327,7 +14281,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAcVoltageMultiplierCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAcVoltageMultiplierAttribute", readElectricalMeasurementAcVoltageMultiplierAttributeInteractionInfo); Map readElectricalMeasurementAcVoltageDivisorCommandParams = @@ -14340,7 +14294,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAcVoltageDivisorCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAcVoltageDivisorAttribute", readElectricalMeasurementAcVoltageDivisorAttributeInteractionInfo); Map readElectricalMeasurementAcCurrentMultiplierCommandParams = @@ -14354,7 +14308,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAcCurrentMultiplierCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAcCurrentMultiplierAttribute", readElectricalMeasurementAcCurrentMultiplierAttributeInteractionInfo); Map readElectricalMeasurementAcCurrentDivisorCommandParams = @@ -14367,7 +14321,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAcCurrentDivisorCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAcCurrentDivisorAttribute", readElectricalMeasurementAcCurrentDivisorAttributeInteractionInfo); Map readElectricalMeasurementAcPowerMultiplierCommandParams = @@ -14380,7 +14334,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAcPowerMultiplierCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAcPowerMultiplierAttribute", readElectricalMeasurementAcPowerMultiplierAttributeInteractionInfo); Map readElectricalMeasurementAcPowerDivisorCommandParams = @@ -14393,7 +14347,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAcPowerDivisorCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAcPowerDivisorAttribute", readElectricalMeasurementAcPowerDivisorAttributeInteractionInfo); Map readElectricalMeasurementOverloadAlarmsMaskCommandParams = @@ -14407,7 +14361,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementOverloadAlarmsMaskCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readOverloadAlarmsMaskAttribute", readElectricalMeasurementOverloadAlarmsMaskAttributeInteractionInfo); Map readElectricalMeasurementVoltageOverloadCommandParams = @@ -14420,7 +14374,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementVoltageOverloadCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readVoltageOverloadAttribute", readElectricalMeasurementVoltageOverloadAttributeInteractionInfo); Map readElectricalMeasurementCurrentOverloadCommandParams = @@ -14433,7 +14387,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementCurrentOverloadCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readCurrentOverloadAttribute", readElectricalMeasurementCurrentOverloadAttributeInteractionInfo); Map readElectricalMeasurementAcOverloadAlarmsMaskCommandParams = @@ -14447,7 +14401,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAcOverloadAlarmsMaskCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAcOverloadAlarmsMaskAttribute", readElectricalMeasurementAcOverloadAlarmsMaskAttributeInteractionInfo); Map readElectricalMeasurementAcVoltageOverloadCommandParams = @@ -14460,7 +14414,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAcVoltageOverloadCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAcVoltageOverloadAttribute", readElectricalMeasurementAcVoltageOverloadAttributeInteractionInfo); Map readElectricalMeasurementAcCurrentOverloadCommandParams = @@ -14473,7 +14427,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAcCurrentOverloadCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAcCurrentOverloadAttribute", readElectricalMeasurementAcCurrentOverloadAttributeInteractionInfo); Map readElectricalMeasurementAcActivePowerOverloadCommandParams = @@ -14487,7 +14441,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAcActivePowerOverloadCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAcActivePowerOverloadAttribute", readElectricalMeasurementAcActivePowerOverloadAttributeInteractionInfo); Map @@ -14502,7 +14456,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAcReactivePowerOverloadCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAcReactivePowerOverloadAttribute", readElectricalMeasurementAcReactivePowerOverloadAttributeInteractionInfo); Map readElectricalMeasurementAverageRmsOverVoltageCommandParams = @@ -14516,7 +14470,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAverageRmsOverVoltageCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAverageRmsOverVoltageAttribute", readElectricalMeasurementAverageRmsOverVoltageAttributeInteractionInfo); Map readElectricalMeasurementAverageRmsUnderVoltageCommandParams = @@ -14530,7 +14484,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAverageRmsUnderVoltageCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAverageRmsUnderVoltageAttribute", readElectricalMeasurementAverageRmsUnderVoltageAttributeInteractionInfo); Map readElectricalMeasurementRmsExtremeOverVoltageCommandParams = @@ -14544,7 +14498,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsExtremeOverVoltageCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsExtremeOverVoltageAttribute", readElectricalMeasurementRmsExtremeOverVoltageAttributeInteractionInfo); Map readElectricalMeasurementRmsExtremeUnderVoltageCommandParams = @@ -14558,7 +14512,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsExtremeUnderVoltageCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsExtremeUnderVoltageAttribute", readElectricalMeasurementRmsExtremeUnderVoltageAttributeInteractionInfo); Map readElectricalMeasurementRmsVoltageSagCommandParams = @@ -14571,7 +14525,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsVoltageSagCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsVoltageSagAttribute", readElectricalMeasurementRmsVoltageSagAttributeInteractionInfo); Map readElectricalMeasurementRmsVoltageSwellCommandParams = @@ -14584,7 +14538,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsVoltageSwellCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsVoltageSwellAttribute", readElectricalMeasurementRmsVoltageSwellAttributeInteractionInfo); Map readElectricalMeasurementLineCurrentPhaseBCommandParams = @@ -14597,7 +14551,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementLineCurrentPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readLineCurrentPhaseBAttribute", readElectricalMeasurementLineCurrentPhaseBAttributeInteractionInfo); Map readElectricalMeasurementActiveCurrentPhaseBCommandParams = @@ -14611,7 +14565,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementActiveCurrentPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readActiveCurrentPhaseBAttribute", readElectricalMeasurementActiveCurrentPhaseBAttributeInteractionInfo); Map readElectricalMeasurementReactiveCurrentPhaseBCommandParams = @@ -14625,7 +14579,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementReactiveCurrentPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readReactiveCurrentPhaseBAttribute", readElectricalMeasurementReactiveCurrentPhaseBAttributeInteractionInfo); Map readElectricalMeasurementRmsVoltagePhaseBCommandParams = @@ -14638,7 +14592,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsVoltagePhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsVoltagePhaseBAttribute", readElectricalMeasurementRmsVoltagePhaseBAttributeInteractionInfo); Map readElectricalMeasurementRmsVoltageMinPhaseBCommandParams = @@ -14652,7 +14606,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsVoltageMinPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsVoltageMinPhaseBAttribute", readElectricalMeasurementRmsVoltageMinPhaseBAttributeInteractionInfo); Map readElectricalMeasurementRmsVoltageMaxPhaseBCommandParams = @@ -14666,7 +14620,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsVoltageMaxPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsVoltageMaxPhaseBAttribute", readElectricalMeasurementRmsVoltageMaxPhaseBAttributeInteractionInfo); Map readElectricalMeasurementRmsCurrentPhaseBCommandParams = @@ -14679,7 +14633,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsCurrentPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsCurrentPhaseBAttribute", readElectricalMeasurementRmsCurrentPhaseBAttributeInteractionInfo); Map readElectricalMeasurementRmsCurrentMinPhaseBCommandParams = @@ -14693,7 +14647,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsCurrentMinPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsCurrentMinPhaseBAttribute", readElectricalMeasurementRmsCurrentMinPhaseBAttributeInteractionInfo); Map readElectricalMeasurementRmsCurrentMaxPhaseBCommandParams = @@ -14707,7 +14661,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsCurrentMaxPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsCurrentMaxPhaseBAttribute", readElectricalMeasurementRmsCurrentMaxPhaseBAttributeInteractionInfo); Map readElectricalMeasurementActivePowerPhaseBCommandParams = @@ -14720,7 +14674,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementActivePowerPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readActivePowerPhaseBAttribute", readElectricalMeasurementActivePowerPhaseBAttributeInteractionInfo); Map readElectricalMeasurementActivePowerMinPhaseBCommandParams = @@ -14734,7 +14688,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementActivePowerMinPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readActivePowerMinPhaseBAttribute", readElectricalMeasurementActivePowerMinPhaseBAttributeInteractionInfo); Map readElectricalMeasurementActivePowerMaxPhaseBCommandParams = @@ -14748,7 +14702,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementActivePowerMaxPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readActivePowerMaxPhaseBAttribute", readElectricalMeasurementActivePowerMaxPhaseBAttributeInteractionInfo); Map readElectricalMeasurementReactivePowerPhaseBCommandParams = @@ -14762,7 +14716,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementReactivePowerPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readReactivePowerPhaseBAttribute", readElectricalMeasurementReactivePowerPhaseBAttributeInteractionInfo); Map readElectricalMeasurementApparentPowerPhaseBCommandParams = @@ -14776,7 +14730,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementApparentPowerPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readApparentPowerPhaseBAttribute", readElectricalMeasurementApparentPowerPhaseBAttributeInteractionInfo); Map readElectricalMeasurementPowerFactorPhaseBCommandParams = @@ -14789,7 +14743,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementPowerFactorPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readPowerFactorPhaseBAttribute", readElectricalMeasurementPowerFactorPhaseBAttributeInteractionInfo); Map @@ -14805,7 +14759,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAverageRmsVoltageMeasurementPeriodPhaseBAttribute", readElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseBAttributeInteractionInfo); Map @@ -14821,7 +14775,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAverageRmsOverVoltageCounterPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAverageRmsOverVoltageCounterPhaseBAttribute", readElectricalMeasurementAverageRmsOverVoltageCounterPhaseBAttributeInteractionInfo); Map @@ -14837,7 +14791,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAverageRmsUnderVoltageCounterPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAverageRmsUnderVoltageCounterPhaseBAttribute", readElectricalMeasurementAverageRmsUnderVoltageCounterPhaseBAttributeInteractionInfo); Map @@ -14853,7 +14807,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsExtremeOverVoltagePeriodPhaseBAttribute", readElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseBAttributeInteractionInfo); Map @@ -14869,7 +14823,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsExtremeUnderVoltagePeriodPhaseBAttribute", readElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseBAttributeInteractionInfo); Map @@ -14884,7 +14838,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsVoltageSagPeriodPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsVoltageSagPeriodPhaseBAttribute", readElectricalMeasurementRmsVoltageSagPeriodPhaseBAttributeInteractionInfo); Map @@ -14899,7 +14853,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsVoltageSwellPeriodPhaseBCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsVoltageSwellPeriodPhaseBAttribute", readElectricalMeasurementRmsVoltageSwellPeriodPhaseBAttributeInteractionInfo); Map readElectricalMeasurementLineCurrentPhaseCCommandParams = @@ -14912,7 +14866,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementLineCurrentPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readLineCurrentPhaseCAttribute", readElectricalMeasurementLineCurrentPhaseCAttributeInteractionInfo); Map readElectricalMeasurementActiveCurrentPhaseCCommandParams = @@ -14926,7 +14880,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementActiveCurrentPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readActiveCurrentPhaseCAttribute", readElectricalMeasurementActiveCurrentPhaseCAttributeInteractionInfo); Map readElectricalMeasurementReactiveCurrentPhaseCCommandParams = @@ -14940,7 +14894,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementReactiveCurrentPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readReactiveCurrentPhaseCAttribute", readElectricalMeasurementReactiveCurrentPhaseCAttributeInteractionInfo); Map readElectricalMeasurementRmsVoltagePhaseCCommandParams = @@ -14953,7 +14907,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsVoltagePhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsVoltagePhaseCAttribute", readElectricalMeasurementRmsVoltagePhaseCAttributeInteractionInfo); Map readElectricalMeasurementRmsVoltageMinPhaseCCommandParams = @@ -14967,7 +14921,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsVoltageMinPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsVoltageMinPhaseCAttribute", readElectricalMeasurementRmsVoltageMinPhaseCAttributeInteractionInfo); Map readElectricalMeasurementRmsVoltageMaxPhaseCCommandParams = @@ -14981,7 +14935,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsVoltageMaxPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsVoltageMaxPhaseCAttribute", readElectricalMeasurementRmsVoltageMaxPhaseCAttributeInteractionInfo); Map readElectricalMeasurementRmsCurrentPhaseCCommandParams = @@ -14994,7 +14948,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsCurrentPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsCurrentPhaseCAttribute", readElectricalMeasurementRmsCurrentPhaseCAttributeInteractionInfo); Map readElectricalMeasurementRmsCurrentMinPhaseCCommandParams = @@ -15008,7 +14962,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsCurrentMinPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsCurrentMinPhaseCAttribute", readElectricalMeasurementRmsCurrentMinPhaseCAttributeInteractionInfo); Map readElectricalMeasurementRmsCurrentMaxPhaseCCommandParams = @@ -15022,7 +14976,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsCurrentMaxPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsCurrentMaxPhaseCAttribute", readElectricalMeasurementRmsCurrentMaxPhaseCAttributeInteractionInfo); Map readElectricalMeasurementActivePowerPhaseCCommandParams = @@ -15035,7 +14989,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementActivePowerPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readActivePowerPhaseCAttribute", readElectricalMeasurementActivePowerPhaseCAttributeInteractionInfo); Map readElectricalMeasurementActivePowerMinPhaseCCommandParams = @@ -15049,7 +15003,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementActivePowerMinPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readActivePowerMinPhaseCAttribute", readElectricalMeasurementActivePowerMinPhaseCAttributeInteractionInfo); Map readElectricalMeasurementActivePowerMaxPhaseCCommandParams = @@ -15063,7 +15017,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementActivePowerMaxPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readActivePowerMaxPhaseCAttribute", readElectricalMeasurementActivePowerMaxPhaseCAttributeInteractionInfo); Map readElectricalMeasurementReactivePowerPhaseCCommandParams = @@ -15077,7 +15031,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementReactivePowerPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readReactivePowerPhaseCAttribute", readElectricalMeasurementReactivePowerPhaseCAttributeInteractionInfo); Map readElectricalMeasurementApparentPowerPhaseCCommandParams = @@ -15091,7 +15045,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementApparentPowerPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readApparentPowerPhaseCAttribute", readElectricalMeasurementApparentPowerPhaseCAttributeInteractionInfo); Map readElectricalMeasurementPowerFactorPhaseCCommandParams = @@ -15104,7 +15058,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementPowerFactorPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readPowerFactorPhaseCAttribute", readElectricalMeasurementPowerFactorPhaseCAttributeInteractionInfo); Map @@ -15120,7 +15074,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAverageRmsVoltageMeasurementPeriodPhaseCAttribute", readElectricalMeasurementAverageRmsVoltageMeasurementPeriodPhaseCAttributeInteractionInfo); Map @@ -15136,7 +15090,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAverageRmsOverVoltageCounterPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAverageRmsOverVoltageCounterPhaseCAttribute", readElectricalMeasurementAverageRmsOverVoltageCounterPhaseCAttributeInteractionInfo); Map @@ -15152,7 +15106,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementAverageRmsUnderVoltageCounterPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAverageRmsUnderVoltageCounterPhaseCAttribute", readElectricalMeasurementAverageRmsUnderVoltageCounterPhaseCAttributeInteractionInfo); Map @@ -15168,7 +15122,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsExtremeOverVoltagePeriodPhaseCAttribute", readElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseCAttributeInteractionInfo); Map @@ -15184,7 +15138,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsExtremeUnderVoltagePeriodPhaseCAttribute", readElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseCAttributeInteractionInfo); Map @@ -15199,7 +15153,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsVoltageSagPeriodPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsVoltageSagPeriodPhaseCAttribute", readElectricalMeasurementRmsVoltageSagPeriodPhaseCAttributeInteractionInfo); Map @@ -15214,7 +15168,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementRmsVoltageSwellPeriodPhaseCCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readRmsVoltageSwellPeriodPhaseCAttribute", readElectricalMeasurementRmsVoltageSwellPeriodPhaseCAttributeInteractionInfo); Map readElectricalMeasurementGeneratedCommandListCommandParams = @@ -15232,7 +15186,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedElectricalMeasurementClusterGeneratedCommandListAttributeCallback(), readElectricalMeasurementGeneratedCommandListCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readElectricalMeasurementGeneratedCommandListAttributeInteractionInfo); Map readElectricalMeasurementAcceptedCommandListCommandParams = @@ -15250,7 +15204,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedElectricalMeasurementClusterAcceptedCommandListAttributeCallback(), readElectricalMeasurementAcceptedCommandListCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readElectricalMeasurementAcceptedCommandListAttributeInteractionInfo); Map readElectricalMeasurementEventListCommandParams = @@ -15267,7 +15221,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedElectricalMeasurementClusterEventListAttributeCallback(), readElectricalMeasurementEventListCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readEventListAttribute", readElectricalMeasurementEventListAttributeInteractionInfo); Map readElectricalMeasurementAttributeListCommandParams = new LinkedHashMap(); @@ -15283,7 +15237,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedElectricalMeasurementClusterAttributeListAttributeCallback(), readElectricalMeasurementAttributeListCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readAttributeListAttribute", readElectricalMeasurementAttributeListAttributeInteractionInfo); Map readElectricalMeasurementFeatureMapCommandParams = @@ -15296,7 +15250,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readElectricalMeasurementFeatureMapCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readFeatureMapAttribute", readElectricalMeasurementFeatureMapAttributeInteractionInfo); Map readElectricalMeasurementClusterRevisionCommandParams = new LinkedHashMap(); @@ -15308,11 +15262,15 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readElectricalMeasurementClusterRevisionCommandParams); - readElectricalMeasurementInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readElectricalMeasurementClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("electricalMeasurement", readElectricalMeasurementInteractionInfo); - Map readUnitTestingInteractionInfo = new LinkedHashMap<>(); + + return result; + } + + private static Map readUnitTestingInteractionInfo() { + Map result = new LinkedHashMap<>(); Map readUnitTestingBooleanCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingBooleanAttributeInteractionInfo = @@ -15323,8 +15281,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readUnitTestingBooleanCommandParams); - readUnitTestingInteractionInfo.put( - "readBooleanAttribute", readUnitTestingBooleanAttributeInteractionInfo); + result.put("readBooleanAttribute", readUnitTestingBooleanAttributeInteractionInfo); Map readUnitTestingBitmap8CommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingBitmap8AttributeInteractionInfo = @@ -15335,8 +15292,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitTestingBitmap8CommandParams); - readUnitTestingInteractionInfo.put( - "readBitmap8Attribute", readUnitTestingBitmap8AttributeInteractionInfo); + result.put("readBitmap8Attribute", readUnitTestingBitmap8AttributeInteractionInfo); Map readUnitTestingBitmap16CommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingBitmap16AttributeInteractionInfo = @@ -15347,8 +15303,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitTestingBitmap16CommandParams); - readUnitTestingInteractionInfo.put( - "readBitmap16Attribute", readUnitTestingBitmap16AttributeInteractionInfo); + result.put("readBitmap16Attribute", readUnitTestingBitmap16AttributeInteractionInfo); Map readUnitTestingBitmap32CommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingBitmap32AttributeInteractionInfo = @@ -15359,8 +15314,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitTestingBitmap32CommandParams); - readUnitTestingInteractionInfo.put( - "readBitmap32Attribute", readUnitTestingBitmap32AttributeInteractionInfo); + result.put("readBitmap32Attribute", readUnitTestingBitmap32AttributeInteractionInfo); Map readUnitTestingBitmap64CommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingBitmap64AttributeInteractionInfo = @@ -15371,8 +15325,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitTestingBitmap64CommandParams); - readUnitTestingInteractionInfo.put( - "readBitmap64Attribute", readUnitTestingBitmap64AttributeInteractionInfo); + result.put("readBitmap64Attribute", readUnitTestingBitmap64AttributeInteractionInfo); Map readUnitTestingInt8uCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingInt8uAttributeInteractionInfo = @@ -15383,8 +15336,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitTestingInt8uCommandParams); - readUnitTestingInteractionInfo.put( - "readInt8uAttribute", readUnitTestingInt8uAttributeInteractionInfo); + result.put("readInt8uAttribute", readUnitTestingInt8uAttributeInteractionInfo); Map readUnitTestingInt16uCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingInt16uAttributeInteractionInfo = @@ -15395,8 +15347,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitTestingInt16uCommandParams); - readUnitTestingInteractionInfo.put( - "readInt16uAttribute", readUnitTestingInt16uAttributeInteractionInfo); + result.put("readInt16uAttribute", readUnitTestingInt16uAttributeInteractionInfo); Map readUnitTestingInt24uCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingInt24uAttributeInteractionInfo = @@ -15407,8 +15358,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitTestingInt24uCommandParams); - readUnitTestingInteractionInfo.put( - "readInt24uAttribute", readUnitTestingInt24uAttributeInteractionInfo); + result.put("readInt24uAttribute", readUnitTestingInt24uAttributeInteractionInfo); Map readUnitTestingInt32uCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingInt32uAttributeInteractionInfo = @@ -15419,8 +15369,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitTestingInt32uCommandParams); - readUnitTestingInteractionInfo.put( - "readInt32uAttribute", readUnitTestingInt32uAttributeInteractionInfo); + result.put("readInt32uAttribute", readUnitTestingInt32uAttributeInteractionInfo); Map readUnitTestingInt40uCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingInt40uAttributeInteractionInfo = @@ -15431,8 +15380,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitTestingInt40uCommandParams); - readUnitTestingInteractionInfo.put( - "readInt40uAttribute", readUnitTestingInt40uAttributeInteractionInfo); + result.put("readInt40uAttribute", readUnitTestingInt40uAttributeInteractionInfo); Map readUnitTestingInt48uCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingInt48uAttributeInteractionInfo = @@ -15443,8 +15391,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitTestingInt48uCommandParams); - readUnitTestingInteractionInfo.put( - "readInt48uAttribute", readUnitTestingInt48uAttributeInteractionInfo); + result.put("readInt48uAttribute", readUnitTestingInt48uAttributeInteractionInfo); Map readUnitTestingInt56uCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingInt56uAttributeInteractionInfo = @@ -15455,8 +15402,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitTestingInt56uCommandParams); - readUnitTestingInteractionInfo.put( - "readInt56uAttribute", readUnitTestingInt56uAttributeInteractionInfo); + result.put("readInt56uAttribute", readUnitTestingInt56uAttributeInteractionInfo); Map readUnitTestingInt64uCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingInt64uAttributeInteractionInfo = @@ -15467,8 +15413,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitTestingInt64uCommandParams); - readUnitTestingInteractionInfo.put( - "readInt64uAttribute", readUnitTestingInt64uAttributeInteractionInfo); + result.put("readInt64uAttribute", readUnitTestingInt64uAttributeInteractionInfo); Map readUnitTestingInt8sCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingInt8sAttributeInteractionInfo = @@ -15479,8 +15424,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitTestingInt8sCommandParams); - readUnitTestingInteractionInfo.put( - "readInt8sAttribute", readUnitTestingInt8sAttributeInteractionInfo); + result.put("readInt8sAttribute", readUnitTestingInt8sAttributeInteractionInfo); Map readUnitTestingInt16sCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingInt16sAttributeInteractionInfo = @@ -15491,8 +15435,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitTestingInt16sCommandParams); - readUnitTestingInteractionInfo.put( - "readInt16sAttribute", readUnitTestingInt16sAttributeInteractionInfo); + result.put("readInt16sAttribute", readUnitTestingInt16sAttributeInteractionInfo); Map readUnitTestingInt24sCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingInt24sAttributeInteractionInfo = @@ -15503,8 +15446,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitTestingInt24sCommandParams); - readUnitTestingInteractionInfo.put( - "readInt24sAttribute", readUnitTestingInt24sAttributeInteractionInfo); + result.put("readInt24sAttribute", readUnitTestingInt24sAttributeInteractionInfo); Map readUnitTestingInt32sCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingInt32sAttributeInteractionInfo = @@ -15515,8 +15457,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitTestingInt32sCommandParams); - readUnitTestingInteractionInfo.put( - "readInt32sAttribute", readUnitTestingInt32sAttributeInteractionInfo); + result.put("readInt32sAttribute", readUnitTestingInt32sAttributeInteractionInfo); Map readUnitTestingInt40sCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingInt40sAttributeInteractionInfo = @@ -15527,8 +15468,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitTestingInt40sCommandParams); - readUnitTestingInteractionInfo.put( - "readInt40sAttribute", readUnitTestingInt40sAttributeInteractionInfo); + result.put("readInt40sAttribute", readUnitTestingInt40sAttributeInteractionInfo); Map readUnitTestingInt48sCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingInt48sAttributeInteractionInfo = @@ -15539,8 +15479,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitTestingInt48sCommandParams); - readUnitTestingInteractionInfo.put( - "readInt48sAttribute", readUnitTestingInt48sAttributeInteractionInfo); + result.put("readInt48sAttribute", readUnitTestingInt48sAttributeInteractionInfo); Map readUnitTestingInt56sCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingInt56sAttributeInteractionInfo = @@ -15551,8 +15490,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitTestingInt56sCommandParams); - readUnitTestingInteractionInfo.put( - "readInt56sAttribute", readUnitTestingInt56sAttributeInteractionInfo); + result.put("readInt56sAttribute", readUnitTestingInt56sAttributeInteractionInfo); Map readUnitTestingInt64sCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingInt64sAttributeInteractionInfo = @@ -15563,8 +15501,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitTestingInt64sCommandParams); - readUnitTestingInteractionInfo.put( - "readInt64sAttribute", readUnitTestingInt64sAttributeInteractionInfo); + result.put("readInt64sAttribute", readUnitTestingInt64sAttributeInteractionInfo); Map readUnitTestingEnum8CommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingEnum8AttributeInteractionInfo = @@ -15575,8 +15512,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitTestingEnum8CommandParams); - readUnitTestingInteractionInfo.put( - "readEnum8Attribute", readUnitTestingEnum8AttributeInteractionInfo); + result.put("readEnum8Attribute", readUnitTestingEnum8AttributeInteractionInfo); Map readUnitTestingEnum16CommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingEnum16AttributeInteractionInfo = @@ -15587,8 +15523,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitTestingEnum16CommandParams); - readUnitTestingInteractionInfo.put( - "readEnum16Attribute", readUnitTestingEnum16AttributeInteractionInfo); + result.put("readEnum16Attribute", readUnitTestingEnum16AttributeInteractionInfo); Map readUnitTestingFloatSingleCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingFloatSingleAttributeInteractionInfo = @@ -15599,8 +15534,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedFloatAttributeCallback(), readUnitTestingFloatSingleCommandParams); - readUnitTestingInteractionInfo.put( - "readFloatSingleAttribute", readUnitTestingFloatSingleAttributeInteractionInfo); + result.put("readFloatSingleAttribute", readUnitTestingFloatSingleAttributeInteractionInfo); Map readUnitTestingFloatDoubleCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingFloatDoubleAttributeInteractionInfo = @@ -15611,8 +15545,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedDoubleAttributeCallback(), readUnitTestingFloatDoubleCommandParams); - readUnitTestingInteractionInfo.put( - "readFloatDoubleAttribute", readUnitTestingFloatDoubleAttributeInteractionInfo); + result.put("readFloatDoubleAttribute", readUnitTestingFloatDoubleAttributeInteractionInfo); Map readUnitTestingOctetStringCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingOctetStringAttributeInteractionInfo = @@ -15623,8 +15556,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(), readUnitTestingOctetStringCommandParams); - readUnitTestingInteractionInfo.put( - "readOctetStringAttribute", readUnitTestingOctetStringAttributeInteractionInfo); + result.put("readOctetStringAttribute", readUnitTestingOctetStringAttributeInteractionInfo); Map readUnitTestingListInt8uCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingListInt8uAttributeInteractionInfo = @@ -15636,8 +15568,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedUnitTestingClusterListInt8uAttributeCallback(), readUnitTestingListInt8uCommandParams); - readUnitTestingInteractionInfo.put( - "readListInt8uAttribute", readUnitTestingListInt8uAttributeInteractionInfo); + result.put("readListInt8uAttribute", readUnitTestingListInt8uAttributeInteractionInfo); Map readUnitTestingListOctetStringCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingListOctetStringAttributeInteractionInfo = @@ -15651,7 +15582,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterListOctetStringAttributeCallback(), readUnitTestingListOctetStringCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readListOctetStringAttribute", readUnitTestingListOctetStringAttributeInteractionInfo); Map readUnitTestingListStructOctetStringCommandParams = new LinkedHashMap(); @@ -15667,7 +15598,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterListStructOctetStringAttributeCallback(), readUnitTestingListStructOctetStringCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readListStructOctetStringAttribute", readUnitTestingListStructOctetStringAttributeInteractionInfo); Map readUnitTestingLongOctetStringCommandParams = @@ -15681,7 +15612,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedOctetStringAttributeCallback(), readUnitTestingLongOctetStringCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readLongOctetStringAttribute", readUnitTestingLongOctetStringAttributeInteractionInfo); Map readUnitTestingCharStringCommandParams = new LinkedHashMap(); @@ -15693,8 +15624,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readUnitTestingCharStringCommandParams); - readUnitTestingInteractionInfo.put( - "readCharStringAttribute", readUnitTestingCharStringAttributeInteractionInfo); + result.put("readCharStringAttribute", readUnitTestingCharStringAttributeInteractionInfo); Map readUnitTestingLongCharStringCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingLongCharStringAttributeInteractionInfo = @@ -15705,7 +15635,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readUnitTestingLongCharStringCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readLongCharStringAttribute", readUnitTestingLongCharStringAttributeInteractionInfo); Map readUnitTestingEpochUsCommandParams = new LinkedHashMap(); @@ -15717,8 +15647,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitTestingEpochUsCommandParams); - readUnitTestingInteractionInfo.put( - "readEpochUsAttribute", readUnitTestingEpochUsAttributeInteractionInfo); + result.put("readEpochUsAttribute", readUnitTestingEpochUsAttributeInteractionInfo); Map readUnitTestingEpochSCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingEpochSAttributeInteractionInfo = @@ -15729,8 +15658,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitTestingEpochSCommandParams); - readUnitTestingInteractionInfo.put( - "readEpochSAttribute", readUnitTestingEpochSAttributeInteractionInfo); + result.put("readEpochSAttribute", readUnitTestingEpochSAttributeInteractionInfo); Map readUnitTestingVendorIdCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingVendorIdAttributeInteractionInfo = @@ -15741,8 +15669,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitTestingVendorIdCommandParams); - readUnitTestingInteractionInfo.put( - "readVendorIdAttribute", readUnitTestingVendorIdAttributeInteractionInfo); + result.put("readVendorIdAttribute", readUnitTestingVendorIdAttributeInteractionInfo); Map readUnitTestingListNullablesAndOptionalsStructCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingListNullablesAndOptionalsStructAttributeInteractionInfo = @@ -15758,7 +15685,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterListNullablesAndOptionalsStructAttributeCallback(), readUnitTestingListNullablesAndOptionalsStructCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readListNullablesAndOptionalsStructAttribute", readUnitTestingListNullablesAndOptionalsStructAttributeInteractionInfo); Map readUnitTestingEnumAttrCommandParams = @@ -15771,8 +15698,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitTestingEnumAttrCommandParams); - readUnitTestingInteractionInfo.put( - "readEnumAttrAttribute", readUnitTestingEnumAttrAttributeInteractionInfo); + result.put("readEnumAttrAttribute", readUnitTestingEnumAttrAttributeInteractionInfo); Map readUnitTestingRangeRestrictedInt8uCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingRangeRestrictedInt8uAttributeInteractionInfo = @@ -15784,7 +15710,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitTestingRangeRestrictedInt8uCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readRangeRestrictedInt8uAttribute", readUnitTestingRangeRestrictedInt8uAttributeInteractionInfo); Map readUnitTestingRangeRestrictedInt8sCommandParams = @@ -15798,7 +15724,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitTestingRangeRestrictedInt8sCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readRangeRestrictedInt8sAttribute", readUnitTestingRangeRestrictedInt8sAttributeInteractionInfo); Map readUnitTestingRangeRestrictedInt16uCommandParams = @@ -15812,7 +15738,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitTestingRangeRestrictedInt16uCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readRangeRestrictedInt16uAttribute", readUnitTestingRangeRestrictedInt16uAttributeInteractionInfo); Map readUnitTestingRangeRestrictedInt16sCommandParams = @@ -15826,7 +15752,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitTestingRangeRestrictedInt16sCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readRangeRestrictedInt16sAttribute", readUnitTestingRangeRestrictedInt16sAttributeInteractionInfo); Map readUnitTestingListLongOctetStringCommandParams = @@ -15843,7 +15769,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterListLongOctetStringAttributeCallback(), readUnitTestingListLongOctetStringCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readListLongOctetStringAttribute", readUnitTestingListLongOctetStringAttributeInteractionInfo); Map readUnitTestingListFabricScopedCommandParams = @@ -15859,7 +15785,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterListFabricScopedAttributeCallback(), readUnitTestingListFabricScopedCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readListFabricScopedAttribute", readUnitTestingListFabricScopedAttributeInteractionInfo); Map readUnitTestingTimedWriteBooleanCommandParams = new LinkedHashMap(); @@ -15871,7 +15797,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readUnitTestingTimedWriteBooleanCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readTimedWriteBooleanAttribute", readUnitTestingTimedWriteBooleanAttributeInteractionInfo); Map readUnitTestingGeneralErrorBooleanCommandParams = new LinkedHashMap(); @@ -15884,7 +15810,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readUnitTestingGeneralErrorBooleanCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readGeneralErrorBooleanAttribute", readUnitTestingGeneralErrorBooleanAttributeInteractionInfo); Map readUnitTestingClusterErrorBooleanCommandParams = @@ -15898,7 +15824,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readUnitTestingClusterErrorBooleanCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readClusterErrorBooleanAttribute", readUnitTestingClusterErrorBooleanAttributeInteractionInfo); Map readUnitTestingUnsupportedCommandParams = @@ -15911,8 +15837,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedBooleanAttributeCallback(), readUnitTestingUnsupportedCommandParams); - readUnitTestingInteractionInfo.put( - "readUnsupportedAttribute", readUnitTestingUnsupportedAttributeInteractionInfo); + result.put("readUnsupportedAttribute", readUnitTestingUnsupportedAttributeInteractionInfo); Map readUnitTestingNullableBooleanCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingNullableBooleanAttributeInteractionInfo = @@ -15926,7 +15851,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterNullableBooleanAttributeCallback(), readUnitTestingNullableBooleanCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableBooleanAttribute", readUnitTestingNullableBooleanAttributeInteractionInfo); Map readUnitTestingNullableBitmap8CommandParams = new LinkedHashMap(); @@ -15941,7 +15866,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterNullableBitmap8AttributeCallback(), readUnitTestingNullableBitmap8CommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableBitmap8Attribute", readUnitTestingNullableBitmap8AttributeInteractionInfo); Map readUnitTestingNullableBitmap16CommandParams = new LinkedHashMap(); @@ -15956,7 +15881,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterNullableBitmap16AttributeCallback(), readUnitTestingNullableBitmap16CommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableBitmap16Attribute", readUnitTestingNullableBitmap16AttributeInteractionInfo); Map readUnitTestingNullableBitmap32CommandParams = new LinkedHashMap(); @@ -15971,7 +15896,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterNullableBitmap32AttributeCallback(), readUnitTestingNullableBitmap32CommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableBitmap32Attribute", readUnitTestingNullableBitmap32AttributeInteractionInfo); Map readUnitTestingNullableBitmap64CommandParams = new LinkedHashMap(); @@ -15986,7 +15911,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterNullableBitmap64AttributeCallback(), readUnitTestingNullableBitmap64CommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableBitmap64Attribute", readUnitTestingNullableBitmap64AttributeInteractionInfo); Map readUnitTestingNullableInt8uCommandParams = new LinkedHashMap(); @@ -16000,8 +15925,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableInt8uAttributeCallback(), readUnitTestingNullableInt8uCommandParams); - readUnitTestingInteractionInfo.put( - "readNullableInt8uAttribute", readUnitTestingNullableInt8uAttributeInteractionInfo); + result.put("readNullableInt8uAttribute", readUnitTestingNullableInt8uAttributeInteractionInfo); Map readUnitTestingNullableInt16uCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingNullableInt16uAttributeInteractionInfo = @@ -16014,7 +15938,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableInt16uAttributeCallback(), readUnitTestingNullableInt16uCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableInt16uAttribute", readUnitTestingNullableInt16uAttributeInteractionInfo); Map readUnitTestingNullableInt24uCommandParams = new LinkedHashMap(); @@ -16028,7 +15952,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableInt24uAttributeCallback(), readUnitTestingNullableInt24uCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableInt24uAttribute", readUnitTestingNullableInt24uAttributeInteractionInfo); Map readUnitTestingNullableInt32uCommandParams = new LinkedHashMap(); @@ -16042,7 +15966,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableInt32uAttributeCallback(), readUnitTestingNullableInt32uCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableInt32uAttribute", readUnitTestingNullableInt32uAttributeInteractionInfo); Map readUnitTestingNullableInt40uCommandParams = new LinkedHashMap(); @@ -16056,7 +15980,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableInt40uAttributeCallback(), readUnitTestingNullableInt40uCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableInt40uAttribute", readUnitTestingNullableInt40uAttributeInteractionInfo); Map readUnitTestingNullableInt48uCommandParams = new LinkedHashMap(); @@ -16070,7 +15994,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableInt48uAttributeCallback(), readUnitTestingNullableInt48uCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableInt48uAttribute", readUnitTestingNullableInt48uAttributeInteractionInfo); Map readUnitTestingNullableInt56uCommandParams = new LinkedHashMap(); @@ -16084,7 +16008,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableInt56uAttributeCallback(), readUnitTestingNullableInt56uCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableInt56uAttribute", readUnitTestingNullableInt56uAttributeInteractionInfo); Map readUnitTestingNullableInt64uCommandParams = new LinkedHashMap(); @@ -16098,7 +16022,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableInt64uAttributeCallback(), readUnitTestingNullableInt64uCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableInt64uAttribute", readUnitTestingNullableInt64uAttributeInteractionInfo); Map readUnitTestingNullableInt8sCommandParams = new LinkedHashMap(); @@ -16112,8 +16036,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableInt8sAttributeCallback(), readUnitTestingNullableInt8sCommandParams); - readUnitTestingInteractionInfo.put( - "readNullableInt8sAttribute", readUnitTestingNullableInt8sAttributeInteractionInfo); + result.put("readNullableInt8sAttribute", readUnitTestingNullableInt8sAttributeInteractionInfo); Map readUnitTestingNullableInt16sCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingNullableInt16sAttributeInteractionInfo = @@ -16126,7 +16049,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableInt16sAttributeCallback(), readUnitTestingNullableInt16sCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableInt16sAttribute", readUnitTestingNullableInt16sAttributeInteractionInfo); Map readUnitTestingNullableInt24sCommandParams = new LinkedHashMap(); @@ -16140,7 +16063,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableInt24sAttributeCallback(), readUnitTestingNullableInt24sCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableInt24sAttribute", readUnitTestingNullableInt24sAttributeInteractionInfo); Map readUnitTestingNullableInt32sCommandParams = new LinkedHashMap(); @@ -16154,7 +16077,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableInt32sAttributeCallback(), readUnitTestingNullableInt32sCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableInt32sAttribute", readUnitTestingNullableInt32sAttributeInteractionInfo); Map readUnitTestingNullableInt40sCommandParams = new LinkedHashMap(); @@ -16168,7 +16091,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableInt40sAttributeCallback(), readUnitTestingNullableInt40sCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableInt40sAttribute", readUnitTestingNullableInt40sAttributeInteractionInfo); Map readUnitTestingNullableInt48sCommandParams = new LinkedHashMap(); @@ -16182,7 +16105,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableInt48sAttributeCallback(), readUnitTestingNullableInt48sCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableInt48sAttribute", readUnitTestingNullableInt48sAttributeInteractionInfo); Map readUnitTestingNullableInt56sCommandParams = new LinkedHashMap(); @@ -16196,7 +16119,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableInt56sAttributeCallback(), readUnitTestingNullableInt56sCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableInt56sAttribute", readUnitTestingNullableInt56sAttributeInteractionInfo); Map readUnitTestingNullableInt64sCommandParams = new LinkedHashMap(); @@ -16210,7 +16133,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableInt64sAttributeCallback(), readUnitTestingNullableInt64sCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableInt64sAttribute", readUnitTestingNullableInt64sAttributeInteractionInfo); Map readUnitTestingNullableEnum8CommandParams = new LinkedHashMap(); @@ -16224,8 +16147,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableEnum8AttributeCallback(), readUnitTestingNullableEnum8CommandParams); - readUnitTestingInteractionInfo.put( - "readNullableEnum8Attribute", readUnitTestingNullableEnum8AttributeInteractionInfo); + result.put("readNullableEnum8Attribute", readUnitTestingNullableEnum8AttributeInteractionInfo); Map readUnitTestingNullableEnum16CommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingNullableEnum16AttributeInteractionInfo = @@ -16238,7 +16160,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterNullableEnum16AttributeCallback(), readUnitTestingNullableEnum16CommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableEnum16Attribute", readUnitTestingNullableEnum16AttributeInteractionInfo); Map readUnitTestingNullableFloatSingleCommandParams = new LinkedHashMap(); @@ -16254,7 +16176,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterNullableFloatSingleAttributeCallback(), readUnitTestingNullableFloatSingleCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableFloatSingleAttribute", readUnitTestingNullableFloatSingleAttributeInteractionInfo); Map readUnitTestingNullableFloatDoubleCommandParams = @@ -16271,7 +16193,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterNullableFloatDoubleAttributeCallback(), readUnitTestingNullableFloatDoubleCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableFloatDoubleAttribute", readUnitTestingNullableFloatDoubleAttributeInteractionInfo); Map readUnitTestingNullableOctetStringCommandParams = @@ -16288,7 +16210,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterNullableOctetStringAttributeCallback(), readUnitTestingNullableOctetStringCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableOctetStringAttribute", readUnitTestingNullableOctetStringAttributeInteractionInfo); Map readUnitTestingNullableCharStringCommandParams = @@ -16305,7 +16227,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterNullableCharStringAttributeCallback(), readUnitTestingNullableCharStringCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableCharStringAttribute", readUnitTestingNullableCharStringAttributeInteractionInfo); Map readUnitTestingNullableEnumAttrCommandParams = @@ -16321,7 +16243,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterNullableEnumAttrAttributeCallback(), readUnitTestingNullableEnumAttrCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableEnumAttrAttribute", readUnitTestingNullableEnumAttrAttributeInteractionInfo); Map readUnitTestingNullableRangeRestrictedInt8uCommandParams = new LinkedHashMap(); @@ -16338,7 +16260,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterNullableRangeRestrictedInt8uAttributeCallback(), readUnitTestingNullableRangeRestrictedInt8uCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableRangeRestrictedInt8uAttribute", readUnitTestingNullableRangeRestrictedInt8uAttributeInteractionInfo); Map readUnitTestingNullableRangeRestrictedInt8sCommandParams = @@ -16356,7 +16278,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterNullableRangeRestrictedInt8sAttributeCallback(), readUnitTestingNullableRangeRestrictedInt8sCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableRangeRestrictedInt8sAttribute", readUnitTestingNullableRangeRestrictedInt8sAttributeInteractionInfo); Map readUnitTestingNullableRangeRestrictedInt16uCommandParams = @@ -16374,7 +16296,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterNullableRangeRestrictedInt16uAttributeCallback(), readUnitTestingNullableRangeRestrictedInt16uCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableRangeRestrictedInt16uAttribute", readUnitTestingNullableRangeRestrictedInt16uAttributeInteractionInfo); Map readUnitTestingNullableRangeRestrictedInt16sCommandParams = @@ -16392,7 +16314,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterNullableRangeRestrictedInt16sAttributeCallback(), readUnitTestingNullableRangeRestrictedInt16sCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readNullableRangeRestrictedInt16sAttribute", readUnitTestingNullableRangeRestrictedInt16sAttributeInteractionInfo); Map readUnitTestingWriteOnlyInt8uCommandParams = @@ -16405,7 +16327,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitTestingWriteOnlyInt8uCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readWriteOnlyInt8uAttribute", readUnitTestingWriteOnlyInt8uAttributeInteractionInfo); Map readUnitTestingGeneratedCommandListCommandParams = new LinkedHashMap(); @@ -16421,7 +16343,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterGeneratedCommandListAttributeCallback(), readUnitTestingGeneratedCommandListCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readGeneratedCommandListAttribute", readUnitTestingGeneratedCommandListAttributeInteractionInfo); Map readUnitTestingAcceptedCommandListCommandParams = @@ -16438,7 +16360,7 @@ public Map> getReadAttributeMap() { new ClusterInfoMapping .DelegatedUnitTestingClusterAcceptedCommandListAttributeCallback(), readUnitTestingAcceptedCommandListCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readAcceptedCommandListAttribute", readUnitTestingAcceptedCommandListAttributeInteractionInfo); Map readUnitTestingEventListCommandParams = @@ -16452,8 +16374,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedUnitTestingClusterEventListAttributeCallback(), readUnitTestingEventListCommandParams); - readUnitTestingInteractionInfo.put( - "readEventListAttribute", readUnitTestingEventListAttributeInteractionInfo); + result.put("readEventListAttribute", readUnitTestingEventListAttributeInteractionInfo); Map readUnitTestingAttributeListCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingAttributeListAttributeInteractionInfo = @@ -16466,8 +16387,7 @@ public Map> getReadAttributeMap() { () -> new ClusterInfoMapping.DelegatedUnitTestingClusterAttributeListAttributeCallback(), readUnitTestingAttributeListCommandParams); - readUnitTestingInteractionInfo.put( - "readAttributeListAttribute", readUnitTestingAttributeListAttributeInteractionInfo); + result.put("readAttributeListAttribute", readUnitTestingAttributeListAttributeInteractionInfo); Map readUnitTestingFeatureMapCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingFeatureMapAttributeInteractionInfo = @@ -16478,8 +16398,7 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), readUnitTestingFeatureMapCommandParams); - readUnitTestingInteractionInfo.put( - "readFeatureMapAttribute", readUnitTestingFeatureMapAttributeInteractionInfo); + result.put("readFeatureMapAttribute", readUnitTestingFeatureMapAttributeInteractionInfo); Map readUnitTestingClusterRevisionCommandParams = new LinkedHashMap(); InteractionInfo readUnitTestingClusterRevisionAttributeInteractionInfo = @@ -16490,9 +16409,85 @@ public Map> getReadAttributeMap() { }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readUnitTestingClusterRevisionCommandParams); - readUnitTestingInteractionInfo.put( + result.put( "readClusterRevisionAttribute", readUnitTestingClusterRevisionAttributeInteractionInfo); - readAttributeMap.put("unitTesting", readUnitTestingInteractionInfo); - return readAttributeMap; + + return result; + } + + @SuppressWarnings("serial") + public Map> getReadAttributeMap() { + + return new HashMap>() { + { + put("identify", readIdentifyInteractionInfo()); + put("groups", readGroupsInteractionInfo()); + put("scenes", readScenesInteractionInfo()); + put("onOff", readOnOffInteractionInfo()); + put("onOffSwitchConfiguration", readOnOffSwitchConfigurationInteractionInfo()); + put("levelControl", readLevelControlInteractionInfo()); + put("binaryInputBasic", readBinaryInputBasicInteractionInfo()); + put("descriptor", readDescriptorInteractionInfo()); + put("binding", readBindingInteractionInfo()); + put("accessControl", readAccessControlInteractionInfo()); + put("actions", readActionsInteractionInfo()); + put("basicInformation", readBasicInformationInteractionInfo()); + put("otaSoftwareUpdateProvider", readOtaSoftwareUpdateProviderInteractionInfo()); + put("otaSoftwareUpdateRequestor", readOtaSoftwareUpdateRequestorInteractionInfo()); + put("localizationConfiguration", readLocalizationConfigurationInteractionInfo()); + put("timeFormatLocalization", readTimeFormatLocalizationInteractionInfo()); + put("unitLocalization", readUnitLocalizationInteractionInfo()); + put("powerSourceConfiguration", readPowerSourceConfigurationInteractionInfo()); + put("powerSource", readPowerSourceInteractionInfo()); + put("generalCommissioning", readGeneralCommissioningInteractionInfo()); + put("networkCommissioning", readNetworkCommissioningInteractionInfo()); + put("diagnosticLogs", readDiagnosticLogsInteractionInfo()); + put("generalDiagnostics", readGeneralDiagnosticsInteractionInfo()); + put("softwareDiagnostics", readSoftwareDiagnosticsInteractionInfo()); + put("threadNetworkDiagnostics", readThreadNetworkDiagnosticsInteractionInfo()); + put("wiFiNetworkDiagnostics", readWiFiNetworkDiagnosticsInteractionInfo()); + put("ethernetNetworkDiagnostics", readEthernetNetworkDiagnosticsInteractionInfo()); + put("bridgedDeviceBasicInformation", readBridgedDeviceBasicInformationInteractionInfo()); + put("switch", readSwitchInteractionInfo()); + put("administratorCommissioning", readAdministratorCommissioningInteractionInfo()); + put("operationalCredentials", readOperationalCredentialsInteractionInfo()); + put("groupKeyManagement", readGroupKeyManagementInteractionInfo()); + put("fixedLabel", readFixedLabelInteractionInfo()); + put("userLabel", readUserLabelInteractionInfo()); + put("booleanState", readBooleanStateInteractionInfo()); + put("modeSelect", readModeSelectInteractionInfo()); + put("doorLock", readDoorLockInteractionInfo()); + put("windowCovering", readWindowCoveringInteractionInfo()); + put("barrierControl", readBarrierControlInteractionInfo()); + put("pumpConfigurationAndControl", readPumpConfigurationAndControlInteractionInfo()); + put("thermostat", readThermostatInteractionInfo()); + put("fanControl", readFanControlInteractionInfo()); + put( + "thermostatUserInterfaceConfiguration", + readThermostatUserInterfaceConfigurationInteractionInfo()); + put("colorControl", readColorControlInteractionInfo()); + put("ballastConfiguration", readBallastConfigurationInteractionInfo()); + put("illuminanceMeasurement", readIlluminanceMeasurementInteractionInfo()); + put("temperatureMeasurement", readTemperatureMeasurementInteractionInfo()); + put("pressureMeasurement", readPressureMeasurementInteractionInfo()); + put("flowMeasurement", readFlowMeasurementInteractionInfo()); + put("relativeHumidityMeasurement", readRelativeHumidityMeasurementInteractionInfo()); + put("occupancySensing", readOccupancySensingInteractionInfo()); + put("wakeOnLan", readWakeOnLanInteractionInfo()); + put("channel", readChannelInteractionInfo()); + put("targetNavigator", readTargetNavigatorInteractionInfo()); + put("mediaPlayback", readMediaPlaybackInteractionInfo()); + put("mediaInput", readMediaInputInteractionInfo()); + put("lowPower", readLowPowerInteractionInfo()); + put("keypadInput", readKeypadInputInteractionInfo()); + put("contentLauncher", readContentLauncherInteractionInfo()); + put("audioOutput", readAudioOutputInteractionInfo()); + put("applicationLauncher", readApplicationLauncherInteractionInfo()); + put("applicationBasic", readApplicationBasicInteractionInfo()); + put("accountLogin", readAccountLoginInteractionInfo()); + put("electricalMeasurement", readElectricalMeasurementInteractionInfo()); + put("unitTesting", readUnitTestingInteractionInfo()); + } + }; } } diff --git a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java index 652e53c038bfaa..ed8e09873fc02e 100644 --- a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java +++ b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java @@ -175,6 +175,23 @@ public void pairDeviceWithAddress( deviceControllerPtr, deviceId, address, port, discriminator, pinCode, csrNonce); } + /** + * Pair a device connected using the scanned QR code or manual entry code. + * + * @param deviceId the node ID to assign to the device + * @param setupCode the scanned QR code or manual entry code + * @param csrNonce the 32-byte CSR nonce to use, or null if we want to use an internally randomly + * generated CSR nonce. + * @param networkCredentials the credentials (Wi-Fi or Thread) to be provisioned + */ + public void pairDeviceWithCode( + long deviceId, + String setupCode, + @Nullable byte[] csrNonce, + @Nullable NetworkCredentials networkCredentials) { + pairDeviceWithCode(deviceControllerPtr, deviceId, setupCode, csrNonce, networkCredentials); + } + public void establishPaseConnection(long deviceId, int connId, long setupPincode) { if (connectionId == 0) { connectionId = connId; @@ -996,6 +1013,13 @@ private native void pairDeviceWithAddress( long pinCode, @Nullable byte[] csrNonce); + private native void pairDeviceWithCode( + long deviceControllerPtr, + long deviceId, + String setupCode, + @Nullable byte[] csrNonce, + @Nullable NetworkCredentials networkCredentials); + private native void establishPaseConnection( long deviceControllerPtr, long deviceId, int connId, long setupPincode); diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm index ada02b3817529b..93f7abeb91a979 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm +++ b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm @@ -57,6 +57,7 @@ static NSString * const kErrorDACVerifierInit = @"Init failure while creating the device attestation verifier"; static NSString * const kErrorGroupProviderInit = @"Init failure while initializing group data provider"; static NSString * const kErrorControllersInit = @"Init controllers array failure"; +static NSString * const kErrorCertificateValidityPolicyInit = @"Init certificate validity policy failure"; static NSString * const kErrorControllerFactoryInit = @"Init failure while initializing controller factory"; static NSString * const kErrorKeystoreInit = @"Init failure while initializing persistent storage keystore"; static NSString * const kErrorCertStoreInit = @"Init failure while initializing persistent storage operational certificate store"; @@ -86,6 +87,7 @@ @interface MTRDeviceControllerFactory () @property (readonly) MTROperationalBrowser * operationalBrowser; @property () chip::Credentials::DeviceAttestationVerifier * deviceAttestationVerifier; @property (readonly) BOOL advertiseOperational; +@property (nonatomic, readonly) Credentials::IgnoreCertificateValidityPeriodPolicy * certificateValidityPolicy; - (BOOL)findMatchingFabric:(FabricTable &)fabricTable params:(MTRDeviceControllerStartupParams *)params @@ -150,6 +152,11 @@ - (instancetype)init return nil; } + _certificateValidityPolicy = new Credentials::IgnoreCertificateValidityPeriodPolicy(); + if ([self checkForInitError:(_certificateValidityPolicy != nil) logMsg:kErrorCertificateValidityPolicyInit]) { + return nil; + } + return self; } @@ -204,6 +211,11 @@ - (void)cleanupInitObjects delete _sessionKeystore; _sessionKeystore = nullptr; } + + if (_certificateValidityPolicy) { + delete _certificateValidityPolicy; + _certificateValidityPolicy = nullptr; + } } - (void)cleanupStartupObjects @@ -443,6 +455,7 @@ - (BOOL)startControllerFactory:(MTRDeviceControllerFactoryParams *)startupParams params.fabricIndependentStorage = _persistentStorageDelegateBridge; params.operationalKeystore = _keystore; params.opCertStore = _opCertStore; + params.certificateValidityPolicy = _certificateValidityPolicy; errorCode = _controllerFactory->Init(params); if (errorCode != CHIP_NO_ERROR) { MTR_LOG_ERROR("Error: %@", kErrorControllerFactoryInit); diff --git a/src/darwin/Framework/CHIPTests/MTRCertificateValidityTests.m b/src/darwin/Framework/CHIPTests/MTRCertificateValidityTests.m new file mode 100644 index 00000000000000..34fd5d5814d254 --- /dev/null +++ b/src/darwin/Framework/CHIPTests/MTRCertificateValidityTests.m @@ -0,0 +1,323 @@ +/* + * + * Copyright (c) 2022 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// module headers +#import + +#import "MTRErrorTestUtils.h" +#import "MTRTestKeys.h" +#import "MTRTestResetCommissioneeHelper.h" +#import "MTRTestStorage.h" + +// system dependencies +#import + +static const uint16_t kPairingTimeoutInSeconds = 10; +static const uint16_t kTimeoutInSeconds = 3; +static const uint64_t kDeviceId = 0x12341234; +static const uint64_t kControllerId = 0x56788765; +static NSString * kOnboardingPayload = @"MT:-24J0AFN00KA0648G00"; +static const uint16_t kLocalPort = 5541; +static const uint16_t kTestVendorId = 0xFFF1u; + +static MTRBaseDevice * sConnectedDevice; + +// Singleton controller we use. +static MTRDeviceController * sController = nil; + +@interface MTRCertificateValidityTestControllerDelegate : NSObject +@property (nonatomic, readonly) XCTestExpectation * expectation; +@property (nonatomic, readonly) NSNumber * commissioneeNodeID; +@end + +@implementation MTRCertificateValidityTestControllerDelegate +- (id)initWithExpectation:(XCTestExpectation *)expectation commissioneeNodeID:(NSNumber *)nodeID +{ + self = [super init]; + if (self) { + _expectation = expectation; + _commissioneeNodeID = nodeID; + } + return self; +} + +- (void)controller:(MTRDeviceController *)controller commissioningSessionEstablishmentDone:(NSError * _Nullable)error +{ + XCTAssertEqual(error.code, 0); + + NSError * commissionError = nil; + [sController commissionNodeWithID:self.commissioneeNodeID + commissioningParams:[[MTRCommissioningParameters alloc] init] + error:&commissionError]; + XCTAssertNil(commissionError); + + // Keep waiting for onCommissioningComplete +} + +- (void)controller:(MTRDeviceController *)controller commissioningComplete:(NSError *)error +{ + XCTAssertEqual(error.code, 0); + [_expectation fulfill]; + _expectation = nil; +} +@end + +@interface MTRTestCertificateIssuer : NSObject + +@property (nonatomic, readonly) MTRTestKeys * rootKey; +@property (nonatomic, copy, readonly) MTRCertificateDERBytes rootCertificate; +@property (nonatomic, copy, readonly) NSDateInterval * validityPeriod; +@property (nonatomic, copy, readonly) NSNumber * fabricID; +@property (nonatomic, readonly) BOOL shouldSkipAttestationCertificateValidation; + +- (nullable instancetype)initWithRootKey:(MTRTestKeys *)key + fabricID:(NSNumber *)fabricID + validityPeriod:(NSDateInterval *)validityPeriod; + +- (nullable MTRCertificateDERBytes)issueOperationalCertificateForNode:(NSNumber *)nodeID + operationalPublicKey:(SecKeyRef)operationalPublicKey; + +- (void)issueOperationalCertificateForRequest:(MTROperationalCSRInfo *)csrInfo + attestationInfo:(MTRDeviceAttestationInfo *)attestationInfo + controller:(MTRDeviceController *)controller + completion:(void (^)(MTROperationalCertificateChain * _Nullable info, + NSError * _Nullable error))completion; +@end + +@implementation MTRTestCertificateIssuer +- (nullable instancetype)initWithRootKey:(MTRTestKeys *)key + fabricID:(NSNumber *)fabricID + validityPeriod:(NSDateInterval *)validityPeriod +{ + if (!(self = [super init])) { + return nil; + } + + NSError * error; + __auto_type * rootCertificate = [MTRCertificates createRootCertificate:key + issuerID:nil + fabricID:fabricID + validityPeriod:validityPeriod + error:&error]; + XCTAssertNil(error); + XCTAssertNotNil(rootCertificate); + + if (rootCertificate == nil) { + return nil; + } + + _validityPeriod = validityPeriod; + _rootCertificate = rootCertificate; + _rootKey = key; + _fabricID = fabricID; + _shouldSkipAttestationCertificateValidation = NO; + + return self; +} + +- (nullable MTRCertificateDERBytes)issueOperationalCertificateForNode:(NSNumber *)nodeID + operationalPublicKey:(SecKeyRef)operationalPublicKey +{ + return [MTRCertificates createOperationalCertificate:self.rootKey + signingCertificate:self.rootCertificate + operationalPublicKey:operationalPublicKey + fabricID:self.fabricID + nodeID:nodeID + caseAuthenticatedTags:nil + validityPeriod:self.validityPeriod + error:nil]; +} + +- (void)issueOperationalCertificateForRequest:(MTROperationalCSRInfo *)csrInfo + attestationInfo:(MTRDeviceAttestationInfo *)attestationInfo + controller:(MTRDeviceController *)controller + completion:(void (^)(MTROperationalCertificateChain * _Nullable info, + NSError * _Nullable error))completion +{ + NSError * error; + __auto_type * publicKey = [MTRCertificates publicKeyFromCSR:csrInfo.csr error:&error]; + XCTAssertNil(error); + XCTAssertNotNil(publicKey); + + NSDictionary * attributes = + @{ (id) kSecAttrKeyType : (id) kSecAttrKeyTypeECSECPrimeRandom, (id) kSecAttrKeyClass : (id) kSecAttrKeyClassPublic }; + CFErrorRef keyCreationError = NULL; + SecKeyRef operationalPublicKey + = SecKeyCreateWithData((__bridge CFDataRef) publicKey, (__bridge CFDictionaryRef) attributes, &keyCreationError); + XCTAssertNotNil((__bridge id) operationalPublicKey); + XCTAssertNil((__bridge id) keyCreationError); + + __auto_type * operationalCertificate = [self issueOperationalCertificateForNode:@(kDeviceId) + operationalPublicKey:operationalPublicKey]; + XCTAssertNotNil(operationalCertificate); + + __auto_type * certChain = [[MTROperationalCertificateChain alloc] initWithOperationalCertificate:operationalCertificate + intermediateCertificate:nil + rootCertificate:self.rootCertificate + adminSubject:nil]; + XCTAssertNotNil(certChain); + completion(certChain, nil); +} +@end + +@interface MTRTestExpiredCertificateIssuer : MTRTestCertificateIssuer + +- (nullable instancetype)initWithRootKey:(MTRTestKeys *)key fabricID:(NSNumber *)fabricID; + +@end + +@implementation MTRTestExpiredCertificateIssuer +- (nullable instancetype)initWithRootKey:(MTRTestKeys *)key fabricID:(NSNumber *)fabricID +{ + // Ensure oldDate is before newDate and both are in the past. + __auto_type * oldDate = [NSDate dateWithTimeIntervalSinceNow:-5]; + __auto_type * newDate = [NSDate dateWithTimeIntervalSinceNow:-2]; + __auto_type * validityPeriod = [[NSDateInterval alloc] initWithStartDate:oldDate endDate:newDate]; + + return [super initWithRootKey:key fabricID:fabricID validityPeriod:validityPeriod]; +} + +@end + +@interface MTRCertificateValidityTests : XCTestCase +@end + +static BOOL sNeedsStackShutdown = YES; + +@implementation MTRCertificateValidityTests + ++ (void)tearDown +{ + // Global teardown, runs once + if (sNeedsStackShutdown) { + // We don't need to worry about ResetCommissionee. If we get here, + // we're running only one of our test methods (using + // -only-testing:MatterTests/MTROTAProviderTests/testMethodName), since + // we did not run test999_TearDown. + [self shutdownStack]; + } +} + +- (void)setUp +{ + // Per-test setup, runs before each test. + [super setUp]; + [self setContinueAfterFailure:NO]; +} + +- (MTRBaseDevice *)commissionDeviceWithPayload:(NSString *)payloadString nodeID:(NSNumber *)nodeID +{ + XCTestExpectation * expectation = + [self expectationWithDescription:[NSString stringWithFormat:@"Commissioning Complete for %@", nodeID]]; + __auto_type * deviceControllerDelegate = [[MTRCertificateValidityTestControllerDelegate alloc] initWithExpectation:expectation + commissioneeNodeID:nodeID]; + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.device_controller_delegate", DISPATCH_QUEUE_SERIAL); + + [sController setDeviceControllerDelegate:deviceControllerDelegate queue:callbackQueue]; + + NSError * error; + __auto_type * payload = [MTRSetupPayload setupPayloadWithOnboardingPayload:payloadString error:&error]; + XCTAssertNotNil(payload); + XCTAssertNil(error); + + [sController setupCommissioningSessionWithPayload:payload newNodeID:nodeID error:&error]; + XCTAssertNil(error); + + [self waitForExpectations:@[ expectation ] timeout:kPairingTimeoutInSeconds]; + + return [MTRBaseDevice deviceWithNodeID:nodeID controller:sController]; +} + +- (void)initStack:(MTRTestCertificateIssuer *)certificateIssuer +{ + __auto_type * factory = [MTRDeviceControllerFactory sharedInstance]; + XCTAssertNotNil(factory); + + __auto_type * storage = [[MTRTestStorage alloc] init]; + + __auto_type * factoryParams = [[MTRDeviceControllerFactoryParams alloc] initWithStorage:storage]; + factoryParams.port = @(kLocalPort); + factoryParams.shouldStartServer = YES; + + BOOL ok = [factory startControllerFactory:factoryParams error:nil]; + XCTAssertTrue(ok); + + __auto_type * controllerOperationalKeys = [[MTRTestKeys alloc] init]; + XCTAssertNotNil(controllerOperationalKeys); + + __auto_type * controllerOperationalCert = + [certificateIssuer issueOperationalCertificateForNode:@(kControllerId) + operationalPublicKey:controllerOperationalKeys.publicKey]; + XCTAssertNotNil(controllerOperationalCert); + + __auto_type * params = [[MTRDeviceControllerStartupParams alloc] initWithIPK:certificateIssuer.rootKey.ipk + operationalKeypair:controllerOperationalKeys + operationalCertificate:controllerOperationalCert + intermediateCertificate:nil + rootCertificate:certificateIssuer.rootCertificate]; + XCTAssertNotNil(params); + + params.vendorID = @(kTestVendorId); + params.operationalCertificateIssuer = certificateIssuer; + params.operationalCertificateIssuerQueue = dispatch_get_main_queue(); + + MTRDeviceController * controller = [factory createControllerOnNewFabric:params error:nil]; + XCTAssertNotNil(controller); + + sController = controller; + + sConnectedDevice = [self commissionDeviceWithPayload:kOnboardingPayload nodeID:@(kDeviceId)]; +} + ++ (void)shutdownStack +{ + sNeedsStackShutdown = NO; + + MTRDeviceController * controller = sController; + [controller shutdown]; + XCTAssertFalse([controller isRunning]); + + [[MTRDeviceControllerFactory sharedInstance] stopControllerFactory]; +} + +- (void)test001_TestExpiredCertificates +{ + __auto_type * testKeys = [[MTRTestKeys alloc] init]; + XCTAssertNotNil(testKeys); + + __auto_type * certificateIssuer = [[MTRTestExpiredCertificateIssuer alloc] initWithRootKey:testKeys fabricID:@(1)]; + XCTAssertNotNil(certificateIssuer); + + [self initStack:certificateIssuer]; + + XCTestExpectation * toggleExpectation = [self expectationWithDescription:@"Toggle command executed"]; + + __auto_type * onOffCluster = [[MTRBaseClusterOnOff alloc] initWithDevice:sConnectedDevice + endpointID:@(1) + queue:dispatch_get_main_queue()]; + [onOffCluster toggleWithCompletion:^(NSError * _Nullable error) { + XCTAssertNil(error); + [toggleExpectation fulfill]; + }]; + [self waitForExpectations:@[ toggleExpectation ] timeout:kTimeoutInSeconds]; + + ResetCommissionee(sConnectedDevice, dispatch_get_main_queue(), self, kTimeoutInSeconds); + + [[self class] shutdownStack]; +} + +@end diff --git a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj index 2561d02229b67b..406bd64a9552f8 100644 --- a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj +++ b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj @@ -132,6 +132,7 @@ 511913FB28C100EF009235E9 /* MTRBaseSubscriptionCallback.mm in Sources */ = {isa = PBXBuildFile; fileRef = 511913F928C100EF009235E9 /* MTRBaseSubscriptionCallback.mm */; }; 511913FC28C100EF009235E9 /* MTRBaseSubscriptionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 511913FA28C100EF009235E9 /* MTRBaseSubscriptionCallback.h */; }; 5129BCFD26A9EE3300122DDF /* MTRError.h in Headers */ = {isa = PBXBuildFile; fileRef = 5129BCFC26A9EE3300122DDF /* MTRError.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 51339B1F2A0DA64D00C798C1 /* MTRCertificateValidityTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 51339B1E2A0DA64D00C798C1 /* MTRCertificateValidityTests.m */; }; 5136661328067D550025EDAE /* MTRDeviceController_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5136660F28067D540025EDAE /* MTRDeviceController_Internal.h */; }; 5136661428067D550025EDAE /* MTRDeviceControllerFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5136661028067D540025EDAE /* MTRDeviceControllerFactory.mm */; }; 5136661528067D550025EDAE /* MTRDeviceControllerFactory_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5136661128067D540025EDAE /* MTRDeviceControllerFactory_Internal.h */; }; @@ -418,6 +419,7 @@ 511913F928C100EF009235E9 /* MTRBaseSubscriptionCallback.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRBaseSubscriptionCallback.mm; sourceTree = ""; }; 511913FA28C100EF009235E9 /* MTRBaseSubscriptionCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRBaseSubscriptionCallback.h; sourceTree = ""; }; 5129BCFC26A9EE3300122DDF /* MTRError.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MTRError.h; sourceTree = ""; }; + 51339B1E2A0DA64D00C798C1 /* MTRCertificateValidityTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTRCertificateValidityTests.m; sourceTree = ""; }; 5136660F28067D540025EDAE /* MTRDeviceController_Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRDeviceController_Internal.h; sourceTree = ""; }; 5136661028067D540025EDAE /* MTRDeviceControllerFactory.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRDeviceControllerFactory.mm; sourceTree = ""; }; 5136661128067D540025EDAE /* MTRDeviceControllerFactory_Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRDeviceControllerFactory_Internal.h; sourceTree = ""; }; @@ -1060,6 +1062,7 @@ 51742B4D29CB6B88009974FE /* MTRPairingTests.m */, 5142E39729D377F000A206F0 /* MTROTAProviderTests.m */, 51A2F1312A00402A00F03298 /* MTRDataValueParserTests.m */, + 51339B1E2A0DA64D00C798C1 /* MTRCertificateValidityTests.m */, B202529D2459E34F00F97062 /* Info.plist */, ); path = CHIPTests; @@ -1458,6 +1461,7 @@ 99C65E10267282F1003402F6 /* MTRControllerTests.m in Sources */, 1E5801C328941C050033A199 /* MTRTestOTAProvider.m in Sources */, 5A6FEC9D27B5E48900F25F42 /* MTRXPCProtocolTests.m in Sources */, + 51339B1F2A0DA64D00C798C1 /* MTRCertificateValidityTests.m in Sources */, 5173A47929C0E82300F67F48 /* MTRFabricInfoTests.m in Sources */, 3D0C484B29DA4FA0006D811F /* MTRErrorTests.m in Sources */, 51742B4A29CB5FC1009974FE /* MTRTestResetCommissioneeHelper.m in Sources */, diff --git a/src/platform/Ameba/AmebaOTAImageProcessor.cpp b/src/platform/Ameba/AmebaOTAImageProcessor.cpp index 5db732fcff71d0..e605ba7741fb4a 100644 --- a/src/platform/Ameba/AmebaOTAImageProcessor.cpp +++ b/src/platform/Ameba/AmebaOTAImageProcessor.cpp @@ -400,6 +400,7 @@ void AmebaOTAImageProcessor::HandleApply(intptr_t context) if (imageProcessor == nullptr) { ChipLogError(SoftwareUpdate, "ImageProcessor context is null"); + GetRequestorInstance()->CancelImageUpdate(); return; } @@ -409,12 +410,14 @@ void AmebaOTAImageProcessor::HandleApply(intptr_t context) { ota_update_free(imageProcessor->pOtaTgtHdr); ChipLogError(SoftwareUpdate, "OTA update signature failed"); + GetRequestorInstance()->CancelImageUpdate(); return; } #elif defined(CONFIG_PLATFORM_8710C) if (update_ota_signature(imageProcessor->signature, imageProcessor->flash_addr) < 0) { ChipLogError(SoftwareUpdate, "OTA update signature failed"); + GetRequestorInstance()->CancelImageUpdate(); return; } #endif diff --git a/src/platform/ESP32/BUILD.gn b/src/platform/ESP32/BUILD.gn index 0e751e7f1455ae..66cf6279dfc6f8 100644 --- a/src/platform/ESP32/BUILD.gn +++ b/src/platform/ESP32/BUILD.gn @@ -90,6 +90,10 @@ static_library("ESP32") { ] } + if (chip_enable_ble_controller) { + sources += [ "ChipDeviceScanner.h" ] + } + if (chip_bt_nimble_enabled) { sources += [ "nimble/BLEManagerImpl.cpp" ] if (chip_enable_ble_controller) { diff --git a/src/platform/ESP32/ChipDeviceScanner.h b/src/platform/ESP32/ChipDeviceScanner.h index 90e866b52a2c41..8856dd3d160629 100644 --- a/src/platform/ESP32/ChipDeviceScanner.h +++ b/src/platform/ESP32/ChipDeviceScanner.h @@ -16,7 +16,6 @@ */ #pragma once -#if CONFIG_ENABLE_ESP32_BLE_CONTROLLER #include #include @@ -24,14 +23,13 @@ #if CONFIG_BT_NIMBLE_ENABLED #include "host/ble_hs.h" -#else +#elif CONFIG_BT_BLUEDROID_ENABLED #include "esp_bt.h" #include "esp_bt_main.h" #include "esp_gap_ble_api.h" #include "esp_gatt_common_api.h" #include "esp_gatt_defs.h" #include "esp_gattc_api.h" -#include "esp_gatts_api.h" #include "esp_log.h" #include "freertos/FreeRTOS.h" #include @@ -111,4 +109,3 @@ class ChipDeviceScanner } // namespace Internal } // namespace DeviceLayer } // namespace chip -#endif // CONFIG_ENABLE_ESP32_BLE_CONTROLLER diff --git a/src/platform/ESP32/Logging.cpp b/src/platform/ESP32/Logging.cpp index a8270cbddf1412..07ec4a1690bd40 100644 --- a/src/platform/ESP32/Logging.cpp +++ b/src/platform/ESP32/Logging.cpp @@ -30,7 +30,7 @@ void ENFORCE_FORMAT(3, 0) LogV(const char * module, uint8_t category, const char { case kLogCategory_Error: { { - printf(LOG_COLOR_E "E (%u) %s: ", esp_log_timestamp(), tag); + printf(LOG_COLOR_E "E (%" PRIu32 ") %s: ", esp_log_timestamp(), tag); esp_log_writev(ESP_LOG_ERROR, tag, msg, v); printf(LOG_RESET_COLOR "\n"); } @@ -40,7 +40,7 @@ void ENFORCE_FORMAT(3, 0) LogV(const char * module, uint8_t category, const char case kLogCategory_Progress: default: { { - printf(LOG_COLOR_I "I (%u) %s: ", esp_log_timestamp(), tag); + printf(LOG_COLOR_I "I (%" PRIu32 ") %s: ", esp_log_timestamp(), tag); esp_log_writev(ESP_LOG_INFO, tag, msg, v); printf(LOG_RESET_COLOR "\n"); } @@ -49,7 +49,7 @@ void ENFORCE_FORMAT(3, 0) LogV(const char * module, uint8_t category, const char case kLogCategory_Detail: { { - printf(LOG_COLOR_D "D (%u) %s: ", esp_log_timestamp(), tag); + printf(LOG_COLOR_D "D (%" PRIu32 ") %s: ", esp_log_timestamp(), tag); esp_log_writev(ESP_LOG_DEBUG, tag, msg, v); printf(LOG_RESET_COLOR "\n"); } diff --git a/src/platform/ESP32/bluedroid/BLEManagerImpl.cpp b/src/platform/ESP32/bluedroid/BLEManagerImpl.cpp index 46fca5f6982f2d..a43b3456e940e4 100644 --- a/src/platform/ESP32/bluedroid/BLEManagerImpl.cpp +++ b/src/platform/ESP32/bluedroid/BLEManagerImpl.cpp @@ -196,6 +196,7 @@ static struct gattc_profile_inst gl_profile_tab[PROFILE_NUM] = { .gattc_if = ESP_GATT_IF_NONE, /* Not get the gatt_if, so initial is ESP_GATT_IF_NONE */ }, }; +static esp_gatt_if_t chip_ctrl_gattc_if = 0; #endif CHIP_ERROR BLEManagerImpl::_Init() @@ -432,6 +433,15 @@ void BLEManagerImpl::gattc_profile_event_handler(esp_gattc_cb_event_t event, esp switch (event) { case ESP_GATTC_REG_EVT: + if (param->reg.status == ESP_GATT_OK) + { + chip_ctrl_gattc_if = gattc_if; + } + else + { + ChipLogProgress(Ble, "Reg app failed, app_id %04x, status 0x%x", param->reg.app_id, param->reg.status); + return; + } break; case ESP_GATTC_CONNECT_EVT: err = sInstance.HandleGAPConnect(*p_data); @@ -452,8 +462,7 @@ void BLEManagerImpl::gattc_profile_event_handler(esp_gattc_cb_event_t event, esp break; } ChipLogProgress(Ble, "discover service complete conn_id %d", param->dis_srvc_cmpl.conn_id); - esp_ble_gattc_search_service(gl_profile_tab[PROFILE_A_APP_ID].gattc_if, param->cfg_mtu.conn_id, - &remote_filter_service_uuid); + esp_ble_gattc_search_service(gattc_if, param->cfg_mtu.conn_id, &remote_filter_service_uuid); break; case ESP_GATTC_CFG_MTU_EVT: if (param->cfg_mtu.status != ESP_GATT_OK) @@ -502,8 +511,8 @@ void BLEManagerImpl::gattc_profile_event_handler(esp_gattc_cb_event_t event, esp uint16_t count = 0; uint16_t offset = 0; esp_gatt_status_t status = - esp_ble_gattc_get_attr_count(gl_profile_tab[PROFILE_A_APP_ID].gattc_if, p_data->search_cmpl.conn_id, - ESP_GATT_DB_CHARACTERISTIC, gl_profile_tab[PROFILE_A_APP_ID].service_start_handle, + esp_ble_gattc_get_attr_count(gattc_if, p_data->search_cmpl.conn_id, ESP_GATT_DB_CHARACTERISTIC, + gl_profile_tab[PROFILE_A_APP_ID].service_start_handle, gl_profile_tab[PROFILE_A_APP_ID].service_end_handle, INVALID_HANDLE, &count); if (status != ESP_GATT_OK) { @@ -522,10 +531,9 @@ void BLEManagerImpl::gattc_profile_event_handler(esp_gattc_cb_event_t event, esp } else { - status = esp_ble_gattc_get_all_char(gl_profile_tab[PROFILE_A_APP_ID].gattc_if, p_data->search_cmpl.conn_id, - gl_profile_tab[PROFILE_A_APP_ID].service_start_handle, - gl_profile_tab[PROFILE_A_APP_ID].service_end_handle, char_elem_result, - &count, offset); + status = esp_ble_gattc_get_all_char( + gattc_if, p_data->search_cmpl.conn_id, gl_profile_tab[PROFILE_A_APP_ID].service_start_handle, + gl_profile_tab[PROFILE_A_APP_ID].service_end_handle, char_elem_result, &count, offset); if (status != 0) { ChipLogProgress(Ble, "esp_ble_gattc_get_char_by_uuid error"); @@ -547,8 +555,7 @@ void BLEManagerImpl::gattc_profile_event_handler(esp_gattc_cb_event_t event, esp else if (char_elem_result[i].properties & CharProps_ReadNotify) { gl_profile_tab[PROFILE_A_APP_ID].notify_char_handle = char_elem_result[i].char_handle; - esp_ble_gattc_register_for_notify(gl_profile_tab[PROFILE_A_APP_ID].gattc_if, - gl_profile_tab[PROFILE_A_APP_ID].remote_bda, + esp_ble_gattc_register_for_notify(gattc_if, gl_profile_tab[PROFILE_A_APP_ID].remote_bda, char_elem_result[i].char_handle); } } @@ -572,7 +579,7 @@ void BLEManagerImpl::gattc_profile_event_handler(esp_gattc_cb_event_t event, esp { uint16_t count = 0; esp_gatt_status_t ret_status = esp_ble_gattc_get_attr_count( - gl_profile_tab[PROFILE_A_APP_ID].gattc_if, gl_profile_tab[PROFILE_A_APP_ID].conn_id, ESP_GATT_DB_DESCRIPTOR, + gattc_if, gl_profile_tab[PROFILE_A_APP_ID].conn_id, ESP_GATT_DB_DESCRIPTOR, gl_profile_tab[PROFILE_A_APP_ID].service_start_handle, gl_profile_tab[PROFILE_A_APP_ID].service_end_handle, gl_profile_tab[PROFILE_A_APP_ID].notify_char_handle, &count); if (ret_status != ESP_GATT_OK) @@ -589,9 +596,9 @@ void BLEManagerImpl::gattc_profile_event_handler(esp_gattc_cb_event_t event, esp else { memcpy(¬ify_descr_uuid.uuid.uuid16, ShortUUID_CHIPoBLE_CharTx_Desc, 2); - ret_status = esp_ble_gattc_get_descr_by_char_handle( - gl_profile_tab[PROFILE_A_APP_ID].gattc_if, gl_profile_tab[PROFILE_A_APP_ID].conn_id, - p_data->reg_for_notify.handle, notify_descr_uuid, descr_elem_result, &count); + ret_status = esp_ble_gattc_get_descr_by_char_handle(gattc_if, gl_profile_tab[PROFILE_A_APP_ID].conn_id, + p_data->reg_for_notify.handle, notify_descr_uuid, + descr_elem_result, &count); ChipLogProgress(Ble, "discoverd all chars and discr.........\n\n"); ChipDeviceEvent chipEvent; @@ -722,14 +729,14 @@ void BLEManagerImpl::HandleConnectFailed(CHIP_ERROR error) void BLEManagerImpl::CancelConnect(void) { - int rc = esp_ble_gattc_close(gl_profile_tab[PROFILE_A_APP_ID].gattc_if, connId); + int rc = esp_ble_gattc_close(chip_ctrl_gattc_if, connId); VerifyOrReturn(rc == 0, ChipLogError(Ble, "Failed to cancel connection rc=%d", rc)); } void BLEManagerImpl::ConnectDevice(esp_bd_addr_t & addr, esp_ble_addr_type_t addr_type, uint16_t timeout) { int rc; - rc = esp_ble_gattc_open(gl_profile_tab[PROFILE_A_APP_ID].gattc_if, addr, addr_type, true); + rc = esp_ble_gattc_open(chip_ctrl_gattc_if, addr, addr_type, true); if (rc != 0) { ChipLogError(Ble, "Failed to connect to rc=%d", rc); @@ -751,13 +758,12 @@ bool BLEManagerImpl::SubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, const value[0] = 0x02; value[1] = 0x00; - rc = esp_ble_gattc_write_char_descr(gl_profile_tab[PROFILE_A_APP_ID].gattc_if, gl_profile_tab[PROFILE_A_APP_ID].conn_id, - descr_elem_result[0].handle, sizeof(value), value, ESP_GATT_WRITE_TYPE_RSP, - ESP_GATT_AUTH_REQ_NONE); + rc = esp_ble_gattc_write_char_descr(chip_ctrl_gattc_if, gl_profile_tab[PROFILE_A_APP_ID].conn_id, descr_elem_result[0].handle, + sizeof(value), value, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE); if (rc != 0) { ChipLogError(Ble, "esp_ble_gattc_get_descr_by_char_handle failed: %d", rc); - esp_ble_gattc_close(gl_profile_tab[PROFILE_A_APP_ID].gattc_if, conId); + esp_ble_gattc_close(chip_ctrl_gattc_if, conId); return false; } ChipDeviceEvent event; @@ -780,13 +786,12 @@ bool BLEManagerImpl::UnsubscribeCharacteristic(BLE_CONNECTION_OBJECT conId, cons value[0] = 0x00; value[1] = 0x00; - rc = esp_ble_gattc_write_char_descr(gl_profile_tab[PROFILE_A_APP_ID].gattc_if, gl_profile_tab[PROFILE_A_APP_ID].conn_id, - descr_elem_result[0].handle, sizeof(value), value, ESP_GATT_WRITE_TYPE_RSP, - ESP_GATT_AUTH_REQ_NONE); + rc = esp_ble_gattc_write_char_descr(chip_ctrl_gattc_if, gl_profile_tab[PROFILE_A_APP_ID].conn_id, descr_elem_result[0].handle, + sizeof(value), value, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE); if (rc != 0) { ChipLogError(Ble, "ble_gattc_write_flat failed: %d", rc); - esp_ble_gattc_close(gl_profile_tab[PROFILE_A_APP_ID].gattc_if, conId); + esp_ble_gattc_close(chip_ctrl_gattc_if, conId); return false; } ChipDeviceEvent event; @@ -874,7 +879,7 @@ bool BLEManagerImpl::SendWriteRequest(BLE_CONNECTION_OBJECT conId, const ChipBle ChipLogProgress(Ble, "In send write request\n"); int rc; - rc = esp_ble_gattc_write_char(gl_profile_tab[PROFILE_A_APP_ID].gattc_if, gl_profile_tab[PROFILE_A_APP_ID].conn_id, + rc = esp_ble_gattc_write_char(chip_ctrl_gattc_if, gl_profile_tab[PROFILE_A_APP_ID].conn_id, gl_profile_tab[PROFILE_A_APP_ID].write_char_handle, pBuf->DataLength(), pBuf->Start(), ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE); if (rc != 0) @@ -1915,7 +1920,7 @@ CHIP_ERROR BLEManagerImpl::HandleGAPCentralConnect(esp_ble_gattc_cb_param_t p_da memcpy(gl_profile_tab[PROFILE_A_APP_ID].remote_bda, p_data.connect.remote_bda, sizeof(esp_bd_addr_t)); // Start the GATT discovery process - int rc = esp_ble_gattc_search_service(gl_profile_tab[PROFILE_A_APP_ID].gattc_if, connId, &remote_filter_service_uuid); + int rc = esp_ble_gattc_search_service(chip_ctrl_gattc_if, connId, &remote_filter_service_uuid); if (rc != 0) { HandleGAPConnectionFailed(); @@ -1935,7 +1940,7 @@ CHIP_ERROR BLEManagerImpl::HandleGAPConnect(esp_ble_gattc_cb_param_t p_data) gl_profile_tab[PROFILE_A_APP_ID].conn_id = p_data.connect.conn_id; connId = p_data.connect.conn_id; memcpy(gl_profile_tab[PROFILE_A_APP_ID].remote_bda, p_data.connect.remote_bda, sizeof(esp_bd_addr_t)); - rc = esp_ble_gattc_send_mtu_req(gl_profile_tab[PROFILE_A_APP_ID].gattc_if, p_data.connect.conn_id); + rc = esp_ble_gattc_send_mtu_req(chip_ctrl_gattc_if, p_data.connect.conn_id); if (rc != 0) { diff --git a/src/platform/ESP32/bluedroid/ChipDeviceScanner.cpp b/src/platform/ESP32/bluedroid/ChipDeviceScanner.cpp index cea4b9f8d42f14..81421cf8d5f79a 100644 --- a/src/platform/ESP32/bluedroid/ChipDeviceScanner.cpp +++ b/src/platform/ESP32/bluedroid/ChipDeviceScanner.cpp @@ -14,19 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#if CONFIG_ENABLE_ESP32_BLE_CONTROLLER #include -#include "esp_bt.h" -#include "esp_bt_main.h" -#include "esp_gap_ble_api.h" -#include "esp_gatt_common_api.h" -#include "esp_gatt_defs.h" -#include "esp_gattc_api.h" -#include "esp_gatts_api.h" -#include "esp_log.h" -#include "freertos/FreeRTOS.h" #include #include @@ -116,6 +106,7 @@ CHIP_ERROR ChipDeviceScanner::StopScan() ChipLogError(DeviceLayer, "ble_gap_disc_cancel failed: %d", rc); return CHIP_ERROR_INTERNAL; } + mIsScanning = false; mDelegate->OnScanComplete(); return CHIP_NO_ERROR; @@ -124,4 +115,3 @@ CHIP_ERROR ChipDeviceScanner::StopScan() } // namespace Internal } // namespace DeviceLayer } // namespace chip -#endif // CONFIG_ENABLE_ESP32_BLE_CONTROLLER diff --git a/src/platform/ESP32/nimble/BLEManagerImpl.cpp b/src/platform/ESP32/nimble/BLEManagerImpl.cpp index f92e4b10ce931d..52e86d4b050a7f 100644 --- a/src/platform/ESP32/nimble/BLEManagerImpl.cpp +++ b/src/platform/ESP32/nimble/BLEManagerImpl.cpp @@ -1653,6 +1653,7 @@ void BLEManagerImpl::OnDeviceScanned(const struct ble_hs_adv_fields & fields, co { if (!mBLEScanConfig.mDiscriminator.MatchesLongDiscriminator(info.GetDeviceDiscriminator())) { + printf("Discriminator didi not match \n"); return; } ChipLogProgress(Ble, "Device Discriminator match. Attempting to connect"); @@ -1667,7 +1668,10 @@ void BLEManagerImpl::OnDeviceScanned(const struct ble_hs_adv_fields & fields, co } mBLEScanConfig.mBleScanState = BleScanState::kConnecting; + chip::DeviceLayer::PlatformMgr().LockChipStack(); DeviceLayer::SystemLayer().StartTimer(System::Clock::Seconds16(kConnectTimeout), HandleConnectTimeout, nullptr); + chip::DeviceLayer::PlatformMgr().UnlockChipStack(); + mDeviceScanner.StopScan(); ConnectDevice(addr, kConnectTimeout); diff --git a/src/platform/Linux/bluez/AdapterIterator.cpp b/src/platform/Linux/bluez/AdapterIterator.cpp index 30825b6c372040..bc892247ac8986 100644 --- a/src/platform/Linux/bluez/AdapterIterator.cpp +++ b/src/platform/Linux/bluez/AdapterIterator.cpp @@ -21,6 +21,7 @@ #include #include +#include namespace chip { namespace DeviceLayer { @@ -45,23 +46,25 @@ AdapterIterator::~AdapterIterator() } } -void AdapterIterator::Initialize() +CHIP_ERROR AdapterIterator::Initialize(AdapterIterator * self) { // When creating D-Bus proxy object, the thread default context must be initialized. Otherwise, // all D-Bus signals will be delivered to the GLib global default main context. VerifyOrDie(g_main_context_get_thread_default() != nullptr); + CHIP_ERROR err = CHIP_NO_ERROR; GError * error = nullptr; - mManager = g_dbus_object_manager_client_new_for_bus_sync(G_BUS_TYPE_SYSTEM, G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE, - BLUEZ_INTERFACE, "/", bluez_object_manager_client_get_proxy_type, - nullptr /* unused user data in the Proxy Type Func */, - nullptr /*destroy notify */, nullptr /* cancellable */, &error); + self->mManager = g_dbus_object_manager_client_new_for_bus_sync(G_BUS_TYPE_SYSTEM, G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE, + BLUEZ_INTERFACE, "/", bluez_object_manager_client_get_proxy_type, + nullptr /* unused user data in the Proxy Type Func */, + nullptr /*destroy notify */, nullptr /* cancellable */, &error); - VerifyOrExit(mManager != nullptr, ChipLogError(DeviceLayer, "Failed to get DBUS object manager for listing adapters.")); + VerifyOrExit(self->mManager != nullptr, ChipLogError(DeviceLayer, "Failed to get DBUS object manager for listing adapters."); + err = CHIP_ERROR_INTERNAL); - mObjectList = g_dbus_object_manager_get_objects(mManager); - mCurrentListItem = mObjectList; + self->mObjectList = g_dbus_object_manager_get_objects(self->mManager); + self->mCurrentListItem = self->mObjectList; exit: if (error != nullptr) @@ -69,6 +72,8 @@ void AdapterIterator::Initialize() ChipLogError(DeviceLayer, "DBus error: %s", error->message); g_error_free(error); } + + return err; } bool AdapterIterator::Advance() @@ -124,7 +129,8 @@ bool AdapterIterator::Next() { if (mManager == nullptr) { - Initialize(); + CHIP_ERROR err = PlatformMgrImpl().GLibMatterContextInvokeSync(Initialize, this); + VerifyOrReturnError(err == CHIP_NO_ERROR, false, ChipLogError(DeviceLayer, "Failed to initialize adapter iterator")); } return Advance(); diff --git a/src/platform/Linux/bluez/AdapterIterator.h b/src/platform/Linux/bluez/AdapterIterator.h index be53995326f099..c06ea8cb97a73f 100644 --- a/src/platform/Linux/bluez/AdapterIterator.h +++ b/src/platform/Linux/bluez/AdapterIterator.h @@ -17,6 +17,8 @@ #pragma once +#include "lib/core/CHIPError.h" + #include "Types.h" #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE @@ -60,7 +62,7 @@ class AdapterIterator private: /// Sets up the DBUS manager and loads the list - void Initialize(); + static CHIP_ERROR Initialize(AdapterIterator * self); /// Loads the next value in the list. /// diff --git a/src/platform/Tizen/PosixConfig.cpp b/src/platform/Tizen/PosixConfig.cpp index fc65c24bf189a9..c8b2d36d8271bf 100644 --- a/src/platform/Tizen/PosixConfig.cpp +++ b/src/platform/Tizen/PosixConfig.cpp @@ -101,7 +101,16 @@ CHIP_ERROR PosixConfig::ReadConfigValue(Key key, uint64_t & val) CHIP_ERROR PosixConfig::ReadConfigValueStr(Key key, char * buf, size_t bufSize, size_t & outLen) { VerifyOrReturnError(buf != nullptr, CHIP_ERROR_INVALID_ARGUMENT); - return PersistedStorage::KeyValueStoreMgr().Get(key.Name, buf, bufSize, &outLen); + + auto err = PersistedStorage::KeyValueStoreMgr().Get(key.Name, buf, bufSize, &outLen); + VerifyOrReturnError(err == CHIP_NO_ERROR, err); + + // We are storing string values in the config store without + // the null terminator, so we need to add it here. + VerifyOrReturnError(bufSize >= outLen + 1, CHIP_ERROR_BUFFER_TOO_SMALL); + buf[outLen] = '\0'; + + return CHIP_NO_ERROR; } CHIP_ERROR PosixConfig::ReadConfigValueBin(Key key, uint8_t * buf, size_t bufSize, size_t & outLen) diff --git a/src/platform/android/AndroidChipPlatform-JNI.cpp b/src/platform/android/AndroidChipPlatform-JNI.cpp index f86482994cb308..b8fc9409636011 100644 --- a/src/platform/android/AndroidChipPlatform-JNI.cpp +++ b/src/platform/android/AndroidChipPlatform-JNI.cpp @@ -37,6 +37,7 @@ #include "AndroidChipPlatform-JNI.h" #include "BLEManagerImpl.h" +#include "BleConnectCallback-JNI.h" #include "CommissionableDataProviderImpl.h" #include "DiagnosticDataProviderImpl.h" #include "DnssdImpl.h" @@ -84,6 +85,9 @@ CHIP_ERROR AndroidChipPlatformJNI_OnLoad(JavaVM * jvm, void * reserved) SuccessOrExit(err); ChipLogProgress(DeviceLayer, "Java class references loaded."); + err = BleConnectCallbackJNI_OnLoad(jvm, reserved); + SuccessOrExit(err); + chip::InitializeTracing(); exit: @@ -99,6 +103,7 @@ CHIP_ERROR AndroidChipPlatformJNI_OnLoad(JavaVM * jvm, void * reserved) void AndroidChipPlatformJNI_OnUnload(JavaVM * jvm, void * reserved) { ChipLogProgress(DeviceLayer, "AndroidChipPlatform JNI_OnUnload() called"); + BleConnectCallbackJNI_OnUnload(jvm, reserved); chip::Platform::MemoryShutdown(); } diff --git a/src/platform/android/BLEManagerImpl.cpp b/src/platform/android/BLEManagerImpl.cpp index f2068dc5da7eb3..e811230c8638a6 100644 --- a/src/platform/android/BLEManagerImpl.cpp +++ b/src/platform/android/BLEManagerImpl.cpp @@ -125,7 +125,7 @@ void BLEManagerImpl::InitializeWithObject(jobject manager) env->ExceptionClear(); } - mOnNewConnectionMethod = env->GetMethodID(BLEManagerClass, "onNewConnection", "(I)V"); + mOnNewConnectionMethod = env->GetMethodID(BLEManagerClass, "onNewConnection", "(IZJJ)V"); if (mOnNewConnectionMethod == nullptr) { ChipLogError(DeviceLayer, "Failed to access BLEManager 'onNewConnection' method"); @@ -186,16 +186,19 @@ bool BLEManagerImpl::_IsAdvertising() CHIP_ERROR BLEManagerImpl::_SetAdvertisingMode(BLEAdvertisingMode mode) { + ChipLogDetail(DeviceLayer, "%s, %u", __FUNCTION__, static_cast(mode)); return CHIP_ERROR_NOT_IMPLEMENTED; } CHIP_ERROR BLEManagerImpl::_GetDeviceName(char * buf, size_t bufSize) { + ChipLogDetail(DeviceLayer, "%s, %s", __FUNCTION__, buf); return CHIP_ERROR_NOT_IMPLEMENTED; } CHIP_ERROR BLEManagerImpl::_SetDeviceName(const char * deviceName) { + ChipLogDetail(DeviceLayer, "%s, %s", __FUNCTION__, deviceName); return CHIP_ERROR_NOT_IMPLEMENTED; } @@ -449,6 +452,18 @@ void BLEManagerImpl::NotifyChipConnectionClosed(BLE_CONNECTION_OBJECT conId) // ===== start implement virtual methods on BleConnectionDelegate. +void BLEManagerImpl::OnConnectSuccess(void * appState, BLE_CONNECTION_OBJECT connObj) +{ + chip::DeviceLayer::StackLock lock; + BleConnectionDelegate::OnConnectionComplete(appState, connObj); +} + +void BLEManagerImpl::OnConnectFailed(void * appState, CHIP_ERROR err) +{ + chip::DeviceLayer::StackLock lock; + BleConnectionDelegate::OnConnectionError(appState, err); +} + void BLEManagerImpl::NewConnection(BleLayer * bleLayer, void * appState, const SetupDiscriminator & connDiscriminator) { chip::DeviceLayer::StackUnlock unlock; @@ -474,7 +489,10 @@ void BLEManagerImpl::NewConnection(BleLayer * bleLayer, void * appState, const S { discriminator = connDiscriminator.GetLongValue(); } - env->CallVoidMethod(mBLEManagerObject, mOnNewConnectionMethod, static_cast(discriminator)); + + env->CallVoidMethod(mBLEManagerObject, mOnNewConnectionMethod, static_cast(discriminator), + static_cast(connDiscriminator.IsShortDiscriminator()), reinterpret_cast(this), + reinterpret_cast(appState)); VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN); exit: diff --git a/src/platform/android/BLEManagerImpl.h b/src/platform/android/BLEManagerImpl.h index 4d6a6bf94613e9..57fe6e9a0ca217 100644 --- a/src/platform/android/BLEManagerImpl.h +++ b/src/platform/android/BLEManagerImpl.h @@ -52,6 +52,9 @@ class BLEManagerImpl final : public BLEManager, void InitializeWithObject(jobject managerObject); + void OnConnectSuccess(void * appState, BLE_CONNECTION_OBJECT connObj); + void OnConnectFailed(void * appState, CHIP_ERROR err); + private: // ===== Members that implement the BLEManager internal interface. diff --git a/src/platform/android/BUILD.gn b/src/platform/android/BUILD.gn index 8c49d86050aa87..05ab96b3e5258f 100644 --- a/src/platform/android/BUILD.gn +++ b/src/platform/android/BUILD.gn @@ -34,6 +34,7 @@ static_library("android") { "AndroidConfig.h", "BLEManagerImpl.cpp", "BLEManagerImpl.h", + "BleConnectCallback-JNI.cpp", "BlePlatformConfig.h", "CHIPDevicePlatformEvent.h", "CHIPP256KeypairBridge.cpp", @@ -81,6 +82,7 @@ android_library("java") { "java/chip/platform/AndroidChipPlatform.java", "java/chip/platform/AndroidChipPlatformException.java", "java/chip/platform/BleCallback.java", + "java/chip/platform/BleConnectCallback.java", "java/chip/platform/BleManager.java", "java/chip/platform/ChipMdnsCallback.java", "java/chip/platform/ChipMdnsCallbackImpl.java", diff --git a/src/platform/android/BleConnectCallback-JNI.cpp b/src/platform/android/BleConnectCallback-JNI.cpp new file mode 100644 index 00000000000000..fac0e255075b97 --- /dev/null +++ b/src/platform/android/BleConnectCallback-JNI.cpp @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2023 Project CHIP Authors + * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include +#include + +#include "BLEManagerImpl.h" + +using namespace chip; +using namespace chip::DeviceLayer::Internal; + +#define JNI_METHOD(RETURN, METHOD_NAME) extern "C" JNIEXPORT RETURN JNICALL Java_chip_platform_BleConnectCallback_##METHOD_NAME + +CHIP_ERROR BleConnectCallbackJNI_OnLoad(JavaVM * jvm, void * reserved) +{ + ChipLogProgress(DeviceLayer, "BleConnectCallbackJNI_OnLoad"); + return CHIP_NO_ERROR; +} + +void BleConnectCallbackJNI_OnUnload(JavaVM * jvm, void * reserved) {} + +JNI_METHOD(void, onConnectSuccess)(JNIEnv * env, jobject self, jlong managerImplPtr, jlong appStatePtr, jint connId) +{ +#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE + BLEManagerImpl * impl = reinterpret_cast(managerImplPtr); + void * appState = reinterpret_cast(appStatePtr); + impl->OnConnectSuccess(appState, reinterpret_cast(connId)); +#endif +} + +JNI_METHOD(void, onConnectFailed)(JNIEnv * env, jobject self, jlong managerImplPtr, jlong appStatePtr) +{ +#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE + BLEManagerImpl * impl = reinterpret_cast(managerImplPtr); + void * appState = reinterpret_cast(appStatePtr); + impl->OnConnectFailed(appState, BLE_ERROR_NO_CONNECTION_RECEIVED_CALLBACK); +#endif +} diff --git a/src/platform/android/BleConnectCallback-JNI.h b/src/platform/android/BleConnectCallback-JNI.h new file mode 100644 index 00000000000000..3d5c558a3257b4 --- /dev/null +++ b/src/platform/android/BleConnectCallback-JNI.h @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2020-2021 Project CHIP Authors + * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +/** + * @file + * Implementation of JNI bridge for CHIP Device Controller for Android apps + * + */ + +#pragma once + +CHIP_ERROR BleConnectCallbackJNI_OnLoad(JavaVM * jvm, void * reserved); + +void BleConnectCallbackJNI_OnUnload(JavaVM * jvm, void * reserved); diff --git a/src/platform/android/java/chip/platform/AndroidBleManager.java b/src/platform/android/java/chip/platform/AndroidBleManager.java index 3bc484985d231d..1d440b67b18da3 100644 --- a/src/platform/android/java/chip/platform/AndroidBleManager.java +++ b/src/platform/android/java/chip/platform/AndroidBleManager.java @@ -17,15 +17,30 @@ */ package chip.platform; +import android.bluetooth.BluetoothAdapter; +import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothGatt; import android.bluetooth.BluetoothGattCallback; import android.bluetooth.BluetoothGattCharacteristic; import android.bluetooth.BluetoothGattDescriptor; import android.bluetooth.BluetoothGattService; +import android.bluetooth.BluetoothManager; import android.bluetooth.BluetoothProfile; +import android.bluetooth.le.BluetoothLeScanner; +import android.bluetooth.le.ScanCallback; +import android.bluetooth.le.ScanFilter; +import android.bluetooth.le.ScanResult; +import android.bluetooth.le.ScanSettings; +import android.content.Context; import android.os.Build; +import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; +import android.os.ParcelUuid; import android.util.Log; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.UUID; @@ -63,115 +78,143 @@ private static class BleMtuDenylist { private BluetoothGattCallback mGattCallback; private AndroidChipPlatform mPlatform; + private Context mContext; + private BluetoothAdapter mBluetoothAdapter; + + private BleConnectCallback mBleConnectCallback; + + private BleConnectionHandler mConnectionHandler; + private ScanCallback mScanCallback; + + private static final int MSG_BLE_SCAN = 0; + private static final int MSG_BLE_CONNECT = 1; + private static final int MSG_BLE_CONNECT_SUCCESS = 2; + private static final int MSG_BLE_FAIL = 99; + + private static final int BLE_TIMEOUT_MS = 10000; + private static final int BLUETOOTH_ENABLE_TIMEOUT_MS = 1000; + + private static final String MSG_BUNDLE_SERVICE_DATA = "serviceData"; + private static final String MSG_BUNDLE_SERVICE_DATA_MASK = "serviceDataMask"; + + public AndroidBleManager(Context context) { + this(); + mContext = context; + @SuppressWarnings("unchecked") + BluetoothManager manager = + (BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE); + mBluetoothAdapter = manager.getAdapter(); + mConnectionHandler = new BleConnectionHandler(Looper.getMainLooper()); + } + public AndroidBleManager() { mConnections = new ArrayList<>(INITIAL_CONNECTIONS); - mGattCallback = - new BluetoothGattCallback() { - @Override - public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) { - int connId = 0; - - if (newState == BluetoothProfile.STATE_DISCONNECTED) { - connId = getConnId(gatt); - if (connId > 0) { - Log.d(TAG, "onConnectionStateChange Disconnected"); - mPlatform.handleConnectionError(connId); - } else { - Log.e(TAG, "onConnectionStateChange disconnected: no active connection"); - } - } - } + mGattCallback = new AndroidBluetoothGattCallback(); + } - @Override - public void onServicesDiscovered(BluetoothGatt gatt, int status) {} + class AndroidBluetoothGattCallback extends BluetoothGattCallback { + @Override + public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) { + int connId = 0; + + if (newState == BluetoothProfile.STATE_DISCONNECTED) { + connId = getConnId(gatt); + if (connId > 0) { + Log.d(TAG, "onConnectionStateChange Disconnected"); + mPlatform.handleConnectionError(connId); + } else { + Log.e(TAG, "onConnectionStateChange disconnected: no active connection"); + } + } + } - @Override - public void onCharacteristicRead( - BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {} + @Override + public void onServicesDiscovered(BluetoothGatt gatt, int status) {} + + @Override + public void onCharacteristicRead( + BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {} + + @Override + public void onCharacteristicWrite( + BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) { + byte[] svcIdBytes = convertUUIDToBytes(characteristic.getService().getUuid()); + byte[] charIdBytes = convertUUIDToBytes(characteristic.getUuid()); + + if (status != BluetoothGatt.GATT_SUCCESS) { + Log.e( + TAG, + "onCharacteristicWrite for " + + characteristic.getUuid().toString() + + " failed with status: " + + status); + return; + } - @Override - public void onCharacteristicWrite( - BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) { - byte[] svcIdBytes = convertUUIDToBytes(characteristic.getService().getUuid()); - byte[] charIdBytes = convertUUIDToBytes(characteristic.getUuid()); - - if (status != BluetoothGatt.GATT_SUCCESS) { - Log.e( - TAG, - "onCharacteristicWrite for " - + characteristic.getUuid().toString() - + " failed with status: " - + status); - return; - } - - int connId = getConnId(gatt); - if (connId > 0) { - mPlatform.handleWriteConfirmation( - connId, svcIdBytes, charIdBytes, status == BluetoothGatt.GATT_SUCCESS); - } else { - Log.e(TAG, "onCharacteristicWrite no active connection"); - return; - } - } + int connId = getConnId(gatt); + if (connId > 0) { + mPlatform.handleWriteConfirmation( + connId, svcIdBytes, charIdBytes, status == BluetoothGatt.GATT_SUCCESS); + } else { + Log.e(TAG, "onCharacteristicWrite no active connection"); + return; + } + } - @Override - public void onCharacteristicChanged( - BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) { - byte[] svcIdBytes = convertUUIDToBytes(characteristic.getService().getUuid()); - byte[] charIdBytes = convertUUIDToBytes(characteristic.getUuid()); - int connId = getConnId(gatt); - if (connId > 0) { - mPlatform.handleIndicationReceived( - connId, svcIdBytes, charIdBytes, characteristic.getValue()); - } else { - Log.e(TAG, "onCharacteristicChanged no active connection"); - return; - } - } + @Override + public void onCharacteristicChanged( + BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) { + byte[] svcIdBytes = convertUUIDToBytes(characteristic.getService().getUuid()); + byte[] charIdBytes = convertUUIDToBytes(characteristic.getUuid()); + int connId = getConnId(gatt); + if (connId > 0) { + mPlatform.handleIndicationReceived( + connId, svcIdBytes, charIdBytes, characteristic.getValue()); + } else { + Log.e(TAG, "onCharacteristicChanged no active connection"); + return; + } + } - @Override - public void onDescriptorWrite( - BluetoothGatt gatt, BluetoothGattDescriptor desc, int status) { - BluetoothGattCharacteristic characteristic = desc.getCharacteristic(); - - byte[] svcIdBytes = convertUUIDToBytes(characteristic.getService().getUuid()); - byte[] charIdBytes = convertUUIDToBytes(characteristic.getUuid()); - - if (status != BluetoothGatt.GATT_SUCCESS) { - Log.e( - TAG, - "onDescriptorWrite for " - + desc.getUuid().toString() - + " failed with status: " - + status); - } - - int connId = getConnId(gatt); - if (connId == 0) { - Log.e(TAG, "onDescriptorWrite no active connection"); - return; - } - - if (desc.getValue() == BluetoothGattDescriptor.ENABLE_INDICATION_VALUE) { - mPlatform.handleSubscribeComplete( - connId, svcIdBytes, charIdBytes, status == BluetoothGatt.GATT_SUCCESS); - } else if (desc.getValue() == BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE) { - mPlatform.handleSubscribeComplete( - connId, svcIdBytes, charIdBytes, status == BluetoothGatt.GATT_SUCCESS); - } else if (desc.getValue() == BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE) { - mPlatform.handleUnsubscribeComplete( - connId, svcIdBytes, charIdBytes, status == BluetoothGatt.GATT_SUCCESS); - } else { - Log.d(TAG, "Unexpected onDescriptorWrite()."); - } - } + @Override + public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor desc, int status) { + BluetoothGattCharacteristic characteristic = desc.getCharacteristic(); - @Override - public void onDescriptorRead( - BluetoothGatt gatt, BluetoothGattDescriptor desc, int status) {} - }; + byte[] svcIdBytes = convertUUIDToBytes(characteristic.getService().getUuid()); + byte[] charIdBytes = convertUUIDToBytes(characteristic.getUuid()); + + if (status != BluetoothGatt.GATT_SUCCESS) { + Log.e( + TAG, + "onDescriptorWrite for " + + desc.getUuid().toString() + + " failed with status: " + + status); + } + + int connId = getConnId(gatt); + if (connId == 0) { + Log.e(TAG, "onDescriptorWrite no active connection"); + return; + } + + if (desc.getValue() == BluetoothGattDescriptor.ENABLE_INDICATION_VALUE) { + mPlatform.handleSubscribeComplete( + connId, svcIdBytes, charIdBytes, status == BluetoothGatt.GATT_SUCCESS); + } else if (desc.getValue() == BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE) { + mPlatform.handleSubscribeComplete( + connId, svcIdBytes, charIdBytes, status == BluetoothGatt.GATT_SUCCESS); + } else if (desc.getValue() == BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE) { + mPlatform.handleUnsubscribeComplete( + connId, svcIdBytes, charIdBytes, status == BluetoothGatt.GATT_SUCCESS); + } else { + Log.d(TAG, "Unexpected onDescriptorWrite()."); + } + } + + @Override + public void onDescriptorRead(BluetoothGatt gatt, BluetoothGattDescriptor desc, int status) {} } @Override @@ -417,14 +460,229 @@ public void onNotifyChipConnectionClosed(int connId) { } @Override - public void onNewConnection(int discriminator) { + public void onNewConnection( + int discriminator, boolean isShortDiscriminator, long implPtr, long appStatePtr) { + Log.d(TAG, "onNewConnection : " + discriminator + ", " + isShortDiscriminator); + if (mContext == null) { + return; + } + mBleConnectCallback = new BleConnectCallback(implPtr, appStatePtr); + mConnectionHandler.sendEmptyMessageDelayed(MSG_BLE_FAIL, BLE_TIMEOUT_MS); + Message msg = mConnectionHandler.obtainMessage(); + msg.what = MSG_BLE_SCAN; + Bundle bundle = new Bundle(); + byte[] serviceData = getServiceData(discriminator); + byte[] serviceDataMask = getServiceDataMask(isShortDiscriminator); + bundle.putByteArray(MSG_BUNDLE_SERVICE_DATA, serviceData); + bundle.putByteArray(MSG_BUNDLE_SERVICE_DATA_MASK, serviceDataMask); + msg.setData(bundle); + if (!mBluetoothAdapter.isEnabled()) { + mBluetoothAdapter.enable(); + // TODO: Check Bluetooth enable intent + mConnectionHandler.sendMessageDelayed(msg, BLUETOOTH_ENABLE_TIMEOUT_MS); + return; + } + mConnectionHandler.sendMessage(msg); return; } + class BleConnectionHandler extends Handler { + public BleConnectionHandler(Looper looper) { + super(looper); + } + + @Override + public void handleMessage(Message msg) { + super.handleMessage(msg); + + switch (msg.what) { + case MSG_BLE_SCAN: + startBleScan(msg.getData()); + break; + case MSG_BLE_CONNECT: + stopBleScan(); + connectBLE(msg.obj); + break; + case MSG_BLE_CONNECT_SUCCESS: + bleConnectSuccess(msg.obj); + break; + case MSG_BLE_FAIL: + default: + stopBleScan(); + bleConnectFail(); + break; + } + } + } + + private void startBleScan(Bundle bundle) { + BluetoothLeScanner scanner = mBluetoothAdapter.getBluetoothLeScanner(); + if (scanner == null) { + Log.d(TAG, "No bluetooth scanner found"); + return; + } + + mScanCallback = + new ScanCallback() { + @Override + public void onScanResult(int callbackType, ScanResult result) { + BluetoothDevice device = result.getDevice(); + Log.i( + TAG, + "Bluetooth Device Scanned Addr: " + device.getAddress() + ", " + device.getName()); + Message msg = mConnectionHandler.obtainMessage(); + msg.what = MSG_BLE_CONNECT; + msg.obj = (Object) device; + mConnectionHandler.sendMessage(msg); + } + + @Override + public void onScanFailed(int errorCode) { + Log.e(TAG, "Scan failed " + errorCode); + } + }; + + byte[] serviceData = bundle.getByteArray(MSG_BUNDLE_SERVICE_DATA); + byte[] serviceDataMask = bundle.getByteArray(MSG_BUNDLE_SERVICE_DATA_MASK); + ScanFilter scanFilter = + new ScanFilter.Builder() + .setServiceData( + new ParcelUuid(UUID.fromString(CHIP_UUID)), serviceData, serviceDataMask) + .build(); + ScanSettings scanSettings = + new ScanSettings.Builder().setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY).build(); + Log.i(TAG, "Starting Bluetooth scan"); + scanner.startScan(Arrays.asList(scanFilter), scanSettings, mScanCallback); + } + + private void stopBleScan() { + if (mScanCallback != null) { + BluetoothLeScanner scanner = mBluetoothAdapter.getBluetoothLeScanner(); + if (scanner == null) { + Log.d(TAG, "No bluetooth scanner found"); + return; + } + scanner.stopScan(mScanCallback); + mScanCallback = null; + } + } + + private void connectBLE(Object bluetoothDeviceObj) { + if (bluetoothDeviceObj == null) { + return; + } + + // Fail Timer reset. + mConnectionHandler.removeMessages(MSG_BLE_FAIL); + mConnectionHandler.sendEmptyMessageDelayed(MSG_BLE_FAIL, BLE_TIMEOUT_MS); + + @SuppressWarnings("unchecked") + BluetoothDevice device = (BluetoothDevice) bluetoothDeviceObj; + + Log.i(TAG, "Connecting"); + BluetoothGatt gatt = device.connectGatt(mContext, false, new ConnectionGattCallback()); + } + + class ConnectionGattCallback extends AndroidBluetoothGattCallback { + @Override + public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) { + Log.i(TAG, "onConnectionStateChange status = " + status + ", newState= + " + newState); + super.onConnectionStateChange(gatt, status, newState); + if (newState == BluetoothProfile.STATE_CONNECTED && status == BluetoothGatt.GATT_SUCCESS) { + Log.i(TAG, "Discovering Services..."); + gatt.discoverServices(); + return; + } else if (newState == BluetoothProfile.STATE_DISCONNECTED) { + Log.i(TAG, "Services Disconnected"); + } + mConnectionHandler.sendEmptyMessage(MSG_BLE_FAIL); + } + + @Override + public void onServicesDiscovered(BluetoothGatt gatt, int status) { + Log.d(TAG, "onServicesDiscovered status = " + status); + super.onServicesDiscovered(gatt, status); + + Log.i(TAG, "Services Discovered"); + gatt.requestMtu(247); + } + + @Override + public void onMtuChanged(BluetoothGatt gatt, int mtu, int status) { + super.onMtuChanged(gatt, mtu, status); + String deviceName = ""; + if (gatt != null && gatt.getDevice() != null) { + deviceName = gatt.getDevice().getName(); + } + Log.d(TAG, deviceName + ".onMtuChanged: connecting to CHIP device : " + status); + + Message msg = mConnectionHandler.obtainMessage(); + msg.what = MSG_BLE_CONNECT_SUCCESS; + msg.obj = (Object) gatt; + + mConnectionHandler.sendMessage(msg); + } + } + + private void bleConnectSuccess(Object gattObj) { + Log.d(TAG, "bleConnectSuccess"); + mConnectionHandler.removeMessages(MSG_BLE_FAIL); + @SuppressWarnings("unchecked") + BluetoothGatt gatt = (BluetoothGatt) gattObj; + int connId = addConnection(gatt); + + setBleCallback( + new BleCallback() { + @Override + public void onCloseBleComplete(int connId) { + Log.d(TAG, "onCloseBleComplete : " + connId); + } + + @Override + public void onNotifyChipConnectionClosed(int connId) { + Log.d(TAG, "onNotifyChipConnectionClosed : " + connId); + } + }); + + if (mBleConnectCallback != null) { + mBleConnectCallback.onConnectSuccess(connId); + } else { + // Already fail returned + Log.d(TAG, "Already timeout"); + gatt.disconnect(); + removeConnection(connId); + } + mBleConnectCallback = null; + } + + private void bleConnectFail() { + Log.d(TAG, "bleConnectFail"); + if (mBleConnectCallback != null) { + mBleConnectCallback.onConnectFailed(); + } + mBleConnectCallback = null; + } + + private byte[] getServiceData(int discriminator) { + int opcode = 0; + int version = 0; + int versionDiscriminator = ((version & 0xf) << 12) | (discriminator & 0xfff); + return new byte[] { + (byte) (opcode & 0xFF), + (byte) (versionDiscriminator & 0xFF), + (byte) ((versionDiscriminator >> 8) & 0xFF) + }; + } + + private byte[] getServiceDataMask(boolean isShortDiscriminator) { + return new byte[] {(byte) 0xFF, (byte) (isShortDiscriminator ? 0x00 : 0xFF), (byte) 0xFF}; + } + // CLIENT_CHARACTERISTIC_CONFIG is the well-known UUID of the client characteristic descriptor // that has the flags for enabling and disabling notifications and indications. // c.f. https://www.bluetooth.org/en-us/specification/assigned-numbers/generic-attribute-profile private static String CLIENT_CHARACTERISTIC_CONFIG = "00002902-0000-1000-8000-00805f9b34fb"; + private static String CHIP_UUID = "0000FFF6-0000-1000-8000-00805F9B34FB"; private static byte[] convertUUIDToBytes(UUID uuid) { byte[] idBytes = new byte[16]; diff --git a/src/platform/android/java/chip/platform/BleConnectCallback.java b/src/platform/android/java/chip/platform/BleConnectCallback.java new file mode 100644 index 00000000000000..073a8b95594037 --- /dev/null +++ b/src/platform/android/java/chip/platform/BleConnectCallback.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2021 Project CHIP Authors + * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package chip.platform; + +public class BleConnectCallback { + private long implPtr; + private long appStatePtr; + + public BleConnectCallback(long implPtr, long appStatePtr) { + this.implPtr = implPtr; + this.appStatePtr = appStatePtr; + } + + public void onConnectSuccess(int connectionId) { + onConnectSuccess(implPtr, appStatePtr, connectionId); + } + + public void onConnectFailed() { + onConnectFailed(implPtr, appStatePtr); + } + + private native void onConnectSuccess(long implPtr, long appStatePtr, int connectionId); + + private native void onConnectFailed(long implPtr, long appStatePtr); +} diff --git a/src/platform/android/java/chip/platform/BleManager.java b/src/platform/android/java/chip/platform/BleManager.java index 687bd9e5d51fc2..34bcb662b139c5 100644 --- a/src/platform/android/java/chip/platform/BleManager.java +++ b/src/platform/android/java/chip/platform/BleManager.java @@ -56,5 +56,6 @@ public interface BleManager { void onNotifyChipConnectionClosed(int connId); // BleConnectionDelegate - void onNewConnection(int discriminator); + void onNewConnection( + int discriminator, boolean isShortDiscriminator, long implPtr, long appStatePtr); } diff --git a/src/platform/tests/TestConfigurationMgr.cpp b/src/platform/tests/TestConfigurationMgr.cpp index dafe5b209725a2..a113594868ad2c 100644 --- a/src/platform/tests/TestConfigurationMgr.cpp +++ b/src/platform/tests/TestConfigurationMgr.cpp @@ -449,7 +449,6 @@ static void TestConfigurationMgr_GetProductId(nlTestSuite * inSuite, void * inCo * Test Suite. It lists all the test functions. */ static const nlTest sTests[] = { - NL_TEST_DEF("Test PlatformMgr::Init", TestPlatformMgr_Init), #if !defined(NDEBUG) NL_TEST_DEF("Test PlatformMgr::RunUnitTest", TestPlatformMgr_RunUnitTest), @@ -466,8 +465,8 @@ static const nlTest sTests[] = { NL_TEST_DEF("Test ConfigurationMgr::GetVendorId", TestConfigurationMgr_GetVendorId), NL_TEST_DEF("Test ConfigurationMgr::GetProductName", TestConfigurationMgr_GetProductName), NL_TEST_DEF("Test ConfigurationMgr::GetProductId", TestConfigurationMgr_GetProductId), - NL_TEST_SENTINEL() -}; // namespace + NL_TEST_SENTINEL(), +}; /** * Set up the test suite. diff --git a/third_party/qpg_sdk/BUILD.gn b/third_party/qpg_sdk/BUILD.gn index c6565e4041e9ed..4d10e71fc00704 100755 --- a/third_party/qpg_sdk/BUILD.gn +++ b/third_party/qpg_sdk/BUILD.gn @@ -90,8 +90,6 @@ qpg_make_build("qpg_mbedtls_alt") { "-f", rebase_path(qpg_sdk_root, root_build_dir) + "/Libraries/Qorvo/mbedtls_alt/Makefile.mbedtls_alt_${qpg_target_ic}", - "MBEDTLS_REPO_DIR=" + rebase_path(chip_root, root_build_dir) + - "/third_party/mbedtls/repo", "WORKDIR=" + rebase_path(target_gen_dir, root_build_dir) + "/${qpg_sdk_lib_dir}/mbedtls_alt_${qpg_target_ic}", ] @@ -129,8 +127,6 @@ qpg_make_build("qpg_glue") { rebase_path(qpg_sdk_root, root_build_dir) + "/Libraries/Qorvo/MatterQorvoGlue/Makefile.MatterQorvoGlue_${qpg_target_ic}_libbuild", "FREERTOS_REPO_DIR=" + rebase_path(chip_root, root_build_dir) + "/third_party/freertos/repo", - "MBEDTLS_REPO_DIR=" + rebase_path(chip_root, root_build_dir) + - "/third_party/mbedtls/repo", "WORKDIR=" + rebase_path(target_gen_dir, root_build_dir) + "/${qpg_sdk_lib_dir}/MatterQorvoGlue", ] @@ -151,8 +147,6 @@ qpg_make_build("qpg_bootloader") { rebase_path(qpg_sdk_root, root_build_dir) + "/Libraries/Qorvo/Bootloader/Makefile.Bootloader_${qpg_target_ic}_compr_secure", "FREERTOS_REPO_DIR=" + rebase_path(chip_root, root_build_dir) + "/third_party/freertos/repo", - "MBEDTLS_REPO_DIR=" + rebase_path(chip_root, root_build_dir) + - "/third_party/mbedtls/repo", "WORKDIR=" + rebase_path(target_gen_dir, root_build_dir) + "/${qpg_sdk_lib_dir}/Bootloader_${qpg_target_ic}_compr_secure", "UMB_WORKDIR=" + rebase_path(target_gen_dir, root_build_dir) + @@ -181,8 +175,6 @@ qpg_make_build("qpg_openthread_glue") { rebase_path(qpg_sdk_root, root_build_dir) + "/Libraries/Qorvo/OpenThreadQorvoGlue/Makefile.OpenThreadQorvoGlue_${qpg_target_ic}_ftd", "FREERTOS_REPO_DIR=" + rebase_path(chip_root, root_build_dir) + "/third_party/freertos/repo", - "MBEDTLS_REPO_DIR=" + rebase_path(chip_root, root_build_dir) + - "/third_party/mbedtls/repo", "OPENTHREAD_REPO_DIR =" + rebase_path(chip_root, root_build_dir) + "/third_party/openthread/repo", "WORKDIR=" + rebase_path(target_gen_dir, root_build_dir) +