From 6664e4b3bbc449dd5c1e06f418741b556a9564a3 Mon Sep 17 00:00:00 2001 From: Evgeny Mandrikov Date: Tue, 3 Dec 2024 20:37:23 +0100 Subject: [PATCH] Reduce code duplication --- .../java/org/sonarsource/kotlin/api/checks/ArgumentMatcher.kt | 2 -- .../java/org/sonarsource/kotlin/checks/DataHashingCheck.kt | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/sonar-kotlin-api/src/main/java/org/sonarsource/kotlin/api/checks/ArgumentMatcher.kt b/sonar-kotlin-api/src/main/java/org/sonarsource/kotlin/api/checks/ArgumentMatcher.kt index 999c60f7c..8e885a046 100644 --- a/sonar-kotlin-api/src/main/java/org/sonarsource/kotlin/api/checks/ArgumentMatcher.kt +++ b/sonar-kotlin-api/src/main/java/org/sonarsource/kotlin/api/checks/ArgumentMatcher.kt @@ -56,5 +56,3 @@ class ArgumentMatcher( // as it seems to be the best option to get a type's simple name typeName?.let { it == kotlinType?.nameIfStandardType?.asString() } ?: true } - -val ANY = ArgumentMatcher() diff --git a/sonar-kotlin-checks/src/main/java/org/sonarsource/kotlin/checks/DataHashingCheck.kt b/sonar-kotlin-checks/src/main/java/org/sonarsource/kotlin/checks/DataHashingCheck.kt index 374f6c0bb..ef0e30c6c 100644 --- a/sonar-kotlin-checks/src/main/java/org/sonarsource/kotlin/checks/DataHashingCheck.kt +++ b/sonar-kotlin-checks/src/main/java/org/sonarsource/kotlin/checks/DataHashingCheck.kt @@ -20,7 +20,6 @@ import org.jetbrains.kotlin.psi.KtCallExpression import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.resolve.BindingContext import org.sonar.check.Rule -import org.sonarsource.kotlin.api.checks.ANY import org.sonarsource.kotlin.api.checks.AbstractCheck import org.sonarsource.kotlin.api.checks.ArgumentMatcher import org.sonarsource.kotlin.api.checks.ConstructorMatcher @@ -88,7 +87,7 @@ private val WEAK_METHOD_MATCHERS = listOf( ) + CRYPTO_APIS.map { FunMatcher(qualifier = it, name = GET_INSTANCE) { withArguments(STRING_TYPE) - withArguments(ArgumentMatcher(typeName = STRING_TYPE), ANY) + withArguments(ArgumentMatcher(typeName = STRING_TYPE), ArgumentMatcher.ANY) } }