Ktlint

jush · github-actions[bot] · commit cefe4545ee12 · 2025-05-26T12:22:28.000Z
GitOrigin-RevId: dce9c20d2b6b3bd1e0ab2eefa6f4d3f68083b059
diff --git a/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/internal/route/line/RouteLineDataConverter.kt b/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/internal/route/line/RouteLineDataConverter.kt
@@ -130,11 +130,20 @@ private suspend fun RouteLineDynamicData.toData(
     return RouteLineDynamicEventData(
         baseExpressionCommandHolder.toRouteLineExpressionEventData(workerCoroutineContext, data),
         casingExpressionCommandHolder.toRouteLineExpressionEventData(workerCoroutineContext, data),
-        trafficExpressionCommandHolder?.toRouteLineExpressionEventData(workerCoroutineContext, data),
-        restrictedSectionExpressionCommandHolder?.toRouteLineExpressionEventData(workerCoroutineContext, data),
+        trafficExpressionCommandHolder?.toRouteLineExpressionEventData(
+            workerCoroutineContext,
+            data,
+        ),
+        restrictedSectionExpressionCommandHolder?.toRouteLineExpressionEventData(
+            workerCoroutineContext,
+            data,
+        ),
         trimOffset,
         trailExpressionCommandHolder?.toRouteLineExpressionEventData(workerCoroutineContext, data),
-        trailCasingExpressionCommandHolder?.toRouteLineExpressionEventData(workerCoroutineContext, data),
+        trailCasingExpressionCommandHolder?.toRouteLineExpressionEventData(
+            workerCoroutineContext,
+            data,
+        ),
         blurExpressionCommandHolder?.toRouteLineExpressionEventData(workerCoroutineContext, data),
     )
 }
diff --git a/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/RouteLineHistoryRecordingPusher.kt b/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/RouteLineHistoryRecordingPusher.kt
@@ -69,7 +69,9 @@ internal class RouteLineHistoryRecordingPusher(
         recorder = null
     }
 
-    fun pushEventOrAddToQueue(@WorkerThread eventFormer: suspend (CoroutineContext) -> RouteLineEvent) {
+    fun pushEventOrAddToQueue(
+        @WorkerThread eventFormer: suspend (CoroutineContext) -> RouteLineEvent,
+    ) {
         val recorderCopy = recorder
         if (recorderCopy == null) {
             eventsQueue.add(eventFormer)
@@ -96,7 +98,10 @@ internal class RouteLineHistoryRecordingPusher(
         }
     }
 
-    fun pushEventIfEnabled(@WorkerThread eventFormer: suspend (CoroutineContext) -> RouteLineEvent) {
+    fun pushEventIfEnabled(
+        @WorkerThread
+        eventFormer: suspend (CoroutineContext) -> RouteLineEvent,
+    ) {
         recorder?.let { pushEvent(it, eventFormer) }
     }
 }
diff --git a/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/RouteLineHistoryRecordingViewSender.kt b/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/RouteLineHistoryRecordingViewSender.kt
@@ -66,34 +66,11 @@ internal class RouteLineHistoryRecordingViewSender : RouteLineHistoryRecordingIn
         value: Expected<RouteLineError, RouteSetValue>,
     ) {
         options.also { data ->
-            RouteLineHistoryRecordingPusherProvider.instance.pushEventIfEnabled { workerCoroutineContext ->
-                RouteLineViewEvent(
-                    instanceId,
-                    RouteLineViewRenderRouteDrawDataValue(
-                        styleId,
-                        value.toInput {
-                            if (data == null) {
-                                RouteLineViewDataError("NoOptions")
-                            } else {
-                                toEventValue(workerCoroutineContext, data)
-                            }
-                        },
-                    ),
-                )
-            }
-        }
-    }
-
-    fun sendRenderRouteLineUpdateEvent(
-        styleId: String?,
-        value: Expected<RouteLineError, RouteLineUpdateValue>,
-    ) {
-        options.also { data ->
-            if (value.isValue) {
-                RouteLineHistoryRecordingPusherProvider.instance.pushEventIfEnabled { workerCoroutineContext ->
+            RouteLineHistoryRecordingPusherProvider.instance
+                .pushEventIfEnabled { workerCoroutineContext ->
                     RouteLineViewEvent(
                         instanceId,
-                        RouteLineViewRenderRouteLineUpdateValue(
+                        RouteLineViewRenderRouteDrawDataValue(
                             styleId,
                             value.toInput {
                                 if (data == null) {
@@ -105,6 +82,31 @@ internal class RouteLineHistoryRecordingViewSender : RouteLineHistoryRecordingIn
                         ),
                     )
                 }
+        }
+    }
+
+    fun sendRenderRouteLineUpdateEvent(
+        styleId: String?,
+        value: Expected<RouteLineError, RouteLineUpdateValue>,
+    ) {
+        options.also { data ->
+            if (value.isValue) {
+                RouteLineHistoryRecordingPusherProvider.instance
+                    .pushEventIfEnabled { workerCoroutineContext ->
+                        RouteLineViewEvent(
+                            instanceId,
+                            RouteLineViewRenderRouteLineUpdateValue(
+                                styleId,
+                                value.toInput {
+                                    if (data == null) {
+                                        RouteLineViewDataError("NoOptions")
+                                    } else {
+                                        toEventValue(workerCoroutineContext, data)
+                                    }
+                                },
+                            ),
+                        )
+                    }
             }
         }
     }
diff --git a/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/api/RouteLineCommandProvider.kt b/ui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/line/api/RouteLineCommandProvider.kt
@@ -17,7 +17,8 @@ internal fun interface RouteLineCommandProvider<T, R> {
     suspend fun generateCommand(workerCoroutineContext: CoroutineContext, input: R): T
 }
 
-internal abstract class RouteLineValueProvider : RouteLineCommandProvider<StylePropertyValue, RouteLineViewOptionsData>
+internal abstract class RouteLineValueProvider :
+    RouteLineCommandProvider<StylePropertyValue, RouteLineViewOptionsData>
 
 /**
  * Version of [RouteLineValueProvider] that does not use a worker context to generate the expression.
diff --git a/ui-maps/src/test/java/com/mapbox/navigation/ui/maps/internal/route/line/RouteLineDataConverterTest.kt b/ui-maps/src/test/java/com/mapbox/navigation/ui/maps/internal/route/line/RouteLineDataConverterTest.kt
@@ -709,14 +709,22 @@ internal class RouteLineDataConverterTest {
     }
 
     private suspend fun checkGradient(holder: RouteLineValueCommandHolder, exp: Expression) {
-        holder.applier.applyCommand(style, layerId, holder.provider.generateCommand(coroutineContext, eventData))
+        holder.applier.applyCommand(
+            style,
+            layerId,
+            holder.provider.generateCommand(coroutineContext, eventData),
+        )
         verify(exactly = 1) {
             style.setStyleLayerProperty(layerId, "line-gradient", exp)
         }
     }
 
     private suspend fun checkTrimOffset(holder: RouteLineValueCommandHolder, exp: Expression) {
-        holder.applier.applyCommand(style, layerId, holder.provider.generateCommand(coroutineContext, eventData))
+        holder.applier.applyCommand(
+            style,
+            layerId,
+            holder.provider.generateCommand(coroutineContext, eventData),
+        )
         verify(exactly = 1) {
             style.setStyleLayerProperty(layerId, "line-trim-offset", exp)
         }
diff --git a/ui-maps/src/test/java/com/mapbox/navigation/ui/maps/route/line/api/RouteLineValueCommandHolderTest.kt b/ui-maps/src/test/java/com/mapbox/navigation/ui/maps/route/line/api/RouteLineValueCommandHolderTest.kt
@@ -39,14 +39,19 @@ internal class RouteLineValueCommandHolderTest {
     fun toRouteLineExpressionEventData_throws() = runBlocking {
         val viewData = mockk<RouteLineViewOptionsData>(relaxed = true)
         val provider = mockk<RouteLineValueProvider>(relaxed = true) {
-            coEvery { generateCommand(coroutineContext, viewData) } throws UnsupportedOperationException()
+            coEvery {
+                generateCommand(
+                    coroutineContext,
+                    viewData,
+                )
+            } throws UnsupportedOperationException()
         }
         val applier = mockk<RouteLineCommandApplier<StylePropertyValue>>(relaxed = true) {
             every { getProperty() } returns "some-property"
         }
         val data = RouteLineValueCommandHolder(provider, applier)
 
-        val actual = data.toRouteLineExpressionEventData(coroutineContext,  viewData)
+        val actual = data.toRouteLineExpressionEventData(coroutineContext, viewData)
         assertTrue(actual is RouteLineNoOpExpressionEventData)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,9 @@ internal class RouteLineHistoryRecordingPusher(`
`69`	`69`	`recorder = null`
`70`	`70`	`}`
`71`	`71`
`72`		`- fun pushEventOrAddToQueue(@WorkerThread eventFormer: suspend (CoroutineContext) -> RouteLineEvent) {`
	`72`	`+ fun pushEventOrAddToQueue(`
	`73`	`+ @WorkerThread eventFormer: suspend (CoroutineContext) -> RouteLineEvent,`
	`74`	`+ ) {`
`73`	`75`	`val recorderCopy = recorder`
`74`	`76`	`if (recorderCopy == null) {`
`75`	`77`	`eventsQueue.add(eventFormer)`
`@@ -96,7 +98,10 @@ internal class RouteLineHistoryRecordingPusher(`
`96`	`98`	`}`
`97`	`99`	`}`
`98`	`100`
`99`		`- fun pushEventIfEnabled(@WorkerThread eventFormer: suspend (CoroutineContext) -> RouteLineEvent) {`
	`101`	`+ fun pushEventIfEnabled(`
	`102`	`+ @WorkerThread`
	`103`	`+ eventFormer: suspend (CoroutineContext) -> RouteLineEvent,`
	`104`	`+ ) {`
`100`	`105`	`recorder?.let { pushEvent(it, eventFormer) }`
`101`	`106`	`}`
`102`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ internal fun interface RouteLineCommandProvider<T, R> {`
`17`	`17`	`suspend fun generateCommand(workerCoroutineContext: CoroutineContext, input: R): T`
`18`	`18`	`}`
`19`	`19`
`20`		`-internal abstract class RouteLineValueProvider : RouteLineCommandProvider<StylePropertyValue, RouteLineViewOptionsData>`
	`20`	`+internal abstract class RouteLineValueProvider :`
	`21`	`+ RouteLineCommandProvider<StylePropertyValue, RouteLineViewOptionsData>`
`21`	`22`
`22`	`23`	`/**`
`23`	`24`	`* Version of [RouteLineValueProvider] that does not use a worker context to generate the expression.`
Original file line number	Diff line number	Diff line change
`@@ -709,14 +709,22 @@ internal class RouteLineDataConverterTest {`
`709`	`709`	`}`
`710`	`710`
`711`	`711`	`private suspend fun checkGradient(holder: RouteLineValueCommandHolder, exp: Expression) {`
`712`		`- holder.applier.applyCommand(style, layerId, holder.provider.generateCommand(coroutineContext, eventData))`
	`712`	`+ holder.applier.applyCommand(`
	`713`	`+ style,`
	`714`	`+ layerId,`
	`715`	`+ holder.provider.generateCommand(coroutineContext, eventData),`
	`716`	`+ )`
`713`	`717`	`verify(exactly = 1) {`
`714`	`718`	`style.setStyleLayerProperty(layerId, "line-gradient", exp)`
`715`	`719`	`}`
`716`	`720`	`}`
`717`	`721`
`718`	`722`	`private suspend fun checkTrimOffset(holder: RouteLineValueCommandHolder, exp: Expression) {`
`719`		`- holder.applier.applyCommand(style, layerId, holder.provider.generateCommand(coroutineContext, eventData))`
	`723`	`+ holder.applier.applyCommand(`
	`724`	`+ style,`
	`725`	`+ layerId,`
	`726`	`+ holder.provider.generateCommand(coroutineContext, eventData),`
	`727`	`+ )`
`720`	`728`	`verify(exactly = 1) {`
`721`	`729`	`style.setStyleLayerProperty(layerId, "line-trim-offset", exp)`
`722`	`730`	`}`