From 799781c6d8ff45c60d52369df07b20ab6678f7f2 Mon Sep 17 00:00:00 2001 From: igorlegalov Date: Mon, 30 Jun 2025 15:19:34 +0300 Subject: [PATCH] Remove NullishType alias Issue: https://gitee.com/open_harmony/dashboard?issue_id=ICH95I Testing: all pre-merge tests passed Co-authored-by: IvanTyulyandin Signed-off-by: igorlegalov --- ...ation.StaticSubscriberExtensionContext.ets | 4 +- .../ets/@ohos.commonEventManager.ets | 28 +++++----- .../ets/commonEvent/commonEventSubscriber.ets | 52 +++++++++---------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/interfaces/kits/ani/common_event/ets/@ohos.application.StaticSubscriberExtensionContext.ets b/interfaces/kits/ani/common_event/ets/@ohos.application.StaticSubscriberExtensionContext.ets index 8f7eaaab..ea0f48d9 100644 --- a/interfaces/kits/ani/common_event/ets/@ohos.application.StaticSubscriberExtensionContext.ets +++ b/interfaces/kits/ani/common_event/ets/@ohos.application.StaticSubscriberExtensionContext.ets @@ -55,7 +55,7 @@ export class StaticSubscriberExtensionContext extends ExtensionContext { startAbility(want: Want, callback: AsyncCallback): void { let task = taskpool.execute(this.nativeStartAbilitySync, want); - task.then((e: NullishType)=>{ + task.then((e: Any)=>{ callback(null, undefined); }, (error: Object): void => { let err: BusinessError = error as BusinessError; @@ -66,7 +66,7 @@ export class StaticSubscriberExtensionContext extends ExtensionContext { startAbility(want: Want): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let task = taskpool.execute(this.nativeStartAbilitySync, want); - task.then((e: NullishType): void => { + task.then((e: Any): void => { resolve(undefined); }, (error: Error): void => { hilog.error(0xD001202, TAG, 'nativeStartAbilitySync Promise error'); diff --git a/interfaces/kits/ani/common_event/ets/@ohos.commonEventManager.ets b/interfaces/kits/ani/common_event/ets/@ohos.commonEventManager.ets index 39e92f6e..a9b9d7b3 100644 --- a/interfaces/kits/ani/common_event/ets/@ohos.commonEventManager.ets +++ b/interfaces/kits/ani/common_event/ets/@ohos.commonEventManager.ets @@ -47,7 +47,7 @@ namespace commonEventManager { export function publish(event: string, callback: AsyncCallback): void { hilog.info(0x0000, TAG, 'publish called event: %{public}s', event); let task = taskpool.execute(commonEventManager.publishExecute, event); - task.then((e: NullishType)=>{ + task.then((e: Any)=>{ let resultCode: Int = e as Int; hilog.info(0x0000, TAG, 'publish call result:%{public}d.', resultCode.intValue()); if (resultCode == 0) { @@ -66,7 +66,7 @@ namespace commonEventManager { export function publish(event: string, options: CommonEventPublishData, callback: AsyncCallback): void { hilog.info(0x0000, TAG, 'publish with option call.'); let task = taskpool.execute(commonEventManager.publishWithOptionsExecute, event, options); - task.then((e: NullishType)=>{ + task.then((e: Any)=>{ let resultCode: Int = e as Int; hilog.info(0x0000, TAG, 'publish with option result:%{public}d.', resultCode.intValue()); if (resultCode == 0) { @@ -84,7 +84,7 @@ namespace commonEventManager { export function publishAsUser(event: string, userId: int, callback: AsyncCallback): void { let task = taskpool.execute(commonEventManager.publishAsUserExecute, event, userId); - task.then((e: NullishType)=>{ + task.then((e: Any)=>{ let resultCode: Int = e as Int; if (resultCode == 0) { callback(null, undefined); @@ -102,7 +102,7 @@ namespace commonEventManager { export function publishAsUser(event: string, userId: int, options: CommonEventPublishData, callback: AsyncCallback): void { let task = taskpool.execute(commonEventManager.publishAsUserWithOptionsExecute, event, userId, options); - task.then((e: NullishType)=>{ + task.then((e: Any)=>{ let resultCode: Int = e as Int; if (resultCode == 0) { callback(null, undefined); @@ -121,7 +121,7 @@ namespace commonEventManager { callback: AsyncCallback): void { hilog.info(0x0000, TAG, 'createSubscriber callback call.'); let task = taskpool.execute(commonEventManager.createSubscriberExecute, subscribeInfo); - task.then((e: NullishType)=>{ + task.then((e: Any)=>{ let result: CommonEventSubscriber = e as CommonEventSubscriber; hilog.info(0x0000, TAG, 'createSubscriber result.'); callback(null, result); @@ -137,7 +137,7 @@ namespace commonEventManager { let p = new Promise((resolve: (v: CommonEventSubscriber) => void, reject: (error: Error) => void) => { let p1 = taskpool.execute(commonEventManager.createSubscriberExecute, subscribeInfo); - p1.then((e :NullishType)=>{ + p1.then((e :Any)=>{ hilog.info(0x0000, TAG, 'createSubscriber Promise result.'); let result: CommonEventSubscriber = e as CommonEventSubscriber; resolve(result); @@ -156,7 +156,7 @@ namespace commonEventManager { export function subscribe(subscriber: CommonEventSubscriber, callback: AsyncCallback): void { hilog.info(0x0000, TAG, 'subscribe call.'); let task = taskpool.execute(commonEventManager.subscribeExecute, subscriber, callback); - task.then((e: NullishType)=>{ + task.then((e: Any)=>{ let resultCode: Int = e as Int; hilog.info(0x0000, TAG, 'subscribe result:%{public}d.', resultCode.intValue()); if (resultCode != 0) { @@ -174,7 +174,7 @@ namespace commonEventManager { hilog.info(0x0000, TAG, 'subscribeToEvent call.'); let p = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let task = taskpool.execute(commonEventManager.subscribeToEventExecute, subscriber, callback); - task.then((e: NullishType)=> { + task.then((e: Any)=> { let resultCode: Int = e as Int; hilog.info(0x0000, TAG, 'subscribeToEvent result: %{public}d.', resultCode.toInt()); if (resultCode != 0) { @@ -194,7 +194,7 @@ namespace commonEventManager { export function unsubscribe(subscriber: CommonEventSubscriber, callback?: AsyncCallback): void { hilog.info(0x0000, TAG, 'unsubscribe call.'); let task = taskpool.execute(commonEventManager.unsubscribeExecute, subscriber); - task.then((e: NullishType)=>{ + task.then((e: Any)=>{ let resultCode: Int = e as Int; hilog.info(0x0000, TAG, 'unsubscribe result:%{public}d.', resultCode.intValue()); if (callback != undefined) { @@ -219,7 +219,7 @@ namespace commonEventManager { throw errorParamInvalid; } let task = taskpool.execute(commonEventManager.removeStickyCommonEventExecute, event); - task.then((e: NullishType)=>{ + task.then((e: Any)=>{ let resultCode: Int = e as Int; hilog.info(0x0000, TAG, 'unsubscribe result:%{public}d.', resultCode.intValue()); if (resultCode == 0) { @@ -240,7 +240,7 @@ namespace commonEventManager { } let p = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let task = taskpool.execute(commonEventManager.removeStickyCommonEventExecute, event); - task.then((e: NullishType): void => { + task.then((e: Any): void => { let resultCode: Int = e as Int; if (resultCode == 0) { resolve(undefined); @@ -258,7 +258,7 @@ namespace commonEventManager { export function setStaticSubscriberState(enable: boolean, callback: AsyncCallback): void { let task = taskpool.execute(commonEventManager.setStaticSubscriberStateExecute, enable); - task.then((e: NullishType)=>{ + task.then((e: Any)=>{ let resultCode: Int = e as Int; if (resultCode == 0) { callback(null, undefined); @@ -275,7 +275,7 @@ namespace commonEventManager { export function setStaticSubscriberState(enable: boolean): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let task = taskpool.execute(commonEventManager.setStaticSubscriberStateExecute, enable); - task.then((e: NullishType): void => { + task.then((e: Any): void => { let resultCode: Int = e as Int; if (resultCode == 0) { resolve(undefined); @@ -294,7 +294,7 @@ namespace commonEventManager { export function setStaticSubscriberState(enable: boolean, events?: Array): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let task = taskpool.execute(commonEventManager.setStaticSubscriberStateWithEventsExecute, enable, events); - task.then((e: NullishType): void => { + task.then((e: Any): void => { let resultCode: Int = e as Int; if (resultCode == 0) { resolve(undefined); diff --git a/interfaces/kits/ani/common_event/ets/commonEvent/commonEventSubscriber.ets b/interfaces/kits/ani/common_event/ets/commonEvent/commonEventSubscriber.ets index fe348efd..4f977ece 100644 --- a/interfaces/kits/ani/common_event/ets/commonEvent/commonEventSubscriber.ets +++ b/interfaces/kits/ani/common_event/ets/commonEvent/commonEventSubscriber.ets @@ -92,7 +92,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { private static native transferToDynamicSubscriber(input: Object): Any; private static native transferToStaticSubscriber(input: Any): Object; - + static transferDynamic(input: Object): Any { return CommonEventSubscriberInner.transferToDynamicSubscriber(input); } @@ -102,7 +102,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public getCode(callback: AsyncCallback): void { let p = taskpool.execute((): int => { return this.nativeGetCode(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : int = data as int; callback(null, ret); }, (error: Error): void => { @@ -115,7 +115,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public getCode(): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): int => { return this.nativeGetCode(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : int = data as int; resolve(ret); }, (error: Error): void => { @@ -138,7 +138,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public setCode(code: int, callback: AsyncCallback): void { let pcode: Int = code as Int; let p = taskpool.execute((): int => { return this.nativeSetCode(pcode); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -150,7 +150,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { let pcode: Int = code as Int; let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): int => { return this.nativeSetCode(pcode); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -171,7 +171,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public getData(callback: AsyncCallback): void { let p = taskpool.execute((): string => { return this.nativeGetData(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : string = data as string; callback(null, ret); }, (error: Object): void => { @@ -183,7 +183,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public getData(): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback):void => { let p = taskpool.execute((): string => { return this.nativeGetData(); }); - p.then((data :NullishType): void => { + p.then((data :Any): void => { let ret : string = data as string; resolve(ret); }, (err:Error): void => { @@ -205,7 +205,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public setData(data: string, callback: AsyncCallback): void { let p = taskpool.execute((): int => { return this.nativeSetData(data); }); - p.then((e: NullishType): void => { + p.then((e: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -216,7 +216,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public setData(data: string): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): int => { return this.nativeSetData(data); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -237,7 +237,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public setCodeAndData(code: int, data: string, callback: AsyncCallback): void { let pcode: Int = code as Int; let p = taskpool.execute((): int => { return this.nativeSetCodeAndData(pcode, data); }); - p.then((e: NullishType): void => { + p.then((e: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -249,7 +249,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { let pcode: Int = code as Int; let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): int => { return this.nativeSetCodeAndData(pcode, data); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -270,7 +270,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public isOrderedCommonEvent(callback: AsyncCallback): void { let p = taskpool.execute((): boolean => { return this.nativeIsOrderedCommonEvent(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -283,7 +283,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public isOrderedCommonEvent(): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return this.nativeIsOrderedCommonEvent(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -304,7 +304,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public isStickyCommonEvent(callback: AsyncCallback): void { let p = taskpool.execute((): boolean => { return this.nativeIsStickyCommonEvent(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -317,7 +317,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public isStickyCommonEvent(): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return this.nativeIsStickyCommonEvent(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -338,7 +338,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public abortCommonEvent(callback: AsyncCallback): void { let p = taskpool.execute((): int => { return this.nativeAbortCommonEvent(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -349,7 +349,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public abortCommonEvent(): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): int => { return this.nativeAbortCommonEvent(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -369,7 +369,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public clearAbortCommonEvent(callback: AsyncCallback): void { let p = taskpool.execute((): int => { return this.nativeClearAbortCommonEvent(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -380,7 +380,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public clearAbortCommonEvent(): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): int => { return this.nativeClearAbortCommonEvent(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -400,7 +400,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public getAbortCommonEvent(callback: AsyncCallback): void { let p = taskpool.execute((): boolean => { return this.nativeGetAbortCommonEvent(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; callback(null, ret); }, (error: Error): void => { @@ -413,7 +413,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public getAbortCommonEvent(): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): boolean => { return this.nativeGetAbortCommonEvent(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : boolean = data as boolean; resolve(ret); }, (error: Error): void => { @@ -435,7 +435,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public getSubscribeInfo(callback: AsyncCallback): void { let p = taskpool.execute((): CommonEventSubscribeInfo => { return this.nativeGetSubscribeInfo(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : CommonEventSubscribeInfo = data as CommonEventSubscribeInfo; callback(null, ret); }, (error: Error): void => { @@ -449,7 +449,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): CommonEventSubscribeInfo => { return this.nativeGetSubscribeInfo(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { let ret : CommonEventSubscribeInfo = data as CommonEventSubscribeInfo; resolve(ret); }, (error: Error): void => { @@ -465,7 +465,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public finishCommonEvent(callback: AsyncCallback): void { let p = taskpool.execute((): int => { return this.nativeFinishCommonEvent(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { callback(null, undefined); }, (error: Error): void => { let err: BusinessError = error as BusinessError; @@ -476,7 +476,7 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { public finishCommonEvent(): Promise { let pPromise = new Promise((resolve: ResolveCallback, reject: RejectCallback): void => { let p = taskpool.execute((): int => { return this.nativeFinishCommonEvent(); }); - p.then((data: NullishType): void => { + p.then((data: Any): void => { resolve(undefined); }, (error: Error): void => { reject(error); @@ -498,4 +498,4 @@ class CommonEventSubscriberInner implements CommonEventSubscriber { this.cleaner = new Cleaner(ptr) destroyRegister.register(this, this.cleaner!, unregisterToken); } -} \ No newline at end of file +} -- Gitee