Skip to content

Commit 33478a9

Browse files
committed
RUM-15813: Fix detekt
1 parent 8ceed54 commit 33478a9

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

integrations/dd-sdk-android-compose/src/main/kotlin/com/datadog/android/compose/internal/utils/LayoutNodeUtils.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ internal class LayoutNodeUtils {
106106
getLayoutNodeBoundsInWindowInternal(node) ?: getLayoutNodeBoundsInWindowReflection(node)
107107
}
108108

109-
MethodResolver.State.MAGLING_FAILED -> getLayoutNodeBoundsInWindowReflection(node)
109+
MethodResolver.State.MANGLING_FAILED -> getLayoutNodeBoundsInWindowReflection(node)
110110
MethodResolver.State.REFLECTION_FAILED -> getLayoutNodeBoundsInWindowInternal(node)
111111
}
112112

@@ -118,7 +118,7 @@ internal class LayoutNodeUtils {
118118
"getLayoutNodeBoundsInWindow[reflection]"
119119
) {
120120
// TODO RUM-13454 Update compose bom and remove this method
121-
methodResolver.state = MethodResolver.State.MAGLING_FAILED
121+
methodResolver.state = MethodResolver.State.MANGLING_FAILED
122122
val coordinates = node.invokeWithReflection("getLayoutDelegate")
123123
?.invokeWithReflection("getOuterCoordinator")
124124
?.invokeWithReflection("getCoordinates") as? LayoutCoordinates
@@ -166,9 +166,9 @@ internal class LayoutNodeUtils {
166166
// per owner-class rather than once globally.
167167
//
168168
enum class State {
169-
UNKNOWN, // — Try internal magling resolution, if fails - reflection.
170-
MAGLING_FAILED, // Magling resolution failed - allowing reflection attempt
171-
REFLECTION_FAILED // Reflection resolution failed - switching back to magling resolution (even if it fails)
169+
UNKNOWN, // — Try internal mangling resolution, if fails - reflection.
170+
MANGLING_FAILED, // Mangling resolution failed - allowing reflection attempt
171+
REFLECTION_FAILED // Reflection resolution failed - switching back to mangling resolution (even if it fails)
172172
}
173173

174174
var state: State = State.UNKNOWN

integrations/dd-sdk-android-compose/src/test/kotlin/com/datadog/android/compose/internal/utils/LayoutNodeUtilsTest.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ class LayoutNodeUtilsTest {
243243
@Test
244244
fun `M use reflection path only W getLayoutNodeBoundsInWindow() {reflection already activated}`() {
245245
// Given
246-
testedLayoutNodeUtils.methodResolver().state = LayoutNodeUtils.MethodResolver.State.MAGLING_FAILED
246+
testedLayoutNodeUtils.methodResolver().state = LayoutNodeUtils.MethodResolver.State.MANGLING_FAILED
247247
val mockNode = mock<LayoutNode>()
248248

249249
// When
@@ -267,7 +267,7 @@ class LayoutNodeUtilsTest {
267267

268268
// Then
269269
val resolver = testedLayoutNodeUtils.methodResolver()
270-
assertThat(resolver.state).isEqualTo(LayoutNodeUtils.MethodResolver.State.MAGLING_FAILED)
270+
assertThat(resolver.state).isEqualTo(LayoutNodeUtils.MethodResolver.State.MANGLING_FAILED)
271271
assertThat(resolver.classPrefixMethodsCache)
272272
.containsKey(mockNode.javaClass)
273273
assertThat(resolver.classPrefixMethodsCache[mockNode.javaClass])
@@ -279,7 +279,7 @@ class LayoutNodeUtilsTest {
279279
// Given
280280
// Force reflection path so all three levels (LayoutNode, LayoutNodeLayoutDelegate,
281281
// NodeCoordinator) are traversed and cached — the maximum cache size for this chain.
282-
testedLayoutNodeUtils.methodResolver().state = LayoutNodeUtils.MethodResolver.State.MAGLING_FAILED
282+
testedLayoutNodeUtils.methodResolver().state = LayoutNodeUtils.MethodResolver.State.MANGLING_FAILED
283283
val mockNode = mockLayoutNodeWithValidInternalPath()
284284
testedLayoutNodeUtils.getLayoutNodeBoundsInWindow(mockNode)
285285
val cache = testedLayoutNodeUtils.methodResolver().classPrefixMethodsCache
@@ -373,7 +373,7 @@ class LayoutNodeUtilsTest {
373373

374374
// When
375375
methodResolver.state = LayoutNodeUtils.MethodResolver.State.UNKNOWN
376-
methodResolver.state = LayoutNodeUtils.MethodResolver.State.MAGLING_FAILED
376+
methodResolver.state = LayoutNodeUtils.MethodResolver.State.MANGLING_FAILED
377377

378378
// Then
379379
assertThat(methodResolver.state)
@@ -384,14 +384,14 @@ class LayoutNodeUtilsTest {
384384
fun `M not downgrade state W MethodResolver#state {MAGLING_FAILED cannot revert to UNKNOWN}`() {
385385
// Given
386386
val methodResolver = LayoutNodeUtils.MethodResolver()
387-
methodResolver.state = LayoutNodeUtils.MethodResolver.State.MAGLING_FAILED
387+
methodResolver.state = LayoutNodeUtils.MethodResolver.State.MANGLING_FAILED
388388

389389
// When
390390
methodResolver.state = LayoutNodeUtils.MethodResolver.State.UNKNOWN
391391

392392
// Then
393393
assertThat(methodResolver.state)
394-
.isEqualTo(LayoutNodeUtils.MethodResolver.State.MAGLING_FAILED)
394+
.isEqualTo(LayoutNodeUtils.MethodResolver.State.MANGLING_FAILED)
395395
}
396396

397397
@Test
@@ -457,7 +457,7 @@ class LayoutNodeUtilsTest {
457457
// ignored the cache and re-searched, it would return null (and downgrade to
458458
// REFLECTION_FAILED).
459459
val methodResolver = LayoutNodeUtils.MethodResolver()
460-
methodResolver.state = LayoutNodeUtils.MethodResolver.State.MAGLING_FAILED
460+
methodResolver.state = LayoutNodeUtils.MethodResolver.State.MANGLING_FAILED
461461
val knownMethod = SuffixFixture::class.java.getMethod("foo")
462462
methodResolver.classPrefixMethodsCache[SuffixFixture::class.java] =
463463
mutableMapOf("bogus" to knownMethod)
@@ -468,7 +468,7 @@ class LayoutNodeUtilsTest {
468468
// Then
469469
assertThat(result).isSameAs(knownMethod)
470470
assertThat(methodResolver.state)
471-
.isEqualTo(LayoutNodeUtils.MethodResolver.State.MAGLING_FAILED)
471+
.isEqualTo(LayoutNodeUtils.MethodResolver.State.MANGLING_FAILED)
472472
}
473473

474474
@Test
@@ -478,7 +478,7 @@ class LayoutNodeUtilsTest {
478478
// even when the method actually exists on the class. State still transitions to
479479
// REFLECTION_FAILED because findMethod's post-condition fires on any null result.
480480
val methodResolver = LayoutNodeUtils.MethodResolver()
481-
methodResolver.state = LayoutNodeUtils.MethodResolver.State.MAGLING_FAILED
481+
methodResolver.state = LayoutNodeUtils.MethodResolver.State.MANGLING_FAILED
482482
methodResolver.classPrefixMethodsCache[SuffixFixture::class.java] =
483483
mutableMapOf("foo" to null)
484484

0 commit comments

Comments
 (0)