From 5d98f6f3643e3b305e4acc259ea53d68838cf296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateo=20Guzm=C3=A1n?= Date: Fri, 2 May 2025 03:59:22 -0700 Subject: [PATCH] Kotlin: Clean up redundant constructs (#51061) Summary: Static code analysis detected several redundant constructs across the codebase. Most of the ones fixed here are marked as warnings/weak warnings, likely code smells post-migration from Java. Doing a small round to clean up some of them. ## Changelog: [INTERNAL] - Kotlin: Clean up redundant constructs Pull Request resolved: https://github.com/facebook/react-native/pull/51061 Test Plan: ```sh yarn android yarn test-android ``` Reviewed By: rshest Differential Revision: D74056259 Pulled By: javache fbshipit-source-id: 04f7ce7ce7b4f6063c8e1712840a44fd91d3b9e1 --- .../react-native/ReactAndroid/api/ReactAndroid.api | 14 +++++++------- .../facebook/react/NativeModuleRegistryBuilder.kt | 2 +- .../bridge/queue/MessageQueueThreadHandler.kt | 7 ++++--- .../com/facebook/react/devsupport/LogBoxModule.kt | 2 +- .../facebook/react/modules/blob/BlobProvider.kt | 2 +- .../modules/fresco/ReactOkHttpNetworkFetcher.kt | 2 +- .../modules/network/ForwardingCookieHandler.kt | 2 +- .../react/modules/network/NetworkingModule.kt | 14 +++++++------- .../react/runtime/ReactHostInspectorTarget.kt | 2 +- .../runtime/internal/bolts/TaskCompletionSource.kt | 2 +- .../com/facebook/react/uimanager/OnLayoutEvent.kt | 2 +- .../java/com/facebook/react/uimanager/Spacing.kt | 4 ++-- .../react/views/drawer/events/DrawerClosedEvent.kt | 2 +- .../react/views/drawer/events/DrawerOpenedEvent.kt | 2 +- .../react/views/drawer/events/DrawerSlideEvent.kt | 2 +- .../facebook/react/views/image/ImageLoadEvent.kt | 2 +- .../com/facebook/react/views/modal/ShowEvent.kt | 2 +- .../views/safeareaview/ReactSafeAreaViewManager.kt | 2 +- .../safeareaview/ReactSafeAreaViewShadowNode.kt | 2 +- .../react/views/swiperefresh/RefreshEvent.kt | 2 +- .../react/views/switchview/ReactSwitchEvent.kt | 2 +- .../textinput/ReactContentSizeChangedEvent.kt | 2 +- .../react/views/textinput/ReactTextChangedEvent.kt | 2 +- .../views/textinput/ReactTextInputBlurEvent.kt | 2 +- .../textinput/ReactTextInputEndEditingEvent.kt | 2 +- .../views/textinput/ReactTextInputFocusEvent.kt | 2 +- .../views/textinput/ReactTextInputKeyPressEvent.kt | 2 +- .../textinput/ReactTextInputSelectionEvent.kt | 2 +- .../textinput/ReactTextInputSubmitEditingEvent.kt | 2 +- .../layoutanimation/AbstractLayoutAnimationTest.kt | 6 +++--- 30 files changed, 48 insertions(+), 47 deletions(-) diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 36ab4ba70f8..7eea38b4872 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -3008,19 +3008,19 @@ public final class com/facebook/react/modules/network/NetworkingModule : com/fac public fun (Lcom/facebook/react/bridge/ReactApplicationContext;Ljava/lang/String;)V public fun (Lcom/facebook/react/bridge/ReactApplicationContext;Ljava/lang/String;Lokhttp3/OkHttpClient;Ljava/util/List;)V public fun (Lcom/facebook/react/bridge/ReactApplicationContext;Ljava/util/List;)V - public final fun abortRequest (D)V - public final fun addListener (Ljava/lang/String;)V + public fun abortRequest (D)V + public fun addListener (Ljava/lang/String;)V public final fun addRequestBodyHandler (Lcom/facebook/react/modules/network/NetworkingModule$RequestBodyHandler;)V public final fun addResponseHandler (Lcom/facebook/react/modules/network/NetworkingModule$ResponseHandler;)V public final fun addUriHandler (Lcom/facebook/react/modules/network/NetworkingModule$UriHandler;)V - public final fun clearCookies (Lcom/facebook/react/bridge/Callback;)V - public final fun initialize ()V - public final fun invalidate ()V - public final fun removeListeners (D)V + public fun clearCookies (Lcom/facebook/react/bridge/Callback;)V + public fun initialize ()V + public fun invalidate ()V + public fun removeListeners (D)V public final fun removeRequestBodyHandler (Lcom/facebook/react/modules/network/NetworkingModule$RequestBodyHandler;)V public final fun removeResponseHandler (Lcom/facebook/react/modules/network/NetworkingModule$ResponseHandler;)V public final fun removeUriHandler (Lcom/facebook/react/modules/network/NetworkingModule$UriHandler;)V - public final fun sendRequest (Ljava/lang/String;Ljava/lang/String;DLcom/facebook/react/bridge/ReadableArray;Lcom/facebook/react/bridge/ReadableMap;Ljava/lang/String;ZDZ)V + public fun sendRequest (Ljava/lang/String;Ljava/lang/String;DLcom/facebook/react/bridge/ReadableArray;Lcom/facebook/react/bridge/ReadableMap;Ljava/lang/String;ZDZ)V public final fun sendRequestInternal (Ljava/lang/String;Ljava/lang/String;ILcom/facebook/react/bridge/ReadableArray;Lcom/facebook/react/bridge/ReadableMap;Ljava/lang/String;ZIZ)V public static final fun setCustomClientBuilder (Lcom/facebook/react/modules/network/CustomClientBuilder;)V } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.kt index 628c2f40f88..39102f5e5c6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.kt @@ -28,7 +28,7 @@ public class NativeModuleRegistryBuilder( public constructor( reactApplicationContext: ReactApplicationContext, @Suppress("UNUSED_PARAMETER") reactInstanceManager: ReactInstanceManager - ) : this(reactApplicationContext) {} + ) : this(reactApplicationContext) public fun processPackage(reactPackage: ReactPackage) { // We use an iterable instead of an iterator here to ensure thread safety, and that this list diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.kt index 982de3e8eb4..95e843a34dc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.kt @@ -12,9 +12,10 @@ import android.os.Looper import android.os.Message /** Handler that can catch and dispatch Exceptions to an Exception handler. */ -internal class MessageQueueThreadHandler -constructor(looper: Looper, private val exceptionHandler: QueueThreadExceptionHandler) : - Handler(looper) { +internal class MessageQueueThreadHandler( + looper: Looper, + private val exceptionHandler: QueueThreadExceptionHandler +) : Handler(looper) { override fun dispatchMessage(msg: Message) { try { super.dispatchMessage(msg) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.kt index 3018ae52e93..f9330f2a9d0 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.kt @@ -17,7 +17,7 @@ import com.facebook.react.module.annotations.ReactModule @ReactModule(name = NativeLogBoxSpec.NAME) internal class LogBoxModule( reactContext: ReactApplicationContext?, - private val devSupportManager: DevSupportManager + devSupportManager: DevSupportManager ) : NativeLogBoxSpec(reactContext) { private val surfaceDelegate: SurfaceDelegate = devSupportManager.createSurfaceDelegate(NAME) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.kt index c7bd8aa2332..c153eda7733 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.kt @@ -18,7 +18,7 @@ import java.io.IOException import java.util.concurrent.ExecutorService import java.util.concurrent.Executors -public final class BlobProvider : ContentProvider() { +public class BlobProvider : ContentProvider() { private val executor: ExecutorService = Executors.newSingleThreadExecutor() override fun onCreate(): Boolean = true diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.kt index 6eddbb753c1..d8137ff4e28 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.kt @@ -17,7 +17,7 @@ import okhttp3.CacheControl import okhttp3.OkHttpClient import okhttp3.Request -internal class ReactOkHttpNetworkFetcher(private val okHttpClient: OkHttpClient) : +internal class ReactOkHttpNetworkFetcher(okHttpClient: OkHttpClient) : OkHttpNetworkFetcher(okHttpClient) { private fun getHeaders(readableMap: ReadableMap?): Map? { if (readableMap == null) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.kt index feaaba277e0..814023465a2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.kt @@ -23,7 +23,7 @@ import java.net.URI public class ForwardingCookieHandler() : CookieHandler() { @Deprecated("Use the default constructor", ReplaceWith("ForwardingCookieHandler()")) - public constructor(@Suppress("UNUSED_PARAMETER") reactContext: ReactContext) : this() {} + public constructor(@Suppress("UNUSED_PARAMETER") reactContext: ReactContext) : this() @Throws(IOException::class) override fun get(uri: URI, headers: Map>): Map> { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt index e97c22ff39e..122f46477e9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt @@ -164,11 +164,11 @@ public class NetworkingModule( https://github.com/facebook/react-native/pull/37798#pullrequestreview-1518338914""") public interface CustomClientBuilder : com.facebook.react.modules.network.CustomClientBuilder - override final fun initialize() { + override fun initialize() { cookieJarContainer?.setCookieJar(JavaNetCookieJar(cookieHandler)) } - override final fun invalidate() { + override fun invalidate() { shuttingDown = true cancelAllRequests() @@ -204,7 +204,7 @@ public class NetworkingModule( responseHandlers.remove(handler) } - override final fun sendRequest( + override fun sendRequest( method: String, url: String, requestIdAsDouble: Double, @@ -663,7 +663,7 @@ public class NetworkingModule( requestIds.clear() } - final override fun abortRequest(requestIdAsDouble: Double) { + override fun abortRequest(requestIdAsDouble: Double) { val requestId = requestIdAsDouble.toInt() cancelRequest(requestId) removeRequest(requestId) @@ -674,13 +674,13 @@ public class NetworkingModule( } @ReactMethod - public final override fun clearCookies(callback: com.facebook.react.bridge.Callback): Unit { + public override fun clearCookies(callback: com.facebook.react.bridge.Callback): Unit { cookieHandler.clearCookies(callback) } - public final override fun addListener(eventName: String?): Unit = Unit + public override fun addListener(eventName: String?): Unit = Unit - public final override fun removeListeners(count: Double): Unit = Unit + public override fun removeListeners(count: Double): Unit = Unit private fun constructMultipartBody( body: ReadableArray, diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt index 185e5fd3fe1..2a7de5125dc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt @@ -15,7 +15,7 @@ import java.io.Closeable import java.util.concurrent.Executor @DoNotStripAny -internal class ReactHostInspectorTarget(private val reactHostImpl: ReactHostImpl) : Closeable { +internal class ReactHostInspectorTarget(reactHostImpl: ReactHostImpl) : Closeable { // fbjni looks for the exact name "mHybridData": // https://github.com/facebookincubator/fbjni/blob/5587a7fd2b191656be9391a3832ce04c034009a5/cxx/fbjni/detail/Hybrid.h#L310 @Suppress("NoHungarianNotation") diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/TaskCompletionSource.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/TaskCompletionSource.kt index 4677e2f7819..1851678adc1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/TaskCompletionSource.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/TaskCompletionSource.kt @@ -13,7 +13,7 @@ package com.facebook.react.runtime.internal.bolts * access to the consumer side through the getTask() method while isolating the Task's completion * mechanisms from the consumer. */ -internal class TaskCompletionSource() { +internal class TaskCompletionSource { /** @return the Task associated with this TaskCompletionSource. */ val task: Task = Task() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.kt index 1a789d0e153..932e551c422 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.kt @@ -39,7 +39,7 @@ public class OnLayoutEvent private constructor() : Event() { override fun getEventName(): String = "topLayout" - override fun getEventData(): WritableMap? { + override fun getEventData(): WritableMap { val layout = Arguments.createMap().apply { putDouble("x", toDIPFromPixel(x.toFloat()).toDouble()) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.kt index baff9be3a78..fbda5770919 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.kt @@ -19,9 +19,9 @@ public class Spacing(private val defaultValue: Float, private val spacing: Float private var valueFlags = 0 private var hasAliasesSet = false - public constructor() : this(0f, newFullSpacingArray()) {} + public constructor() : this(0f, newFullSpacingArray()) - public constructor(defaultValue: Float) : this(defaultValue, newFullSpacingArray()) {} + public constructor(defaultValue: Float) : this(defaultValue, newFullSpacingArray()) /** * Copy constructor. diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.kt index f36e4e70fc0..4c34830f9f9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.kt @@ -21,7 +21,7 @@ internal class DrawerClosedEvent : Event { override fun getEventName(): String = EVENT_NAME - protected override fun getEventData(): WritableMap? = Arguments.createMap() + protected override fun getEventData(): WritableMap = Arguments.createMap() companion object { const val EVENT_NAME: String = "topDrawerClose" diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.kt index 6fe5e654f40..d92d44657b9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.kt @@ -21,7 +21,7 @@ internal class DrawerOpenedEvent : Event { override fun getEventName(): String = EVENT_NAME - protected override fun getEventData(): WritableMap? = Arguments.createMap() + protected override fun getEventData(): WritableMap = Arguments.createMap() companion object { const val EVENT_NAME: String = "topDrawerOpen" diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.kt index d6c4d0ec837..29aae286726 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.kt @@ -29,7 +29,7 @@ internal class DrawerSlideEvent : Event { override fun getEventName(): String = EVENT_NAME - protected override fun getEventData(): WritableMap? { + protected override fun getEventData(): WritableMap { val eventData: WritableMap = Arguments.createMap() eventData.putDouble("offset", getOffset().toDouble()) return eventData diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.kt index 4aa82820dcf..e2ecde2f9fa 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.kt @@ -35,7 +35,7 @@ private constructor( // enough to fit into short. override fun getCoalescingKey(): Short = eventType.toShort() - override fun getEventData(): WritableMap? = + override fun getEventData(): WritableMap = Arguments.createMap().apply { when (eventType) { ON_PROGRESS -> { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.kt index 20ae8ab7566..e9ccc2c2fba 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.kt @@ -22,7 +22,7 @@ internal class ShowEvent(surfaceId: Int, viewTag: Int) : Event(surfac override fun getEventName(): String = EVENT_NAME - override fun getEventData(): WritableMap? = Arguments.createMap() + override fun getEventData(): WritableMap = Arguments.createMap() companion object { const val EVENT_NAME: String = "topShow" diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewManager.kt index a14170c044d..686927e1301 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewManager.kt @@ -19,7 +19,7 @@ import com.facebook.react.viewmanagers.SafeAreaViewManagerInterface /** View manager for [ReactSafeAreaView] components. */ @ReactModule(name = ReactSafeAreaViewManager.REACT_CLASS) -internal class ReactSafeAreaViewManager() : +internal class ReactSafeAreaViewManager : ViewGroupManager(), SafeAreaViewManagerInterface { private val delegate: ViewManagerDelegate = SafeAreaViewManagerDelegate(this) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewShadowNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewShadowNode.kt index 7ce771889e7..77ce8a03a16 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewShadowNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewShadowNode.kt @@ -10,4 +10,4 @@ package com.facebook.react.views.safeareaview import com.facebook.react.common.annotations.internal.LegacyArchitecture import com.facebook.react.uimanager.LayoutShadowNode -@LegacyArchitecture internal class ReactSafeAreaViewShadowNode() : LayoutShadowNode() {} +@LegacyArchitecture internal class ReactSafeAreaViewShadowNode : LayoutShadowNode() {} diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.kt index bd9e45bbb53..d07508b64f4 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.kt @@ -23,7 +23,7 @@ internal class RefreshEvent : Event { return "topRefresh" } - override fun getEventData(): WritableMap? { + override fun getEventData(): WritableMap { return Arguments.createMap() } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.kt index 6493a5a42e6..111b79b84bc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.kt @@ -23,7 +23,7 @@ internal class ReactSwitchEvent(surfaceId: Int, viewId: Int, private val isCheck override fun getEventName(): String = EVENT_NAME - public override fun getEventData(): WritableMap? = + public override fun getEventData(): WritableMap = Arguments.createMap().apply { putInt("target", viewTag) putBoolean("value", isChecked) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.kt index f1023156063..8eebc476b25 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.kt @@ -31,7 +31,7 @@ internal class ReactContentSizeChangedEvent( override fun getEventName(): String = EVENT_NAME - override fun getEventData(): WritableMap? { + override fun getEventData(): WritableMap { val contentSize = Arguments.createMap().apply { putDouble("width", contentWidth.toDouble()) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.kt index ce863d3cc74..957f87bade0 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.kt @@ -30,7 +30,7 @@ internal class ReactTextChangedEvent( override fun getEventName(): String = EVENT_NAME - override fun getEventData(): WritableMap? { + override fun getEventData(): WritableMap { return Arguments.createMap().apply { putString("text", text) putInt("eventCount", eventCount) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.kt index 27f2787e163..b6ed75e71e7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.kt @@ -24,7 +24,7 @@ internal class ReactTextInputBlurEvent(surfaceId: Int, viewId: Int) : override fun canCoalesce(): Boolean = false - override fun getEventData(): WritableMap? { + override fun getEventData(): WritableMap { return Arguments.createMap().apply { putInt("target", viewTag) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.kt index 4d33191c535..63bf83d9946 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.kt @@ -30,7 +30,7 @@ internal class ReactTextInputEndEditingEvent( override fun canCoalesce(): Boolean = false - override fun getEventData(): WritableMap? { + override fun getEventData(): WritableMap { return Arguments.createMap().apply { putInt("target", viewTag) putString("text", text) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.kt index f40fb1e3375..c07657c0867 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.kt @@ -22,7 +22,7 @@ internal class ReactTextInputFocusEvent(surfaceId: Int, viewId: Int) : override fun getEventName(): String = EVENT_NAME - override fun getEventData(): WritableMap? { + override fun getEventData(): WritableMap { return Arguments.createMap().apply { putInt("target", viewTag) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.kt index 4aa4e6bc0c6..78a984a892a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.kt @@ -22,7 +22,7 @@ internal class ReactTextInputKeyPressEvent(surfaceId: Int, viewId: Int, private override fun getEventName(): String = EVENT_NAME - override fun getEventData(): WritableMap? { + override fun getEventData(): WritableMap { return Arguments.createMap().apply { putString("key", key) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.kt index 375cfd0ea5a..3f61d2997dd 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.kt @@ -30,7 +30,7 @@ internal class ReactTextInputSelectionEvent( override fun getEventName(): String = EVENT_NAME - override fun getEventData(): WritableMap? { + override fun getEventData(): WritableMap { val selectionData = Arguments.createMap().apply { putInt("end", selectionEnd) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.kt index 33a0793f57c..e12677e3bff 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.kt @@ -25,7 +25,7 @@ internal class ReactTextInputSubmitEditingEvent( override fun getEventName(): String = EVENT_NAME - override fun getEventData(): WritableMap? { + override fun getEventData(): WritableMap { return Arguments.createMap().apply { putInt("target", viewTag) putString("text", text) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimationTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimationTest.kt index 5320abd2123..9ebee273030 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimationTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimationTest.kt @@ -53,7 +53,7 @@ class AbstractLayoutAnimationTest { y: Int, width: Int, height: Int - ): Animation? { + ): Animation { return mock() } } @@ -102,7 +102,7 @@ class AbstractLayoutAnimationTest { y: Int, width: Int, height: Int - ): Animation? = mock() + ): Animation = mock() } val result = invalidAnimation.createAnimation(view, 0, 0, 100, 100) @@ -126,7 +126,7 @@ class AbstractLayoutAnimationTest { y: Int, width: Int, height: Int - ): Animation? = mock() + ): Animation = mock() } val exception =