openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-24 12:43:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

!19164 merge master into master

Browse Source 
add log

Created-by: littlejerry1
Commit-by: unknown
Merged-by: openharmony_ci
Description: **IssueNo**:
https://gitcode.com/openharmony/ability_ability_runtime/issues/15117

**Description**:
add log

**稳定性自检：**
ok

**安全编码自检：**
ok

**TDD Result**:
NA

**XTS Result**:
NA

### 是否已执行L0用例
- [ ] 已验证
- [ok] 不涉及。如不涉及，请写明理由


See merge request: openharmony/ability_ability_runtime!19164
This commit is contained in:
openharmony_ci
2026-05-01 07:35:06 +08:00
parent ed55526223 1a54b8cdc8
commit 6ee0928d08
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli_tool_framework/interfaces/cli_tool/src/sub_command_info.cpp
+9
View File
@@ -95,20 +95,24 @@ bool SubCommandInfo::ParseFromJson(const nlohmann::json &json, SubCommandInfo &s
{
// description is required and must be non-empty
if (!json.contains("description") || !json["description"].is_string()) {
TAG_LOGE(AAFwkTag::CLI_TOOL, "ParseFromJson failed: description is missing or not a string");
return false;
}
std::string description = json["description"];
if (description.empty()) {
TAG_LOGE(AAFwkTag::CLI_TOOL, "ParseFromJson failed: description is empty");
return false;
}
subCmd.description = description;
// requirePermissions is required and must be array
if (!json.contains("requirePermissions") || !json["requirePermissions"].is_array()) {
TAG_LOGE(AAFwkTag::CLI_TOOL, "ParseFromJson failed: requirePermissions is missing or not an array");
return false;
}
for (const auto &perm : json["requirePermissions"]) {
if (!perm.is_string()) {
TAG_LOGE(AAFwkTag::CLI_TOOL, "ParseFromJson failed: requirePermissions contains non-string item");
return false;
}
std::string permStr = perm;
@@ -119,12 +123,14 @@ bool SubCommandInfo::ParseFromJson(const nlohmann::json &json, SubCommandInfo &s
// inputSchema is required and must be JSON object
if (!json.contains("inputSchema") || !json["inputSchema"].is_object()) {
TAG_LOGE(AAFwkTag::CLI_TOOL, "ParseFromJson failed: inputSchema is missing or not a JSON object");
return false;
}
subCmd.inputSchema = json["inputSchema"].dump();
// outputSchema is required and must be JSON object
if (!json.contains("outputSchema") || !json["outputSchema"].is_object()) {
TAG_LOGE(AAFwkTag::CLI_TOOL, "ParseFromJson failed: outputSchema is missing or not a JSON object");
return false;
}
subCmd.outputSchema = json["outputSchema"].dump();
@@ -132,10 +138,12 @@ bool SubCommandInfo::ParseFromJson(const nlohmann::json &json, SubCommandInfo &s
// eventTypes is optional, but if present must be array of strings
if (json.contains("eventTypes")) {
if (!json["eventTypes"].is_array()) {
TAG_LOGE(AAFwkTag::CLI_TOOL, "ParseFromJson failed: eventTypes is not an array");
return false;
}
for (const auto &evt : json["eventTypes"]) {
if (!evt.is_string()) {
TAG_LOGE(AAFwkTag::CLI_TOOL, "ParseFromJson failed: eventTypes contains non-string item");
return false;
}
std::string evtStr = evt;
@@ -148,6 +156,7 @@ bool SubCommandInfo::ParseFromJson(const nlohmann::json &json, SubCommandInfo &s
// eventSchemas is optional, but if present must be JSON object
if (json.contains("eventSchemas")) {
if (!json["eventSchemas"].is_object()) {
TAG_LOGE(AAFwkTag::CLI_TOOL, "ParseFromJson failed: eventSchemas is not a JSON object");
return false;
}
subCmd.eventSchemas = json["eventSchemas"].dump();