From 0fb9b52d7ea016f3791134dc243642ccbf196e45 Mon Sep 17 00:00:00 2001 From: Denis Slynko Date: Sat, 13 Sep 2025 15:05:57 +0300 Subject: [PATCH] [ANI] Remove deprecated mangling Issue: #ICXUTL Change-Id: I937b9621f0e91dd7ffb50fd790a9888a0019d1dc Signed-off-by: Denis Slynko --- frameworks/ets/ani/cache_download/src/lib.rs | 2 +- .../ets/ani/request/src/api10/bridge.rs | 26 +++++++++---------- frameworks/ets/ani/request/src/api9/bridge.rs | 8 +++--- frameworks/ets/ani/request/src/lib.rs | 10 +++---- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/frameworks/ets/ani/cache_download/src/lib.rs b/frameworks/ets/ani/cache_download/src/lib.rs index 54ad9945..a75f4de4 100644 --- a/frameworks/ets/ani/cache_download/src/lib.rs +++ b/frameworks/ets/ani/cache_download/src/lib.rs @@ -14,7 +14,7 @@ mod bridge; mod cache_download; ani_rs::ani_constructor! { - namespace "L@ohos/request/cacheDownload/cacheDownload" + namespace "@ohos.request.cacheDownload.cacheDownload" [ "download" : cache_download::download, "cancel" : cache_download::cancel, diff --git a/frameworks/ets/ani/request/src/api10/bridge.rs b/frameworks/ets/ani/request/src/api10/bridge.rs index d62f3f6a..34d68371 100644 --- a/frameworks/ets/ani/request/src/api10/bridge.rs +++ b/frameworks/ets/ani/request/src/api10/bridge.rs @@ -16,7 +16,7 @@ use std::collections::HashMap; use request_core::config::{self, CommonTaskConfig, NetworkConfig, TaskConfig, Version}; use serde::{Deserialize, Serialize}; -#[ani_rs::ani(path = "L@ohos/request/request/agent/Action")] +#[ani_rs::ani(path = "@ohos.request.request.agent.Action")] pub enum Action { Download, Upload, @@ -50,7 +50,7 @@ impl From for Action { } } -#[ani_rs::ani(path = "L@ohos/request/request/agent/Mode")] +#[ani_rs::ani(path = "@ohos.request.request.agent.Mode")] pub enum Mode { Background, Foreground, @@ -84,7 +84,7 @@ impl From for Mode { } } -#[ani_rs::ani(path = "L@ohos/request/request/agent/Network")] +#[ani_rs::ani(path = "@ohos.request.request.agent.Network")] pub enum Network { Any, Wifi, @@ -111,12 +111,12 @@ impl From for Network { } } -#[ani_rs::ani(path = "L@ohos/request/request/agent/BroadcastEvent")] +#[ani_rs::ani(path = "@ohos.request.request.agent.BroadcastEvent")] pub enum BroadcastEvent { Complete, } -#[ani_rs::ani(path = "L@ohos/request/request/agent/FileSpecInner")] +#[ani_rs::ani(path = "@ohos.request.request.agent.FileSpecInner")] pub struct FileSpec { path: String, content_type: Option, @@ -140,12 +140,12 @@ impl From for request_core::file::FileSpec { #[derive(Serialize, Deserialize)] pub enum Value { S(String), - #[serde(rename = "L@ohos/request/request/agent/FileSpecInner;")] + #[serde(rename = "@ohos.request.request.agent.FileSpecInner")] FileSpec(FileSpec), Array(Vec), } -#[ani_rs::ani(path = "L@ohos/request/request/agent/FormItemInner")] +#[ani_rs::ani(path = "@ohos.request.request.agent.FormItemInner")] pub struct FormItem { name: String, value: Value, @@ -193,7 +193,7 @@ pub struct Config { pub notification: Option, } -#[ani_rs::ani(path = "L@ohos/request/request/agent/State")] +#[ani_rs::ani(path = "@ohos.request.request.agent.State")] pub enum State { Initialized = 0x00, Waiting = 0x10, @@ -256,7 +256,7 @@ impl From for State { } } -#[ani_rs::ani(path = "L@ohos/request/request/agent/ProgressInner")] +#[ani_rs::ani(path = "@ohos.request.request.agent.ProgressInner")] pub struct Progress { state: State, index: i32, @@ -289,7 +289,7 @@ impl From<&request_core::info::InfoProgress> for Progress { } } -#[ani_rs::ani(path = "L@ohos/request/request/agent/Faults")] +#[ani_rs::ani(path = "@ohos.request.request.agent.Faults")] pub enum Faults { Others = 0xFF, Disconnected = 0x00, @@ -326,7 +326,7 @@ impl From for request_core::filter::SearchFilter { } } -#[ani_rs::ani(path = "L@ohos/request/request/agent/TaskInfoInner")] +#[ani_rs::ani(path = "@ohos.request.request.agent.TaskInfoInner")] pub struct TaskInfo { pub uid: Option, pub bundle: Option, @@ -379,7 +379,7 @@ impl From for TaskInfo { } } -#[ani_rs::ani(path = "L@ohos/request/request/agent/HttpResponseInner")] +#[ani_rs::ani(path = "@ohos.request.request.agent.HttpResponseInner")] pub struct HttpResponse { version: String, status_code: i32, @@ -398,7 +398,7 @@ impl From<&request_core::info::Response> for HttpResponse { } } -#[ani_rs::ani(path = "L@ohos/request/request/agent/TaskInner")] +#[ani_rs::ani(path = "@ohos.request.request.agent.TaskInner")] pub struct Task { pub tid: String, } diff --git a/frameworks/ets/ani/request/src/api9/bridge.rs b/frameworks/ets/ani/request/src/api9/bridge.rs index 814b5bd4..2862140d 100644 --- a/frameworks/ets/ani/request/src/api9/bridge.rs +++ b/frameworks/ets/ani/request/src/api9/bridge.rs @@ -41,18 +41,18 @@ pub struct UploadConfig { pub data: Vec, } -#[ani_rs::ani(path = "L@ohos/request/request/DownloadTaskInner")] +#[ani_rs::ani(path = "@ohos.request.request.DownloadTaskInner")] pub struct DownloadTask { pub task_id: i64, } -#[ani_rs::ani(path = "L@ohos/request/request/UploadTaskInner")] +#[ani_rs::ani(path = "@ohos.request.request.UploadTaskInner")] pub struct UploadTask { pub task_id: i64, } #[allow(non_snake_case)] -#[ani_rs::ani(path = "L@ohos/request/request/DownloadInfoInner")] +#[ani_rs::ani(path = "@ohos.request.request.DownloadInfoInner")] pub struct DownloadInfo { pub description: String, pub downloaded_bytes: i64, @@ -67,7 +67,7 @@ pub struct DownloadInfo { pub download_total_bytes: i64, } -#[ani_rs::ani(path = "L@ohos/request/request/FileInner")] +#[ani_rs::ani(path = "@ohos.request.request.FileInner")] pub struct File { filename: String, name: String, diff --git a/frameworks/ets/ani/request/src/lib.rs b/frameworks/ets/ani/request/src/lib.rs index e6a68447..96a4040c 100644 --- a/frameworks/ets/ani/request/src/lib.rs +++ b/frameworks/ets/ani/request/src/lib.rs @@ -24,12 +24,12 @@ const TAG: &str = "RequestAni\0"; const DOMAIN: u32 = 0xD001C50; ani_constructor!( - namespace "L@ohos/request/request" + namespace "@ohos.request.request" [ "downloadFileSync": api9::download::download_file, "uploadFileSync": api9::upload::upload_file, ] - class "L@ohos/request/request/DownloadTaskInner" + class "@ohos.request.request.DownloadTaskInner" [ "onProgress": api9::callback::on_progress, "onEvent": api9::callback::on_event, @@ -40,11 +40,11 @@ ani_constructor!( "getTaskInfoSync": api9::download::get_task_info, "getTaskMimeTypeSync": api9::download::get_task_mime_type, ] - class "L@ohos/request/request/UploadTaskInner" + class "@ohos.request.request.UploadTaskInner" [ "deleteSync": api9::upload::delete, ] - namespace "L@ohos/request/request/agent" + namespace "@ohos.request.request.agent" [ "createSync": api10::agent::create, "getTaskSync": api10::agent::get_task, @@ -57,7 +57,7 @@ ani_constructor!( "attachGroupSync": api10::notification::attach_group, "deleteGroupSync": api10::notification::delete_group, ] - class "L@ohos/request/request/agent/TaskInner" + class "@ohos.request.request.agent.TaskInner" [ "startSync": api10::task::start, "pauseSync": api10::task::pause, -- Gitee