From fd8fed7f6f74ef26dca9388aaa3a8be393e7a18c Mon Sep 17 00:00:00 2001 From: Piotr Adamczyk Date: Wed, 20 Jan 2021 15:01:36 +0100 Subject: [PATCH] fixed MR comments --- .../ftl/analytics/StatisticDataFilters.kt | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test_runner/src/main/kotlin/ftl/analytics/StatisticDataFilters.kt b/test_runner/src/main/kotlin/ftl/analytics/StatisticDataFilters.kt index 6a9dcf3997..1bf12fc827 100644 --- a/test_runner/src/main/kotlin/ftl/analytics/StatisticDataFilters.kt +++ b/test_runner/src/main/kotlin/ftl/analytics/StatisticDataFilters.kt @@ -9,25 +9,23 @@ annotation class IgnoreInStatistics annotation class AnonymizeInStatistics internal val keysToRemove by lazy { - classesForStatistics.map { it.ignoredMembersForStatistics() }.flatten() + classesForStatistics.map(findMembersWithAnnotation(IgnoreInStatistics::class)).flatten() } -private fun KClass<*>.ignoredMembersForStatistics() = findMembersWithAnnotation(IgnoreInStatistics::class) - internal val keysToAnonymize by lazy { - classesForStatistics.map { it.anonymousMembersForStatistics() }.flatten() + classesForStatistics.map(findMembersWithAnnotation(AnonymizeInStatistics::class)).flatten() } -private fun KClass<*>.anonymousMembersForStatistics() = findMembersWithAnnotation(AnonymizeInStatistics::class) - private val classesForStatistics = listOf(IArgs::class, AndroidArgs::class, IosArgs::class) -private const val ANONYMIZE_VALUE = "..." - -private fun KClass<*>.findMembersWithAnnotation(annotationType: KClass<*>) = members.filter { member -> - member.annotations.any { annotation -> annotation.annotationClass == annotationType } -}.map { - it.name +private fun findMembersWithAnnotation( + annotationType: KClass<*> +): KClass<*>.() -> List = { + members.filter { member -> + member.annotations.any { annotation -> annotation.annotationClass == annotationType } + }.map { + it.name + } } internal fun Map.removeNotNeededKeys(defaultArgs: Map) = @@ -46,3 +44,5 @@ private fun Any.toAnonymous(): Any = when (this) { is List<*> -> "Count: $size" else -> ANONYMIZE_VALUE } + +private const val ANONYMIZE_VALUE = "..."