-
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] Add the initial version of command parser (#…
…23242) * [java-matter-controller] Add the initial version of command parser * Address review comments * Address round two review comments * Address round three review comments * Address round four review comments
- Loading branch information
1 parent
8de6347
commit 1099242
Showing
13 changed files
with
746 additions
and
5 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
37 changes: 37 additions & 0 deletions
37
examples/java-matter-controller/java/src/com/matter/controller/Off.java
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,37 @@ | ||
/* | ||
* Copyright (c) 2022 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 com.matter.controller.commands.common.CredentialsIssuer; | ||
import com.matter.controller.commands.common.MatterCommand; | ||
import java.util.concurrent.atomic.AtomicLong; | ||
|
||
public final class Off extends MatterCommand { | ||
private final AtomicLong mNodeId = new AtomicLong(); | ||
private final AtomicLong mFabricId = new AtomicLong(); | ||
|
||
public Off(CredentialsIssuer credIssuerCmds) { | ||
super("off", credIssuerCmds); | ||
addArgument("nodeid", 0L, Long.MAX_VALUE, mNodeId, null); | ||
addArgument("fabricid", 0L, Long.MAX_VALUE, mFabricId, null); | ||
} | ||
|
||
@Override | ||
protected final void runCommand() {} | ||
} |
37 changes: 37 additions & 0 deletions
37
examples/java-matter-controller/java/src/com/matter/controller/On.java
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,37 @@ | ||
/* | ||
* Copyright (c) 2022 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 com.matter.controller.commands.common.CredentialsIssuer; | ||
import com.matter.controller.commands.common.MatterCommand; | ||
import java.util.concurrent.atomic.AtomicLong; | ||
|
||
public final class On extends MatterCommand { | ||
private final AtomicLong mNodeId = new AtomicLong(); | ||
private final AtomicLong mFabricId = new AtomicLong(); | ||
|
||
public On(CredentialsIssuer credIssuerCmds) { | ||
super("on", credIssuerCmds); | ||
addArgument("nodeid", 0, Long.MAX_VALUE, mNodeId, null); | ||
addArgument("fabricid", 0, Long.MAX_VALUE, mFabricId, null); | ||
} | ||
|
||
@Override | ||
protected final void runCommand() {} | ||
} |
134 changes: 134 additions & 0 deletions
134
examples/java-matter-controller/java/src/com/matter/controller/commands/common/Argument.java
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,134 @@ | ||
/* | ||
* Copyright (c) 2022 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.commands.common; | ||
|
||
import java.net.InetAddress; | ||
import java.net.UnknownHostException; | ||
import java.util.Optional; | ||
import java.util.concurrent.atomic.AtomicBoolean; | ||
import java.util.concurrent.atomic.AtomicInteger; | ||
import java.util.concurrent.atomic.AtomicLong; | ||
import javax.annotation.Nullable; | ||
|
||
public final class Argument { | ||
private final String mName; | ||
private final ArgumentType mType; | ||
private final long mMin; | ||
private final long mMax; | ||
private final Object mValue; | ||
private final Optional<String> mDesc; | ||
|
||
public Argument(String name, IPAddress value) { | ||
this.mName = name; | ||
this.mType = ArgumentType.ADDRESS; | ||
this.mMin = 0; | ||
this.mMax = 0; | ||
this.mValue = value; | ||
this.mDesc = Optional.empty(); | ||
} | ||
|
||
public Argument(String name, StringBuffer value, @Nullable String desc) { | ||
this.mName = name; | ||
this.mType = ArgumentType.STRING; | ||
this.mMin = 0; | ||
this.mMax = 0; | ||
this.mValue = value; | ||
this.mDesc = Optional.ofNullable(desc); | ||
} | ||
|
||
public Argument(String name, AtomicBoolean value, @Nullable String desc) { | ||
this.mName = name; | ||
this.mType = ArgumentType.BOOL; | ||
this.mMin = 0; | ||
this.mMax = 0; | ||
this.mValue = value; | ||
this.mDesc = Optional.ofNullable(desc); | ||
} | ||
|
||
public Argument(String name, short min, short max, AtomicInteger value, @Nullable String desc) { | ||
this.mName = name; | ||
this.mType = ArgumentType.NUMBER_INT16; | ||
this.mMin = min; | ||
this.mMax = max; | ||
this.mValue = value; | ||
this.mDesc = Optional.ofNullable(desc); | ||
} | ||
|
||
public Argument(String name, int min, int max, AtomicInteger value, @Nullable String desc) { | ||
this.mName = name; | ||
this.mType = ArgumentType.NUMBER_INT32; | ||
this.mMin = min; | ||
this.mMax = max; | ||
this.mValue = value; | ||
this.mDesc = Optional.ofNullable(desc); | ||
} | ||
|
||
public Argument(String name, long min, long max, AtomicLong value, @Nullable String desc) { | ||
this.mName = name; | ||
this.mType = ArgumentType.NUMBER_INT64; | ||
this.mMin = min; | ||
this.mMax = max; | ||
this.mValue = value; | ||
this.mDesc = Optional.ofNullable(desc); | ||
} | ||
|
||
public String getName() { | ||
return mName; | ||
} | ||
|
||
public ArgumentType getType() { | ||
return mType; | ||
} | ||
|
||
public Object getValue() { | ||
return mValue; | ||
} | ||
|
||
public Optional<String> getDesc() { | ||
return mDesc; | ||
} | ||
|
||
public void setValue(String value) { | ||
boolean isValidArgument = false; | ||
|
||
switch (mType) { | ||
case ATTRIBUTE: | ||
String str = (String) mValue; | ||
isValidArgument = value.equals(str); | ||
break; | ||
case NUMBER_INT32: | ||
AtomicInteger num = (AtomicInteger) mValue; | ||
num.set(Integer.parseInt(value)); | ||
isValidArgument = (num.intValue() >= mMin && num.intValue() <= mMax); | ||
break; | ||
case ADDRESS: | ||
try { | ||
IPAddress ipAddress = (IPAddress) mValue; | ||
ipAddress.setAddress(InetAddress.getByName(value)); | ||
} catch (UnknownHostException e) { | ||
isValidArgument = true; | ||
} | ||
break; | ||
} | ||
|
||
if (!isValidArgument) { | ||
throw new IllegalArgumentException("Invalid argument " + mName + ": " + value); | ||
} | ||
} | ||
} |
40 changes: 40 additions & 0 deletions
40
...s/java-matter-controller/java/src/com/matter/controller/commands/common/ArgumentType.java
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,40 @@ | ||
/* | ||
* Copyright (c) 2022 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.commands.common; | ||
|
||
public enum ArgumentType { | ||
NUMBER_INT8, | ||
NUMBER_INT16, | ||
NUMBER_INT32, | ||
NUMBER_INT64, | ||
FLOAT, | ||
DOUBLE, | ||
BOOL, | ||
STRING, | ||
CHARSTRING, | ||
OCTETSTRING, | ||
ATTRIBUTE, | ||
ADDRESS, | ||
COMPLEX, | ||
CUSTOM, | ||
VECTOR_BOOL, | ||
VECTOR16, | ||
VECTOR32, | ||
VECTOR_CUSTOM, | ||
} |
Oops, something went wrong.