Skip to content

Commit 5d98f6f

Browse files
mateoguzmanafacebook-github-bot
authored andcommitted
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: #51061 Test Plan: ```sh yarn android yarn test-android ``` Reviewed By: rshest Differential Revision: D74056259 Pulled By: javache fbshipit-source-id: 04f7ce7ce7b4f6063c8e1712840a44fd91d3b9e1
1 parent c6685d2 commit 5d98f6f

30 files changed

+48
-47
lines changed

packages/react-native/ReactAndroid/api/ReactAndroid.api

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3008,19 +3008,19 @@ public final class com/facebook/react/modules/network/NetworkingModule : com/fac
30083008
public fun <init> (Lcom/facebook/react/bridge/ReactApplicationContext;Ljava/lang/String;)V
30093009
public fun <init> (Lcom/facebook/react/bridge/ReactApplicationContext;Ljava/lang/String;Lokhttp3/OkHttpClient;Ljava/util/List;)V
30103010
public fun <init> (Lcom/facebook/react/bridge/ReactApplicationContext;Ljava/util/List;)V
3011-
public final fun abortRequest (D)V
3012-
public final fun addListener (Ljava/lang/String;)V
3011+
public fun abortRequest (D)V
3012+
public fun addListener (Ljava/lang/String;)V
30133013
public final fun addRequestBodyHandler (Lcom/facebook/react/modules/network/NetworkingModule$RequestBodyHandler;)V
30143014
public final fun addResponseHandler (Lcom/facebook/react/modules/network/NetworkingModule$ResponseHandler;)V
30153015
public final fun addUriHandler (Lcom/facebook/react/modules/network/NetworkingModule$UriHandler;)V
3016-
public final fun clearCookies (Lcom/facebook/react/bridge/Callback;)V
3017-
public final fun initialize ()V
3018-
public final fun invalidate ()V
3019-
public final fun removeListeners (D)V
3016+
public fun clearCookies (Lcom/facebook/react/bridge/Callback;)V
3017+
public fun initialize ()V
3018+
public fun invalidate ()V
3019+
public fun removeListeners (D)V
30203020
public final fun removeRequestBodyHandler (Lcom/facebook/react/modules/network/NetworkingModule$RequestBodyHandler;)V
30213021
public final fun removeResponseHandler (Lcom/facebook/react/modules/network/NetworkingModule$ResponseHandler;)V
30223022
public final fun removeUriHandler (Lcom/facebook/react/modules/network/NetworkingModule$UriHandler;)V
3023-
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
3023+
public fun sendRequest (Ljava/lang/String;Ljava/lang/String;DLcom/facebook/react/bridge/ReadableArray;Lcom/facebook/react/bridge/ReadableMap;Ljava/lang/String;ZDZ)V
30243024
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
30253025
public static final fun setCustomClientBuilder (Lcom/facebook/react/modules/network/CustomClientBuilder;)V
30263026
}

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class NativeModuleRegistryBuilder(
2828
public constructor(
2929
reactApplicationContext: ReactApplicationContext,
3030
@Suppress("UNUSED_PARAMETER") reactInstanceManager: ReactInstanceManager
31-
) : this(reactApplicationContext) {}
31+
) : this(reactApplicationContext)
3232

3333
public fun processPackage(reactPackage: ReactPackage) {
3434
// We use an iterable instead of an iterator here to ensure thread safety, and that this list

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ import android.os.Looper
1212
import android.os.Message
1313

1414
/** Handler that can catch and dispatch Exceptions to an Exception handler. */
15-
internal class MessageQueueThreadHandler
16-
constructor(looper: Looper, private val exceptionHandler: QueueThreadExceptionHandler) :
17-
Handler(looper) {
15+
internal class MessageQueueThreadHandler(
16+
looper: Looper,
17+
private val exceptionHandler: QueueThreadExceptionHandler
18+
) : Handler(looper) {
1819
override fun dispatchMessage(msg: Message) {
1920
try {
2021
super.dispatchMessage(msg)

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import com.facebook.react.module.annotations.ReactModule
1717
@ReactModule(name = NativeLogBoxSpec.NAME)
1818
internal class LogBoxModule(
1919
reactContext: ReactApplicationContext?,
20-
private val devSupportManager: DevSupportManager
20+
devSupportManager: DevSupportManager
2121
) : NativeLogBoxSpec(reactContext) {
2222
private val surfaceDelegate: SurfaceDelegate =
2323
devSupportManager.createSurfaceDelegate(NAME)

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import java.io.IOException
1818
import java.util.concurrent.ExecutorService
1919
import java.util.concurrent.Executors
2020

21-
public final class BlobProvider : ContentProvider() {
21+
public class BlobProvider : ContentProvider() {
2222
private val executor: ExecutorService = Executors.newSingleThreadExecutor()
2323

2424
override fun onCreate(): Boolean = true

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import okhttp3.CacheControl
1717
import okhttp3.OkHttpClient
1818
import okhttp3.Request
1919

20-
internal class ReactOkHttpNetworkFetcher(private val okHttpClient: OkHttpClient) :
20+
internal class ReactOkHttpNetworkFetcher(okHttpClient: OkHttpClient) :
2121
OkHttpNetworkFetcher(okHttpClient) {
2222
private fun getHeaders(readableMap: ReadableMap?): Map<String, String>? {
2323
if (readableMap == null) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import java.net.URI
2323
public class ForwardingCookieHandler() : CookieHandler() {
2424

2525
@Deprecated("Use the default constructor", ReplaceWith("ForwardingCookieHandler()"))
26-
public constructor(@Suppress("UNUSED_PARAMETER") reactContext: ReactContext) : this() {}
26+
public constructor(@Suppress("UNUSED_PARAMETER") reactContext: ReactContext) : this()
2727

2828
@Throws(IOException::class)
2929
override fun get(uri: URI, headers: Map<String, List<String>>): Map<String, List<String>> {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,11 @@ public class NetworkingModule(
164164
https://github.com/facebook/react-native/pull/37798#pullrequestreview-1518338914""")
165165
public interface CustomClientBuilder : com.facebook.react.modules.network.CustomClientBuilder
166166

167-
override final fun initialize() {
167+
override fun initialize() {
168168
cookieJarContainer?.setCookieJar(JavaNetCookieJar(cookieHandler))
169169
}
170170

171-
override final fun invalidate() {
171+
override fun invalidate() {
172172
shuttingDown = true
173173
cancelAllRequests()
174174

@@ -204,7 +204,7 @@ public class NetworkingModule(
204204
responseHandlers.remove(handler)
205205
}
206206

207-
override final fun sendRequest(
207+
override fun sendRequest(
208208
method: String,
209209
url: String,
210210
requestIdAsDouble: Double,
@@ -663,7 +663,7 @@ public class NetworkingModule(
663663
requestIds.clear()
664664
}
665665

666-
final override fun abortRequest(requestIdAsDouble: Double) {
666+
override fun abortRequest(requestIdAsDouble: Double) {
667667
val requestId = requestIdAsDouble.toInt()
668668
cancelRequest(requestId)
669669
removeRequest(requestId)
@@ -674,13 +674,13 @@ public class NetworkingModule(
674674
}
675675

676676
@ReactMethod
677-
public final override fun clearCookies(callback: com.facebook.react.bridge.Callback): Unit {
677+
public override fun clearCookies(callback: com.facebook.react.bridge.Callback): Unit {
678678
cookieHandler.clearCookies(callback)
679679
}
680680

681-
public final override fun addListener(eventName: String?): Unit = Unit
681+
public override fun addListener(eventName: String?): Unit = Unit
682682

683-
public final override fun removeListeners(count: Double): Unit = Unit
683+
public override fun removeListeners(count: Double): Unit = Unit
684684

685685
private fun constructMultipartBody(
686686
body: ReadableArray,

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import java.io.Closeable
1515
import java.util.concurrent.Executor
1616

1717
@DoNotStripAny
18-
internal class ReactHostInspectorTarget(private val reactHostImpl: ReactHostImpl) : Closeable {
18+
internal class ReactHostInspectorTarget(reactHostImpl: ReactHostImpl) : Closeable {
1919
// fbjni looks for the exact name "mHybridData":
2020
// https://github.com/facebookincubator/fbjni/blob/5587a7fd2b191656be9391a3832ce04c034009a5/cxx/fbjni/detail/Hybrid.h#L310
2121
@Suppress("NoHungarianNotation")

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/TaskCompletionSource.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ package com.facebook.react.runtime.internal.bolts
1313
* access to the consumer side through the getTask() method while isolating the Task's completion
1414
* mechanisms from the consumer.
1515
*/
16-
internal class TaskCompletionSource<TResult>() {
16+
internal class TaskCompletionSource<TResult> {
1717

1818
/** @return the Task associated with this TaskCompletionSource. */
1919
val task: Task<TResult> = Task()

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class OnLayoutEvent private constructor() : Event<OnLayoutEvent>() {
3939

4040
override fun getEventName(): String = "topLayout"
4141

42-
override fun getEventData(): WritableMap? {
42+
override fun getEventData(): WritableMap {
4343
val layout =
4444
Arguments.createMap().apply {
4545
putDouble("x", toDIPFromPixel(x.toFloat()).toDouble())

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public class Spacing(private val defaultValue: Float, private val spacing: Float
1919
private var valueFlags = 0
2020
private var hasAliasesSet = false
2121

22-
public constructor() : this(0f, newFullSpacingArray()) {}
22+
public constructor() : this(0f, newFullSpacingArray())
2323

24-
public constructor(defaultValue: Float) : this(defaultValue, newFullSpacingArray()) {}
24+
public constructor(defaultValue: Float) : this(defaultValue, newFullSpacingArray())
2525

2626
/**
2727
* Copy constructor.

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ internal class DrawerClosedEvent : Event<DrawerClosedEvent> {
2121

2222
override fun getEventName(): String = EVENT_NAME
2323

24-
protected override fun getEventData(): WritableMap? = Arguments.createMap()
24+
protected override fun getEventData(): WritableMap = Arguments.createMap()
2525

2626
companion object {
2727
const val EVENT_NAME: String = "topDrawerClose"

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ internal class DrawerOpenedEvent : Event<DrawerOpenedEvent> {
2121

2222
override fun getEventName(): String = EVENT_NAME
2323

24-
protected override fun getEventData(): WritableMap? = Arguments.createMap()
24+
protected override fun getEventData(): WritableMap = Arguments.createMap()
2525

2626
companion object {
2727
const val EVENT_NAME: String = "topDrawerOpen"

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ internal class DrawerSlideEvent : Event<DrawerSlideEvent> {
2929

3030
override fun getEventName(): String = EVENT_NAME
3131

32-
protected override fun getEventData(): WritableMap? {
32+
protected override fun getEventData(): WritableMap {
3333
val eventData: WritableMap = Arguments.createMap()
3434
eventData.putDouble("offset", getOffset().toDouble())
3535
return eventData

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ private constructor(
3535
// enough to fit into short.
3636
override fun getCoalescingKey(): Short = eventType.toShort()
3737

38-
override fun getEventData(): WritableMap? =
38+
override fun getEventData(): WritableMap =
3939
Arguments.createMap().apply {
4040
when (eventType) {
4141
ON_PROGRESS -> {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ internal class ShowEvent(surfaceId: Int, viewTag: Int) : Event<ShowEvent>(surfac
2222

2323
override fun getEventName(): String = EVENT_NAME
2424

25-
override fun getEventData(): WritableMap? = Arguments.createMap()
25+
override fun getEventData(): WritableMap = Arguments.createMap()
2626

2727
companion object {
2828
const val EVENT_NAME: String = "topShow"

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import com.facebook.react.viewmanagers.SafeAreaViewManagerInterface
1919

2020
/** View manager for [ReactSafeAreaView] components. */
2121
@ReactModule(name = ReactSafeAreaViewManager.REACT_CLASS)
22-
internal class ReactSafeAreaViewManager() :
22+
internal class ReactSafeAreaViewManager :
2323
ViewGroupManager<ReactSafeAreaView>(), SafeAreaViewManagerInterface<ReactSafeAreaView> {
2424

2525
private val delegate: ViewManagerDelegate<ReactSafeAreaView> = SafeAreaViewManagerDelegate(this)

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewShadowNode.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ package com.facebook.react.views.safeareaview
1010
import com.facebook.react.common.annotations.internal.LegacyArchitecture
1111
import com.facebook.react.uimanager.LayoutShadowNode
1212

13-
@LegacyArchitecture internal class ReactSafeAreaViewShadowNode() : LayoutShadowNode() {}
13+
@LegacyArchitecture internal class ReactSafeAreaViewShadowNode : LayoutShadowNode() {}

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ internal class RefreshEvent : Event<RefreshEvent> {
2323
return "topRefresh"
2424
}
2525

26-
override fun getEventData(): WritableMap? {
26+
override fun getEventData(): WritableMap {
2727
return Arguments.createMap()
2828
}
2929
}

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ internal class ReactSwitchEvent(surfaceId: Int, viewId: Int, private val isCheck
2323

2424
override fun getEventName(): String = EVENT_NAME
2525

26-
public override fun getEventData(): WritableMap? =
26+
public override fun getEventData(): WritableMap =
2727
Arguments.createMap().apply {
2828
putInt("target", viewTag)
2929
putBoolean("value", isChecked)

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ internal class ReactContentSizeChangedEvent(
3131

3232
override fun getEventName(): String = EVENT_NAME
3333

34-
override fun getEventData(): WritableMap? {
34+
override fun getEventData(): WritableMap {
3535
val contentSize =
3636
Arguments.createMap().apply {
3737
putDouble("width", contentWidth.toDouble())

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ internal class ReactTextChangedEvent(
3030

3131
override fun getEventName(): String = EVENT_NAME
3232

33-
override fun getEventData(): WritableMap? {
33+
override fun getEventData(): WritableMap {
3434
return Arguments.createMap().apply {
3535
putString("text", text)
3636
putInt("eventCount", eventCount)

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ internal class ReactTextInputBlurEvent(surfaceId: Int, viewId: Int) :
2424

2525
override fun canCoalesce(): Boolean = false
2626

27-
override fun getEventData(): WritableMap? {
27+
override fun getEventData(): WritableMap {
2828
return Arguments.createMap().apply { putInt("target", viewTag) }
2929
}
3030

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ internal class ReactTextInputEndEditingEvent(
3030

3131
override fun canCoalesce(): Boolean = false
3232

33-
override fun getEventData(): WritableMap? {
33+
override fun getEventData(): WritableMap {
3434
return Arguments.createMap().apply {
3535
putInt("target", viewTag)
3636
putString("text", text)

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ internal class ReactTextInputFocusEvent(surfaceId: Int, viewId: Int) :
2222

2323
override fun getEventName(): String = EVENT_NAME
2424

25-
override fun getEventData(): WritableMap? {
25+
override fun getEventData(): WritableMap {
2626
return Arguments.createMap().apply { putInt("target", viewTag) }
2727
}
2828

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ internal class ReactTextInputKeyPressEvent(surfaceId: Int, viewId: Int, private
2222

2323
override fun getEventName(): String = EVENT_NAME
2424

25-
override fun getEventData(): WritableMap? {
25+
override fun getEventData(): WritableMap {
2626
return Arguments.createMap().apply { putString("key", key) }
2727
}
2828

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ internal class ReactTextInputSelectionEvent(
3030

3131
override fun getEventName(): String = EVENT_NAME
3232

33-
override fun getEventData(): WritableMap? {
33+
override fun getEventData(): WritableMap {
3434
val selectionData =
3535
Arguments.createMap().apply {
3636
putInt("end", selectionEnd)

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ internal class ReactTextInputSubmitEditingEvent(
2525

2626
override fun getEventName(): String = EVENT_NAME
2727

28-
override fun getEventData(): WritableMap? {
28+
override fun getEventData(): WritableMap {
2929
return Arguments.createMap().apply {
3030
putInt("target", viewTag)
3131
putString("text", text)

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimationTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class AbstractLayoutAnimationTest {
5353
y: Int,
5454
width: Int,
5555
height: Int
56-
): Animation? {
56+
): Animation {
5757
return mock()
5858
}
5959
}
@@ -102,7 +102,7 @@ class AbstractLayoutAnimationTest {
102102
y: Int,
103103
width: Int,
104104
height: Int
105-
): Animation? = mock()
105+
): Animation = mock()
106106
}
107107

108108
val result = invalidAnimation.createAnimation(view, 0, 0, 100, 100)
@@ -126,7 +126,7 @@ class AbstractLayoutAnimationTest {
126126
y: Int,
127127
width: Int,
128128
height: Int
129-
): Animation? = mock()
129+
): Animation = mock()
130130
}
131131

132132
val exception =

0 commit comments

Comments
 (0)