diff --git a/frameworks/ets/ani/src/datashare.rs b/frameworks/ets/ani/src/datashare.rs index 692a8b07662e47daa89872c35be89ed3235464a9..f8b1d7cae1d08c190d59fd9132e9d27a2edf7069 100644 --- a/frameworks/ets/ani/src/datashare.rs +++ b/frameworks/ets/ani/src/datashare.rs @@ -235,7 +235,7 @@ pub fn native_create<'local>( wrapper::ffi::DataShareNativeCreate(native_context, str_url, true, false); } - let ctor_signature = unsafe { CStr::from_bytes_with_nul_unchecked(b"J:V\0") }; + let ctor_signature = unsafe { CStr::from_bytes_with_nul_unchecked(b"l:\0") }; let datashare_class = env.find_class(DATA_SHARE).unwrap(); let datashare_obj = env .new_object_with_signature(&datashare_class, ctor_signature, (datashare_helper_ptr,)) diff --git a/frameworks/ets/ani/src/datashare_extension.rs b/frameworks/ets/ani/src/datashare_extension.rs index 0c9965ec444b1a56a51285dbc640e911bfee005a..b822db7eb8fc4a23519043fb15bd36b493024000 100644 --- a/frameworks/ets/ani/src/datashare_extension.rs +++ b/frameworks/ets/ani/src/datashare_extension.rs @@ -91,7 +91,7 @@ pub fn call_arkts_update( .find_method(&helper_class, do_update_method_name) .unwrap(); - let ctor_signature = unsafe { CStr::from_bytes_with_nul_unchecked(b"J:V\0") }; + let ctor_signature = unsafe { CStr::from_bytes_with_nul_unchecked(b"l:\0") }; let predicates_class = env.find_class(DATA_SHARE_PREDICATES).unwrap(); let arg1 = env.serialize(&uri).unwrap(); let arg2 = env @@ -122,7 +122,7 @@ pub fn call_arkts_delete( .unwrap(); let arg1 = env.serialize(&uri).unwrap(); - let ctor_signature = unsafe { CStr::from_bytes_with_nul_unchecked(b"J:V\0") }; + let ctor_signature = unsafe { CStr::from_bytes_with_nul_unchecked(b"l:\0") }; let predicates_class = env.find_class(DATA_SHARE_PREDICATES).unwrap(); let arg2 = env .new_object_with_signature(&predicates_class, ctor_signature, (predicates_ptr,)) @@ -153,7 +153,7 @@ pub fn call_arkts_query( .unwrap(); let arg1 = env.serialize(&uri).unwrap(); - let ctor_signature = unsafe { CStr::from_bytes_with_nul_unchecked(b"J:V\0") }; + let ctor_signature = unsafe { CStr::from_bytes_with_nul_unchecked(b"l:\0") }; let predicates_class = env.find_class(DATA_SHARE_PREDICATES).unwrap(); let arg2 = env .new_object_with_signature(&predicates_class, ctor_signature, (predicates_ptr,)) diff --git a/frameworks/ets/ani/src/lib.rs b/frameworks/ets/ani/src/lib.rs index 855147820b2c60bb6c961371110646207245a676..0f89cb78be675893f4ac16ee924fdbbd3996aa57 100644 --- a/frameworks/ets/ani/src/lib.rs +++ b/frameworks/ets/ani/src/lib.rs @@ -22,16 +22,16 @@ mod datashare_extension; const DATA_SHARE_PREDICATES: &CStr = unsafe { CStr::from_bytes_with_nul_unchecked( - b"L@ohos/data/dataSharePredicates/dataSharePredicates/DataSharePredicates;\0", + b"@ohos.data.dataSharePredicates.dataSharePredicates.DataSharePredicates\0", ) }; const DATA_SHARE: &CStr = unsafe { - CStr::from_bytes_with_nul_unchecked(b"L@ohos/data/dataShare/dataShare/DataShareHelperInner;\0") + CStr::from_bytes_with_nul_unchecked(b"@ohos.data.dataShare.dataShare.DataShareHelperInner\0") }; const DATA_SHARE_EXTENSION_HELPER: &CStr = unsafe { - CStr::from_bytes_with_nul_unchecked(b"L@ohos/application/DataShareExtensionAbility/dataShareExtensionAbilityHelper/CallbackWrap;\0") + CStr::from_bytes_with_nul_unchecked(b"@ohos.application.DataShareExtensionAbility.dataShareExtensionAbilityHelper.CallbackWrap\0") }; pub fn get_native_ptr<'local>(env: &AniEnv<'local>, obj: &AniObject) -> i64 { @@ -40,7 +40,7 @@ pub fn get_native_ptr<'local>(env: &AniEnv<'local>, obj: &AniObject) -> i64 { } ani_constructor!( - class "L@ohos/data/DataShareResultSet/DataShareResultSetInner" + class "@ohos.data.DataShareResultSet.DataShareResultSetInner" [ "goToFirstRow" : result_set::go_to_first_row, "goToLastRow" : result_set::go_to_last_row, @@ -51,7 +51,7 @@ ani_constructor!( "close" : result_set::close, ] - class "L@ohos/data/dataSharePredicates/dataSharePredicates/DataSharePredicates" + class "@ohos.data.dataSharePredicates.dataSharePredicates.DataSharePredicates" [ "create" : predicates::create, "equalTo" : predicates::native_equal_to, @@ -76,7 +76,7 @@ ani_constructor!( "in" : predicates::native_in, "notIn" : predicates::native_not_in, ] - namespace "L@ohos/data/dataShare/dataShare" + namespace "@ohos.data.dataShare.dataShare" [ "native_create": datashare::native_create, "native_query": datashare::native_query, @@ -96,20 +96,20 @@ ani_constructor!( "native_off_rdb_data_change": datashare::native_off_rdb_data_change, "native_off_published_data_change": datashare::native_off_published_data_change, ] - class "L@ohos/data/dataShare/dataShare/DataShareHelperInner" + class "@ohos.data.dataShare.dataShare.DataShareHelperInner" [ "addTemplate" : datashare::native_add_template, "delTemplate" : datashare::native_del_template, ] - class "L@ohos/data/dataSharePredicates/dataSharePredicates/Cleaner" + class "@ohos.data.dataSharePredicates.dataSharePredicates.Cleaner" [ "native_clean" : predicates::native_clean, ] - class "L@ohos/data/dataShare/dataShare/Cleaner" + class "@ohos.data.dataShare.dataShare.Cleaner" [ "native_clean" : datashare::native_clean, ] - namespace "L@ohos/application/DataShareExtensionAbility/dataShareExtensionAbilityHelper" + namespace "@ohos.application.DataShareExtensionAbility.dataShareExtensionAbilityHelper" [ "nativeExtensionCallbackInt": datashare_extension::native_extension_callback_int, "nativeExtensionCallbackObject": datashare_extension::native_extension_callback_object, diff --git a/frameworks/js/ani/common/src/ani_utils.cpp b/frameworks/js/ani/common/src/ani_utils.cpp index 42ffa9b5811a5b6444322a730b469b028e1a3cad..adb031d5a68bd304cf290a37e5cf098221fd6864 100644 --- a/frameworks/js/ani/common/src/ani_utils.cpp +++ b/frameworks/js/ani/common/src/ani_utils.cpp @@ -286,7 +286,7 @@ bool UnionAccessor::TryConvertArray(std::vector &value) } if (!IsInstanceOf("std.core.Boolean", static_cast(ref))) { - LOG_ERROR("Not found 'Lstd/core/Boolean;'"); + LOG_ERROR("Not found 'std.core.Boolean'"); return false; } @@ -313,13 +313,13 @@ bool UnionAccessor::TryConvertArray(std::vector &value) for (int i = 0; i < int(length); i++) { ani_ref ref; - if (ANI_OK != env_->Object_CallMethodByName_Ref(obj_, "$_get", "I:Lstd/core/Object;", &ref, (ani_int)i)) { + if (ANI_OK != env_->Object_CallMethodByName_Ref(obj_, "$_get", "i:C{std.core.Object}", &ref, (ani_int)i)) { LOG_ERROR("Object_GetPropertyByName_Ref failed"); return false; } if (!IsInstanceOf("std.core.Int", static_cast(ref))) { - LOG_ERROR("Not found 'Lstd/core/Double;'"); + LOG_ERROR("Not found 'std.core.Int'"); return false; } @@ -352,7 +352,7 @@ bool UnionAccessor::TryConvertArray(std::vector &value) } if (!IsInstanceOf("std.core.Double", static_cast(ref))) { - LOG_ERROR("Not found 'Lstd/core/Double;'"); + LOG_ERROR("Not found 'std.core.Double'"); return false; } @@ -410,7 +410,7 @@ bool UnionAccessor::TryConvertArray(std::vector &value } if (!IsInstanceOf("std.core.String", static_cast(ref))) { - LOG_ERROR("Not found 'Lstd/core/String;'"); + LOG_ERROR("Not found 'std.core.String'"); return false; } diff --git a/frameworks/js/ani/dataShare/src/ani_datashare_inner_observer.cpp b/frameworks/js/ani/dataShare/src/ani_datashare_inner_observer.cpp index 016bc257460033a6054442746f36bd602238bbe7..7d6cc5e6e21eed8d6ee57c014c8790c15dafa2ec 100644 --- a/frameworks/js/ani/dataShare/src/ani_datashare_inner_observer.cpp +++ b/frameworks/js/ani/dataShare/src/ani_datashare_inner_observer.cpp @@ -141,8 +141,8 @@ template ani_object ANIInnerObserver::Convert2TSValue(ani_env *env, const std::vector &values) { ani_class arrayCls; - if (ANI_OK != env->FindClass("C{escompat.Array}", &arrayCls)) { - LOG_ERROR("FindClass Lescompat/Array; Failed"); + if (ANI_OK != env->FindClass("escompat.Array", &arrayCls)) { + LOG_ERROR("FindClass escompat.Array Failed"); return nullptr; } diff --git a/frameworks/js/ani/dataShareResultSet/src/data_share_result_set.cpp b/frameworks/js/ani/dataShareResultSet/src/data_share_result_set.cpp index ada79057aa131c459747a799433236406afcb388..ff8069b59aef938311585b275fbc5adf09ccc245 100644 --- a/frameworks/js/ani/dataShareResultSet/src/data_share_result_set.cpp +++ b/frameworks/js/ani/dataShareResultSet/src/data_share_result_set.cpp @@ -44,7 +44,7 @@ static std::shared_ptr GetResultSet(ani_env *env, ani_object static void Close([[maybe_unused]] ani_env *env, [[maybe_unused]] ani_object obj) { - static const char *className = "L@ohos/data/DataShareResultSet/DataShareResultSetImpl;"; + static const char *className = "@ohos.data.DataShareResultSet.DataShareResultSetImpl"; auto classObj = GetResultSet(env, obj); if (classObj == nullptr) { LOG_ERROR("DataShareResultSet is NULL"); @@ -147,7 +147,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) } ani_class cls; - static const char *className = "L@ohos/data/DataShareResultSet/DataShareResultSetImpl;"; + static const char *className = "@ohos.data.DataShareResultSet.DataShareResultSetImpl"; if (ANI_OK != env->FindClass(className, &cls)) { LOG_ERROR("Not found class:%{public}s", className); return ANI_ERROR; diff --git a/frameworks/native/provider/src/sts_datashare_ext_ability_context.cpp b/frameworks/native/provider/src/sts_datashare_ext_ability_context.cpp index 020bac6ba974cfc85586a367ea2d013e765bf6eb..c26284c77d6c377ec6726f8586f1a1243cd0e52a 100644 --- a/frameworks/native/provider/src/sts_datashare_ext_ability_context.cpp +++ b/frameworks/native/provider/src/sts_datashare_ext_ability_context.cpp @@ -22,7 +22,7 @@ namespace OHOS { namespace DataShare { using namespace AbilityRuntime; -constexpr const char* CONTEXT_CLASS_NAME = "Lapplication/ExtensionContext/ExtensionContext;"; +constexpr const char* CONTEXT_CLASS_NAME = "application.ExtensionContext.ExtensionContext"; namespace { class StsDataShareExtAbilityContext final { public: @@ -53,7 +53,7 @@ ani_object CreateStsDataShareExtAbilityContext(ani_env *env, std::shared_ptrClass_FindMethod(cls, "", ":V", &method)) != ANI_OK) { + if ((status = env->Class_FindMethod(cls, "", ":", &method)) != ANI_OK) { LOG_ERROR("Failed to find constructor of %{public}s, status: %{public}d", CONTEXT_CLASS_NAME, status); return nullptr; }