-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[java-matter-controller] Convert from java to kotlin
- Loading branch information
1 parent
7a62c12
commit c9193a3
Showing
63 changed files
with
1,760 additions
and
1,777 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| Main-Class: com.matter.controller.Main | ||
| Class-Path: ../lib/third_party/connectedhomeip/src/controller/java/CHIPController.jar ../lib/third_party/connectedhomeip/src/setup_payload/java/SetupPayloadParser.jar ../lib/third_party/connectedhomeip/third_party/java_deps/stub_src/Android.jar ../lib/third_party/connectedhomeip/third_party/java_deps/json-20220924.jar ../lib/third_party/connectedhomeip/third_party/java_deps/jsr305-3.0.2.jar | ||
| Main-Class: com.matter.controller.MainKt | ||
| Class-Path: ../lib/third_party/connectedhomeip/src/controller/java/CHIPController.jar ../lib/third_party/connectedhomeip/src/setup_payload/java/SetupPayloadParser.jar ../lib/third_party/connectedhomeip/third_party/java_deps/stub_src/Android.jar ../lib/third_party/connectedhomeip/third_party/java_deps/json-20220924.jar ../lib/third_party/connectedhomeip/third_party/java_deps/jsr305-3.0.2.jar ../lib/third_party/connectedhomeip/third_party/java_deps/kotlin-stdlib-1.3.31.jar | ||
|
|
100 changes: 100 additions & 0 deletions
100
examples/java-matter-controller/java/src/com/matter/controller/Main.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /* | ||
| * 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. | ||
| * | ||
| */ | ||
| package com.matter.controller | ||
|
|
||
| import chip.devicecontroller.ChipDeviceController | ||
| import chip.devicecontroller.ControllerParams | ||
| import com.matter.controller.commands.common.* | ||
| import com.matter.controller.commands.discover.* | ||
| import com.matter.controller.commands.pairing.* | ||
| import java.util.ArrayList | ||
|
|
||
| private fun registerCommandsDiscover( | ||
| controller: ChipDeviceController, | ||
| commandManager: CommandManager, | ||
| credentialsIssuer: CredentialsIssuer | ||
| ) { | ||
| val clusterCommands: ArrayList<Command> = ArrayList<Command>() | ||
| val discoverCommand = DiscoverCommand(controller, credentialsIssuer) | ||
| val discoverCommissionablesCommand = DiscoverCommissionablesCommand(controller, credentialsIssuer) | ||
| val discoverCommissionersCommand = DiscoverCommissionersCommand(controller, credentialsIssuer) | ||
| clusterCommands.add(discoverCommand) | ||
| clusterCommands.add(discoverCommissionablesCommand) | ||
| clusterCommands.add(discoverCommissionersCommand) | ||
| commandManager.register("discover", clusterCommands) | ||
| } | ||
|
|
||
| private fun registerCommandsPairing( | ||
| controller: ChipDeviceController, | ||
| commandManager: CommandManager, | ||
| credentialsIssuer: CredentialsIssuer | ||
| ) { | ||
| val clusterCommands: ArrayList<Command> = ArrayList<Command>() | ||
| val unpairCommand = UnpairCommand(controller, credentialsIssuer) | ||
| val pairCodeCommand = PairCodeCommand(controller, credentialsIssuer) | ||
| val pairCodePaseCommand = PairCodePaseCommand(controller, credentialsIssuer) | ||
| val pairCodeWifiCommand = PairCodeWifiCommand(controller, credentialsIssuer) | ||
| val pairCodeThreadCommand = PairCodeThreadCommand(controller, credentialsIssuer) | ||
| val pairAddressPaseCommand = PairAddressPaseCommand(controller, credentialsIssuer) | ||
| val pairAlreadyDiscoveredCommand = PairAlreadyDiscoveredCommand(controller, credentialsIssuer) | ||
| val pairOnNetworkCommand = PairOnNetworkCommand(controller, credentialsIssuer) | ||
| val pairOnNetworkShortCommand = PairOnNetworkShortCommand(controller, credentialsIssuer) | ||
| val pairOnNetworkLongCommand = PairOnNetworkLongCommand(controller, credentialsIssuer) | ||
| val pairOnNetworkVendorCommand = PairOnNetworkVendorCommand(controller, credentialsIssuer) | ||
| val pairOnNetworkCommissioningModeCommand = PairOnNetworkCommissioningModeCommand(controller, credentialsIssuer) | ||
| val pairOnNetworkCommissionerCommand = PairOnNetworkCommissionerCommand(controller, credentialsIssuer) | ||
| val pairOnNetworkDeviceTypeCommand = PairOnNetworkDeviceTypeCommand(controller, credentialsIssuer) | ||
| val pairOnNetworkInstanceNameCommand = PairOnNetworkInstanceNameCommand(controller, credentialsIssuer) | ||
| clusterCommands.add(unpairCommand) | ||
| clusterCommands.add(pairCodeCommand) | ||
| clusterCommands.add(pairCodePaseCommand) | ||
| clusterCommands.add(pairCodeWifiCommand) | ||
| clusterCommands.add(pairCodeThreadCommand) | ||
| clusterCommands.add(pairAddressPaseCommand) | ||
| clusterCommands.add(pairAlreadyDiscoveredCommand) | ||
| clusterCommands.add(pairOnNetworkCommand) | ||
| clusterCommands.add(pairOnNetworkShortCommand) | ||
| clusterCommands.add(pairOnNetworkLongCommand) | ||
| clusterCommands.add(pairOnNetworkVendorCommand) | ||
| clusterCommands.add(pairOnNetworkCommissioningModeCommand) | ||
| clusterCommands.add(pairOnNetworkCommissionerCommand) | ||
| clusterCommands.add(pairOnNetworkDeviceTypeCommand) | ||
| clusterCommands.add(pairOnNetworkInstanceNameCommand) | ||
| commandManager.register("pairing", clusterCommands) | ||
| } | ||
|
|
||
| fun main(args: Array<String>) { | ||
| val controller = ChipDeviceController( | ||
| ControllerParams.newBuilder() | ||
| .setUdpListenPort(0) | ||
| .setControllerVendorId(0xFFF1) | ||
| .setCountryCode("US") | ||
| .build() | ||
| ) | ||
| val credentialsIssuer = CredentialsIssuer() | ||
| val commandManager = CommandManager() | ||
| registerCommandsDiscover(controller, commandManager, credentialsIssuer) | ||
| registerCommandsPairing(controller, commandManager, credentialsIssuer) | ||
| try { | ||
| commandManager.run(args) | ||
| } catch (e: Exception) { | ||
| println("Run command failed with exception: " + e.message) | ||
| System.exit(1) | ||
| } | ||
| controller.shutdownCommissioning() | ||
| } |
164 changes: 0 additions & 164 deletions
164
examples/java-matter-controller/java/src/com/matter/controller/commands/common/Argument.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.