Kotlin: fix static code analysis weak warnings (4/n) (#52207)

mateoguzmana · facebook-github-bot · commit c125f306c2b2 · 2025-06-24T06:36:11.000-07:00
Summary: Static code analysis reports several weak warnings, many of which seem to be leftovers after Kotlin migration. This PR addresses quite a few: - [Redundant curly braces in string template](https://www.jetbrains.com/help/inspectopedia/RemoveCurlyBracesFromTemplate.html) - [Redundant call to toString() in string template](https://www.jetbrains.com/help/inspectopedia/RemoveToStringInStringTemplate.html) ## Changelog: [INTERNAL] - Kotlin: fix static code analysis weak warnings (4/n) Pull Request resolved: #52207 Test Plan: ```sh yarn android yarn test-android ``` Reviewed By: javache Differential Revision: D77209873 Pulled By: cortinico fbshipit-source-id: 2bf5fcf7dcbf02632e721aab0688f73d15f220b9
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.kt
@@ -485,16 +485,14 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :
   override fun createAnimatedNode(tagDouble: Double, config: ReadableMap) {
     val tag = tagDouble.toInt()
     if (ANIMATED_MODULE_DEBUG) {
-      FLog.d(NAME, "queue createAnimatedNode: ${tag} config: ${config.toHashMap().toString()}")
+      FLog.d(NAME, "queue createAnimatedNode: $tag config: ${config.toHashMap()}")
     }
 
     addOperation(
         object : UIThreadOperation() {
           override fun execute(animatedNodesManager: NativeAnimatedNodesManager) {
             if (ANIMATED_MODULE_DEBUG) {
-              FLog.d(
-                  NAME,
-                  ("execute createAnimatedNode: ${tag} config: ${config.toHashMap().toString()}"))
+              FLog.d(NAME, ("execute createAnimatedNode: $tag config: ${config.toHashMap()}"))
             }
             animatedNodesManager.createAnimatedNode(tag, config)
           }
@@ -504,17 +502,14 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :
   override fun updateAnimatedNodeConfig(tagDouble: Double, config: ReadableMap) {
     val tag = tagDouble.toInt()
     if (ANIMATED_MODULE_DEBUG) {
-      FLog.d(
-          NAME, "queue updateAnimatedNodeConfig: ${tag} config: ${config.toHashMap().toString()}")
+      FLog.d(NAME, "queue updateAnimatedNodeConfig: $tag config: ${config.toHashMap()}")
     }
 
     addOperation(
         object : UIThreadOperation() {
           override fun execute(animatedNodesManager: NativeAnimatedNodesManager) {
             if (ANIMATED_MODULE_DEBUG) {
-              FLog.d(
-                  NAME,
-                  ("execute updateAnimatedNodeConfig: ${tag} config: ${config.toHashMap().toString()}"))
+              FLog.d(NAME, ("execute updateAnimatedNodeConfig: $tag config: ${config.toHashMap()}"))
             }
             animatedNodesManager.updateAnimatedNodeConfig(tag, config)
           }
@@ -705,7 +700,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :
             if (ANIMATED_MODULE_DEBUG) {
               FLog.d(
                   NAME,
-                  ("execute connectAnimatedNodes: parent: ${parentNodeTag} child: ${childNodeTag}"))
+                  ("execute connectAnimatedNodes: parent: $parentNodeTag child: $childNodeTag"))
             }
             animatedNodesManager.connectAnimatedNodes(parentNodeTag, childNodeTag)
           }
@@ -725,7 +720,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :
             if (ANIMATED_MODULE_DEBUG) {
               FLog.d(
                   NAME,
-                  ("execute disconnectAnimatedNodes: parent: ${parentNodeTag} child: ${childNodeTag}"))
+                  ("execute disconnectAnimatedNodes: parent: $parentNodeTag child: $childNodeTag"))
             }
             animatedNodesManager.disconnectAnimatedNodes(parentNodeTag, childNodeTag)
           }
@@ -738,7 +733,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :
     if (ANIMATED_MODULE_DEBUG) {
       FLog.d(
           NAME,
-          ("queue connectAnimatedNodeToView: animatedNodeTag: ${animatedNodeTag} viewTag: ${viewTag}"))
+          ("queue connectAnimatedNodeToView: animatedNodeTag: $animatedNodeTag viewTag: $viewTag"))
     }
 
     initializeLifecycleEventListenersForViewTag(viewTag)
@@ -749,7 +744,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :
             if (ANIMATED_MODULE_DEBUG) {
               FLog.d(
                   NAME,
-                  ("execute connectAnimatedNodeToView: animatedNodeTag: ${animatedNodeTag} viewTag: ${viewTag}"))
+                  ("execute connectAnimatedNodeToView: animatedNodeTag: $animatedNodeTag viewTag: $viewTag"))
             }
             animatedNodesManager.connectAnimatedNodeToView(animatedNodeTag, viewTag)
           }
@@ -774,7 +769,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :
             if (ANIMATED_MODULE_DEBUG) {
               FLog.d(
                   NAME,
-                  ("execute disconnectAnimatedNodeFromView: ${animatedNodeTag} viewTag: ${viewTag}"))
+                  ("execute disconnectAnimatedNodeFromView: $animatedNodeTag viewTag: $viewTag"))
             }
             animatedNodesManager.disconnectAnimatedNodeFromView(animatedNodeTag, viewTag)
           }
@@ -807,7 +802,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :
     if (ANIMATED_MODULE_DEBUG) {
       FLog.d(
           NAME,
-          ("queue addAnimatedEventToView: ${viewTag} eventName: ${eventName} eventMapping: ${eventMapping.toHashMap().toString()}"))
+          ("queue addAnimatedEventToView: $viewTag eventName: $eventName eventMapping: ${eventMapping.toHashMap()}"))
     }
 
     initializeLifecycleEventListenersForViewTag(viewTag)
@@ -818,7 +813,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :
             if (ANIMATED_MODULE_DEBUG) {
               FLog.d(
                   NAME,
-                  ("execute addAnimatedEventToView: ${viewTag} eventName: ${eventName} eventMapping: ${eventMapping.toHashMap().toString()}"))
+                  ("execute addAnimatedEventToView: $viewTag eventName: $eventName eventMapping: ${eventMapping.toHashMap()}"))
             }
             animatedNodesManager.addAnimatedEventToView(viewTag, eventName, eventMapping)
           }
@@ -835,7 +830,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :
     if (ANIMATED_MODULE_DEBUG) {
       FLog.d(
           NAME,
-          ("queue removeAnimatedEventFromView: viewTag: ${viewTag} eventName: ${eventName} animatedValueTag: ${animatedValueTag}"))
+          ("queue removeAnimatedEventFromView: viewTag: $viewTag eventName: $eventName animatedValueTag: $animatedValueTag"))
     }
 
     decrementInFlightAnimationsForViewTag(viewTag)
@@ -846,7 +841,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :
             if (ANIMATED_MODULE_DEBUG) {
               FLog.d(
                   NAME,
-                  ("execute removeAnimatedEventFromView: viewTag: ${viewTag} eventName: ${eventName} animatedValueTag: ${animatedValueTag}"))
+                  ("execute removeAnimatedEventFromView: viewTag: $viewTag eventName: $eventName animatedValueTag: $animatedValueTag"))
             }
             animatedNodesManager.removeAnimatedEventFromView(viewTag, eventName, animatedValueTag)
           }
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.kt
@@ -381,15 +381,15 @@ public class NativeAnimatedNodesManager(
           ("connectAnimatedNodeToView: Animated node connected to view [${viewTag}] should be of type ${PropsAnimatedNode::class.java.name}"))
     }
     checkNotNull(reactApplicationContext) {
-      ("connectAnimatedNodeToView: Animated node could not be connected, no ReactApplicationContext: ${viewTag}")
+      ("connectAnimatedNodeToView: Animated node could not be connected, no ReactApplicationContext: $viewTag")
     }
 
     val uiManager = UIManagerHelper.getUIManagerForReactTag(reactApplicationContext, viewTag)
     if (uiManager == null) {
       ReactSoftExceptionLogger.logSoftException(
           TAG,
           ReactNoCrashSoftException(
-              ("connectAnimatedNodeToView: Animated node could not be connected to UIManager - uiManager disappeared for tag: ${viewTag}")))
+              ("connectAnimatedNodeToView: Animated node could not be connected to UIManager - uiManager disappeared for tag: $viewTag")))
       return
     }
 
@@ -751,7 +751,7 @@ public class NativeAnimatedNodesManager(
       val reason = if (cyclesDetected > 0) ("cycles ($cyclesDetected)") else "disconnected regions"
       val ex =
           IllegalStateException(
-              ("Looks like animated nodes graph has ${reason}, there are ${activeNodesCount} but toposort visited only ${updatedNodesCount}"))
+              ("Looks like animated nodes graph has ${reason}, there are $activeNodesCount but toposort visited only $updatedNodesCount"))
       if (eventListenerInitializedForFabric && cyclesDetected == 0) {
         // TODO T71377544: investigate these SoftExceptions and see if we can remove entirely
         // or fix the root cause
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.kt
@@ -76,7 +76,7 @@ internal class PackagerStatusCheck {
                 if (PACKAGER_OK_STATUS != bodyString) {
                   FLog.e(
                       ReactConstants.TAG,
-                      "Got unexpected response from packager when requesting status: ${bodyString}")
+                      "Got unexpected response from packager when requesting status: $bodyString")
                   callback.onPackagerStatusFetched(false)
                   return
                 }
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BoxShadow.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BoxShadow.kt
@@ -38,7 +38,7 @@ public data class BoxShadow(
             when (val type = boxShadow.getType("color")) {
               ReadableType.Number -> boxShadow.getInt("color")
               ReadableType.Map -> ColorPropConverter.getColor(boxShadow.getMap("color"), context)
-              else -> throw JSApplicationCausedNativeException("Unsupported color type ${type}")
+              else -> throw JSApplicationCausedNativeException("Unsupported color type $type")
             }
           } else null
       val blurRadius =

Original file line number	Diff line number	Diff line change
`@@ -485,16 +485,14 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :`
`485`	`485`	`override fun createAnimatedNode(tagDouble: Double, config: ReadableMap) {`
`486`	`486`	`val tag = tagDouble.toInt()`
`487`	`487`	`if (ANIMATED_MODULE_DEBUG) {`
`488`		`- FLog.d(NAME, "queue createAnimatedNode: ${tag} config: ${config.toHashMap().toString()}")`
	`488`	`+ FLog.d(NAME, "queue createAnimatedNode: $tag config: ${config.toHashMap()}")`
`489`	`489`	`}`
`490`	`490`
`491`	`491`	`addOperation(`
`492`	`492`	`object : UIThreadOperation() {`
`493`	`493`	`override fun execute(animatedNodesManager: NativeAnimatedNodesManager) {`
`494`	`494`	`if (ANIMATED_MODULE_DEBUG) {`
`495`		`- FLog.d(`
`496`		`- NAME,`
`497`		`- ("execute createAnimatedNode: ${tag} config: ${config.toHashMap().toString()}"))`
	`495`	`+ FLog.d(NAME, ("execute createAnimatedNode: $tag config: ${config.toHashMap()}"))`
`498`	`496`	`}`
`499`	`497`	`animatedNodesManager.createAnimatedNode(tag, config)`
`500`	`498`	`}`
`@@ -504,17 +502,14 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :`
`504`	`502`	`override fun updateAnimatedNodeConfig(tagDouble: Double, config: ReadableMap) {`
`505`	`503`	`val tag = tagDouble.toInt()`
`506`	`504`	`if (ANIMATED_MODULE_DEBUG) {`
`507`		`- FLog.d(`
`508`		`- NAME, "queue updateAnimatedNodeConfig: ${tag} config: ${config.toHashMap().toString()}")`
	`505`	`+ FLog.d(NAME, "queue updateAnimatedNodeConfig: $tag config: ${config.toHashMap()}")`
`509`	`506`	`}`
`510`	`507`
`511`	`508`	`addOperation(`
`512`	`509`	`object : UIThreadOperation() {`
`513`	`510`	`override fun execute(animatedNodesManager: NativeAnimatedNodesManager) {`
`514`	`511`	`if (ANIMATED_MODULE_DEBUG) {`
`515`		`- FLog.d(`
`516`		`- NAME,`
`517`		`- ("execute updateAnimatedNodeConfig: ${tag} config: ${config.toHashMap().toString()}"))`
	`512`	`+ FLog.d(NAME, ("execute updateAnimatedNodeConfig: $tag config: ${config.toHashMap()}"))`
`518`	`513`	`}`
`519`	`514`	`animatedNodesManager.updateAnimatedNodeConfig(tag, config)`
`520`	`515`	`}`
`@@ -705,7 +700,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :`
`705`	`700`	`if (ANIMATED_MODULE_DEBUG) {`
`706`	`701`	`FLog.d(`
`707`	`702`	`NAME,`
`708`		`- ("execute connectAnimatedNodes: parent: ${parentNodeTag} child: ${childNodeTag}"))`
	`703`	`+ ("execute connectAnimatedNodes: parent: $parentNodeTag child: $childNodeTag"))`
`709`	`704`	`}`
`710`	`705`	`animatedNodesManager.connectAnimatedNodes(parentNodeTag, childNodeTag)`
`711`	`706`	`}`
`@@ -725,7 +720,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :`
`725`	`720`	`if (ANIMATED_MODULE_DEBUG) {`
`726`	`721`	`FLog.d(`
`727`	`722`	`NAME,`
`728`		`- ("execute disconnectAnimatedNodes: parent: ${parentNodeTag} child: ${childNodeTag}"))`
	`723`	`+ ("execute disconnectAnimatedNodes: parent: $parentNodeTag child: $childNodeTag"))`
`729`	`724`	`}`
`730`	`725`	`animatedNodesManager.disconnectAnimatedNodes(parentNodeTag, childNodeTag)`
`731`	`726`	`}`
`@@ -738,7 +733,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :`
`738`	`733`	`if (ANIMATED_MODULE_DEBUG) {`
`739`	`734`	`FLog.d(`
`740`	`735`	`NAME,`
`741`		`- ("queue connectAnimatedNodeToView: animatedNodeTag: ${animatedNodeTag} viewTag: ${viewTag}"))`
	`736`	`+ ("queue connectAnimatedNodeToView: animatedNodeTag: $animatedNodeTag viewTag: $viewTag"))`
`742`	`737`	`}`
`743`	`738`
`744`	`739`	`initializeLifecycleEventListenersForViewTag(viewTag)`
`@@ -749,7 +744,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :`
`749`	`744`	`if (ANIMATED_MODULE_DEBUG) {`
`750`	`745`	`FLog.d(`
`751`	`746`	`NAME,`
`752`		`- ("execute connectAnimatedNodeToView: animatedNodeTag: ${animatedNodeTag} viewTag: ${viewTag}"))`
	`747`	`+ ("execute connectAnimatedNodeToView: animatedNodeTag: $animatedNodeTag viewTag: $viewTag"))`
`753`	`748`	`}`
`754`	`749`	`animatedNodesManager.connectAnimatedNodeToView(animatedNodeTag, viewTag)`
`755`	`750`	`}`
`@@ -774,7 +769,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :`
`774`	`769`	`if (ANIMATED_MODULE_DEBUG) {`
`775`	`770`	`FLog.d(`
`776`	`771`	`NAME,`
`777`		`- ("execute disconnectAnimatedNodeFromView: ${animatedNodeTag} viewTag: ${viewTag}"))`
	`772`	`+ ("execute disconnectAnimatedNodeFromView: $animatedNodeTag viewTag: $viewTag"))`
`778`	`773`	`}`
`779`	`774`	`animatedNodesManager.disconnectAnimatedNodeFromView(animatedNodeTag, viewTag)`
`780`	`775`	`}`
`@@ -807,7 +802,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :`
`807`	`802`	`if (ANIMATED_MODULE_DEBUG) {`
`808`	`803`	`FLog.d(`
`809`	`804`	`NAME,`
`810`		`- ("queue addAnimatedEventToView: ${viewTag} eventName: ${eventName} eventMapping: ${eventMapping.toHashMap().toString()}"))`
	`805`	`+ ("queue addAnimatedEventToView: $viewTag eventName: $eventName eventMapping: ${eventMapping.toHashMap()}"))`
`811`	`806`	`}`
`812`	`807`
`813`	`808`	`initializeLifecycleEventListenersForViewTag(viewTag)`
`@@ -818,7 +813,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :`
`818`	`813`	`if (ANIMATED_MODULE_DEBUG) {`
`819`	`814`	`FLog.d(`
`820`	`815`	`NAME,`
`821`		`- ("execute addAnimatedEventToView: ${viewTag} eventName: ${eventName} eventMapping: ${eventMapping.toHashMap().toString()}"))`
	`816`	`+ ("execute addAnimatedEventToView: $viewTag eventName: $eventName eventMapping: ${eventMapping.toHashMap()}"))`
`822`	`817`	`}`
`823`	`818`	`animatedNodesManager.addAnimatedEventToView(viewTag, eventName, eventMapping)`
`824`	`819`	`}`
`@@ -835,7 +830,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :`
`835`	`830`	`if (ANIMATED_MODULE_DEBUG) {`
`836`	`831`	`FLog.d(`
`837`	`832`	`NAME,`
`838`		`- ("queue removeAnimatedEventFromView: viewTag: ${viewTag} eventName: ${eventName} animatedValueTag: ${animatedValueTag}"))`
	`833`	`+ ("queue removeAnimatedEventFromView: viewTag: $viewTag eventName: $eventName animatedValueTag: $animatedValueTag"))`
`839`	`834`	`}`
`840`	`835`
`841`	`836`	`decrementInFlightAnimationsForViewTag(viewTag)`
`@@ -846,7 +841,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :`
`846`	`841`	`if (ANIMATED_MODULE_DEBUG) {`
`847`	`842`	`FLog.d(`
`848`	`843`	`NAME,`
`849`		`- ("execute removeAnimatedEventFromView: viewTag: ${viewTag} eventName: ${eventName} animatedValueTag: ${animatedValueTag}"))`
	`844`	`+ ("execute removeAnimatedEventFromView: viewTag: $viewTag eventName: $eventName animatedValueTag: $animatedValueTag"))`
`850`	`845`	`}`
`851`	`846`	`animatedNodesManager.removeAnimatedEventFromView(viewTag, eventName, animatedValueTag)`
`852`	`847`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ internal class PackagerStatusCheck {`
`76`	`76`	`if (PACKAGER_OK_STATUS != bodyString) {`
`77`	`77`	`FLog.e(`
`78`	`78`	`ReactConstants.TAG,`
`79`		`- "Got unexpected response from packager when requesting status: ${bodyString}")`
	`79`	`+ "Got unexpected response from packager when requesting status: $bodyString")`
`80`	`80`	`callback.onPackagerStatusFetched(false)`
`81`	`81`	`return`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public data class BoxShadow(`
`38`	`38`	`when (val type = boxShadow.getType("color")) {`
`39`	`39`	`ReadableType.Number -> boxShadow.getInt("color")`
`40`	`40`	`ReadableType.Map -> ColorPropConverter.getColor(boxShadow.getMap("color"), context)`
`41`		`- else -> throw JSApplicationCausedNativeException("Unsupported color type ${type}")`
	`41`	`+ else -> throw JSApplicationCausedNativeException("Unsupported color type $type")`
`42`	`42`	`}`
`43`	`43`	`} else null`
`44`	`44`	`val blurRadius =`