From c371a6f5f9d30c2439cb778c8077444ea8724e89 Mon Sep 17 00:00:00 2001 From: igorlegalov Date: Mon, 30 Jun 2025 16:43:32 +0300 Subject: [PATCH] Remove NullishType alias Issue: https://gitee.com/open_harmony/dashboard?issue_id=ICW8Y8 Testing: all pre-merge tests passed Co-authored-by: IvanTyulyandin Signed-off-by: igorlegalov --- .../ets/@ohos.resourceManager.ets | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/interfaces/ets/ani/resourceManager/ets/@ohos.resourceManager.ets b/interfaces/ets/ani/resourceManager/ets/@ohos.resourceManager.ets index d92f945..beb8e96 100644 --- a/interfaces/ets/ani/resourceManager/ets/@ohos.resourceManager.ets +++ b/interfaces/ets/ani/resourceManager/ets/@ohos.resourceManager.ets @@ -260,7 +260,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): string => { return this.getStringSync(resId); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as string); }).catch((err: Error): void => { callback(err as BusinessError, undefined); @@ -271,7 +271,7 @@ export default namespace resourceManager { return new Promise((resolve, reject) => { taskpool.execute((): string => { return this.getStringSync(resId); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as string); }, (err: Error): void => { reject(err); @@ -283,7 +283,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): Array => { return this.getStringArrayValueSync(resId); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as Array); }).catch((err: Error): void => { callback(err as BusinessError, undefined); @@ -294,7 +294,7 @@ export default namespace resourceManager { return new Promise>((resolve, reject) => { taskpool.execute((): Array => { return this.getStringArrayValueSync(resId); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as Array); }, (err: Error): void => { reject(err); @@ -306,7 +306,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): DeviceCapability => { return this.getDeviceCapabilitySync(); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as DeviceCapability); }).catch((err: Error): void => { callback(err as BusinessError, undefined); @@ -317,7 +317,7 @@ export default namespace resourceManager { return new Promise((resolve, reject) => { taskpool.execute((): DeviceCapability => { return this.getDeviceCapabilitySync(); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as DeviceCapability); }, (err: Error): void => { reject(err); @@ -329,7 +329,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): Configuration => { return this.getConfigurationSync(); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as Configuration); }).catch((err: Error): void => { callback(err as BusinessError, undefined); @@ -340,7 +340,7 @@ export default namespace resourceManager { return new Promise((resolve, reject) => { taskpool.execute((): Configuration => { return this.getConfigurationSync(); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as Configuration); }, (err: Error): void => { reject(err); @@ -352,7 +352,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): string => { return this.getStringByNameSync(resName); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as string); }).catch((err: Error): void => { callback(err as BusinessError, undefined); @@ -363,7 +363,7 @@ export default namespace resourceManager { return new Promise((resolve, reject) => { taskpool.execute((): string => { return this.getStringByNameSync(resName); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as string); }, (err: Error): void => { reject(err); @@ -375,7 +375,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): Array => { return this.getStringArrayByNameSync(resName); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as Array); }).catch((err: Error): void => { callback(err as BusinessError, undefined); @@ -386,7 +386,7 @@ export default namespace resourceManager { return new Promise>((resolve, reject) => { taskpool.execute((): Array => { return this.getStringArrayByNameSync(resName); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as Array); }, (err: Error): void => { reject(err); @@ -398,7 +398,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): Uint8Array => { return this.getMediaByNameSync(resName); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as Uint8Array); }).catch((err: Error): void => { callback(err as BusinessError, undefined); @@ -409,7 +409,7 @@ export default namespace resourceManager { return new Promise((resolve, reject) => { taskpool.execute((): Uint8Array => { return this.getMediaByNameSync(resName); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as Uint8Array); }, (err: Error): void => { reject(err); @@ -421,7 +421,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): Uint8Array => { return this.getMediaByNameSync(resName, density); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as Uint8Array); }).catch((err: Error): void => { callback(err as BusinessError, undefined); @@ -432,7 +432,7 @@ export default namespace resourceManager { return new Promise((resolve, reject) => { taskpool.execute((): Uint8Array => { return this.getMediaByNameSync(resName, density); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as Uint8Array); }, (err: Error): void => { reject(err); @@ -444,7 +444,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): string => { return this.getMediaBase64ByNameSync(resName); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as string); }).catch((err: Error): void => { callback(err as BusinessError, undefined); @@ -455,7 +455,7 @@ export default namespace resourceManager { return new Promise((resolve, reject) => { taskpool.execute((): string => { return this.getMediaBase64ByNameSync(resName); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as string); }, (err: Error): void => { reject(err); @@ -467,7 +467,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): string => { return this.getMediaBase64ByNameSync(resName, density); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as string); }).catch((err: Error): void => { callback(err as BusinessError, undefined); @@ -478,7 +478,7 @@ export default namespace resourceManager { return new Promise((resolve, reject) => { taskpool.execute((): string => { return this.getMediaBase64ByNameSync(resName, density); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as string); }, (err: Error): void => { reject(err); @@ -490,7 +490,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): Uint8Array => { return this.getMediaContentSync(resId); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as Uint8Array); }).catch((err: Error): void => { callback(err as BusinessError, undefined); @@ -501,7 +501,7 @@ export default namespace resourceManager { return new Promise((resolve, reject) => { taskpool.execute((): Uint8Array => { return this.getMediaContentSync(resId); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as Uint8Array); }, (err: Error): void => { reject(err); @@ -513,7 +513,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): Uint8Array => { return this.getMediaContentSync(resId, density); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as Uint8Array); }).catch((err: Error): void => { callback(err as BusinessError, undefined); @@ -524,7 +524,7 @@ export default namespace resourceManager { return new Promise((resolve, reject) => { taskpool.execute((): Uint8Array => { return this.getMediaContentSync(resId, density); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as Uint8Array); }, (err: Error): void => { reject(err); @@ -536,7 +536,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): string => { return this.getMediaContentBase64Sync(resId); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as string); }).catch((err: Error): void => { callback(err as BusinessError, undefined); @@ -547,7 +547,7 @@ export default namespace resourceManager { return new Promise((resolve, reject) => { taskpool.execute((): string => { return this.getMediaContentBase64Sync(resId); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as string); }, (err: Error): void => { reject(err); @@ -559,7 +559,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): string => { return this.getMediaContentBase64Sync(resId, density); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as string); }).catch((err: Error): void => { callback(err as BusinessError, undefined); @@ -570,7 +570,7 @@ export default namespace resourceManager { return new Promise((resolve, reject) => { taskpool.execute((): string => { return this.getMediaContentBase64Sync(resId, density); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as string); }, (err: Error): void => { reject(err); @@ -582,7 +582,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): Uint8Array => { return this.getRawFileContentSync(path); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as Uint8Array); }, (err: Error): void => { callback(err as BusinessError, undefined); @@ -593,7 +593,7 @@ export default namespace resourceManager { return new Promise((resolve, reject) => { taskpool.execute((): Uint8Array => { return this.getRawFileContentSync(path); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as Uint8Array); }, (err: Error): void => { reject(err); @@ -605,7 +605,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): RawFileDescriptor => { return this.getRawFdSync(path); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as RawFileDescriptor); }, (err: Error): void => { callback(err as BusinessError, undefined); @@ -616,7 +616,7 @@ export default namespace resourceManager { return new Promise((resolve, reject) => { taskpool.execute((): RawFileDescriptor => { return this.getRawFdSync(path); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as RawFileDescriptor); }, (err: Error): void => { reject(err); @@ -651,7 +651,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): Array => { return this.getRawFileListSync(path); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as Array); }, (err: Error): void => { callback(err as BusinessError, undefined); @@ -662,7 +662,7 @@ export default namespace resourceManager { return new Promise>((resolve, reject) => { taskpool.execute((): Array => { return this.getRawFileListSync(path); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as Array); }, (err: Error): void => { reject(err); @@ -674,7 +674,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): long => { return this.getColorSync(resId); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as long); }).catch((err: Error): void => { callback(err as BusinessError, undefined); @@ -685,7 +685,7 @@ export default namespace resourceManager { return new Promise((resolve, reject) => { taskpool.execute((): long => { return this.getColorSync(resId); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as long); }, (err: Error): void => { reject(err); @@ -697,7 +697,7 @@ export default namespace resourceManager { let p1 = taskpool.execute((): long => { return this.getColorByNameSync(resName); }) - p1.then((content: NullishType) => { + p1.then((content: Any) => { callback(null, content as long); }).catch((err: Error): void => { callback(err as BusinessError, undefined); @@ -708,7 +708,7 @@ export default namespace resourceManager { return new Promise((resolve, reject) => { taskpool.execute((): long => { return this.getColorByNameSync(resName); - }).then((content: NullishType) => { + }).then((content: Any) => { resolve(content as long); }, (err: Error): void => { reject(err); -- Gitee