From 16b0cf7506c1998cb0799d89cb3125ba3e3322a1 Mon Sep 17 00:00:00 2001 From: "roberto.manca" Date: Wed, 6 Apr 2022 16:07:52 +0200 Subject: [PATCH] Enabled no wild card rule (java.util.* as only exception) --- config/detekt.yml | 2 -- .../kotlin/com/octawizard/server/route/MockAuthConfig.kt | 5 +++-- .../kotlin/com/octawizard/server/route/UtilsKtTest.kt | 7 ++++--- src/test/kotlin/com/octawizard/server/route/testUtils.kt | 9 +++++++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/config/detekt.yml b/config/detekt.yml index c935a0c..4282c99 100644 --- a/config/detekt.yml +++ b/config/detekt.yml @@ -20,8 +20,6 @@ complexity: ignoreOverridden: true formatting: - NoWildcardImports: - active: false NoConsecutiveBlankLines: excludes: [ '**/test/**'] Indentation: diff --git a/src/test/kotlin/com/octawizard/server/route/MockAuthConfig.kt b/src/test/kotlin/com/octawizard/server/route/MockAuthConfig.kt index 6ae9eb4..60f9414 100644 --- a/src/test/kotlin/com/octawizard/server/route/MockAuthConfig.kt +++ b/src/test/kotlin/com/octawizard/server/route/MockAuthConfig.kt @@ -9,8 +9,9 @@ import com.octawizard.server.route.MockAuthConfig.algorithm import com.octawizard.server.route.MockAuthConfig.jwtAudience import com.octawizard.server.route.MockAuthConfig.jwtIssuer import com.octawizard.server.route.MockAuthConfig.jwtRealm -import io.ktor.auth.* -import io.ktor.auth.jwt.* +import io.ktor.auth.Authentication +import io.ktor.auth.jwt.JWTPrincipal +import io.ktor.auth.jwt.jwt import java.time.Instant import java.util.* diff --git a/src/test/kotlin/com/octawizard/server/route/UtilsKtTest.kt b/src/test/kotlin/com/octawizard/server/route/UtilsKtTest.kt index aa9bfd9..40256d0 100644 --- a/src/test/kotlin/com/octawizard/server/route/UtilsKtTest.kt +++ b/src/test/kotlin/com/octawizard/server/route/UtilsKtTest.kt @@ -1,8 +1,9 @@ package com.octawizard.server.route -import io.ktor.application.* -import io.ktor.http.* -import io.ktor.request.* +import io.ktor.application.ApplicationCall +import io.ktor.http.Parameters +import io.ktor.http.ParametersBuilder +import io.ktor.request.ApplicationRequest import io.mockk.every import io.mockk.mockk import org.junit.jupiter.api.Assertions.assertEquals diff --git a/src/test/kotlin/com/octawizard/server/route/testUtils.kt b/src/test/kotlin/com/octawizard/server/route/testUtils.kt index db0cf5e..9e82a72 100644 --- a/src/test/kotlin/com/octawizard/server/route/testUtils.kt +++ b/src/test/kotlin/com/octawizard/server/route/testUtils.kt @@ -1,8 +1,13 @@ package com.octawizard.server.route import com.octawizard.server.serialization.contextualSerializers -import io.ktor.http.* -import io.ktor.server.testing.* +import io.ktor.http.ContentType +import io.ktor.http.HttpHeaders +import io.ktor.http.HttpMethod +import io.ktor.http.decodeURLQueryComponent +import io.ktor.server.testing.TestApplicationCall +import io.ktor.server.testing.TestApplicationEngine +import io.ktor.server.testing.setBody import kotlinx.serialization.json.Json val JsonSerde = Json {