Update all non-major dependencies (except core Kotlin) (#930)

* Update all non-major dependencies (except core Kotlin) * Update detekt.yml * Update detekt.yml: add `--continue` flag * Fix detekt findings Co-authored-by: Peter Trifanov <[email protected]>
saveourtool · Jul 18, 2022 · 044514b · 044514b
1 parent 9fb144c
commit 044514b
Show file tree

Hide file tree

Showing 16 changed files with 44 additions and 40 deletions.
diff --git a/.github/workflows/detekt.yml b/.github/workflows/detekt.yml
@@ -22,9 +22,11 @@ jobs:
           arguments: |
             detektAll
             --build-cache
+            --continue
             -PgprUser=${{ github.actor }}
             -PgprKey=${{ secrets.GITHUB_TOKEN }}
       - name: Upload SARIF to Github
+        if: ${{ always() }}
         uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: build/detekt-sarif-reports/detekt-merged.sarif

diff --git a/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/security/WebSecurityConfig.kt b/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/security/WebSecurityConfig.kt
@@ -21,7 +21,6 @@ import org.springframework.security.authorization.AuthenticatedReactiveAuthoriza
 import org.springframework.security.authorization.AuthorizationDecision
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity
 import org.springframework.security.config.web.server.ServerHttpSecurity
-import org.springframework.security.core.userdetails.ReactiveUserDetailsService
 import org.springframework.security.core.userdetails.UserDetails
 import org.springframework.security.crypto.factory.PasswordEncoderFactories
 import org.springframework.security.crypto.password.PasswordEncoder
@@ -139,27 +138,23 @@ class WebSecurityConfig(
         .httpBasic { httpBasicSpec ->
             // Authenticate by comparing received basic credentials with existing one from DB
             httpBasicSpec.authenticationManager(
-                UserDetailsRepositoryReactiveAuthenticationManager(
-                    object : ReactiveUserDetailsService {
-                        // Looking for user in DB by received source and name
-                        override fun findByUsername(username: String): Mono<UserDetails> {
-                            require(username.contains("@")) {
-                                "Provided user information should keep the following form: oauth2Source@username"
-                            }
-                            val user: Mono<StringResponse> = webClient.get()
-                                .uri("/internal/users/$username")
-                                .retrieve()
-                                .onStatus({ it.is4xxClientError }) {
-                                    Mono.error(ResponseStatusException(it.statusCode()))
-                                }
-                                .toEntity()
-
-                            return user.map {
-                                objectMapper.readValue(it.body, UserDetails::class.java)
-                            }
+                UserDetailsRepositoryReactiveAuthenticationManager { username ->
+                    // Looking for user in DB by received source and name
+                    require(username.contains("@")) {
+                        "Provided user information should keep the following form: oauth2Source@username"
+                    }
+                    val user: Mono<StringResponse> = webClient.get()
+                        .uri("/internal/users/$username")
+                        .retrieve()
+                        .onStatus({ it.is4xxClientError }) {
+                            Mono.error(ResponseStatusException(it.statusCode()))
                         }
+                        .toEntity()
+
+                    user.map {
+                        objectMapper.readValue(it.body, UserDetails::class.java)
                     }
-                )
+                }
             )
         }
         .logout {

diff --git a/detekt.yml b/detekt.yml
@@ -316,6 +316,9 @@ naming:
     excludes: ['**/resources/**']
     active: true
     ignoreOverridden: true
+  NoNameShadowing:
+    # Different rule (in Diktat) checks that implicit lambda hasn't been shadowed.
+    active: false
   NonBooleanPropertyPrefixedWithIs:
     active: true
   ObjectPropertyNaming:

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,20 +5,20 @@ ktor = "2.0.3"
 okio = "3.2.0"
 serialization = "1.3.3"
 kotlinx-datetime = "0.4.0"
-kotlinx-coroutines = "1.6.3"
-kotlin-wrappers = "1.0.0-pre.354"
-spring = "5.3.21"
+kotlinx-coroutines = "1.6.4"
+kotlin-wrappers = "1.0.0-pre.357"
+spring = "5.3.22"
 spring-boot = "2.7.1"
 spring-security = "5.7.2"
 spring-cloud = "3.1.3"
 spring-cloud-kubernetes = "2.1.3"
 junit = "5.8.2"
 diktat = "1.2.1"
-detekt = "1.20.0"
+detekt = "1.21.0"
 liquibase-core = "4.13.0"
 docker-java = "3.2.13"
 jgit = "6.2.0.202206071550-r"
-reactor = "1.1.6"
+reactor = "1.1.7"
 mockito-kotlin = "4.0.0"
 slf4j = "1.7.36"
 logback = "1.2.11"
@@ -33,7 +33,7 @@ reckon = "0.16.1"
 commons-compress = "1.21"
 picocli = "4.6.3"
 zip4j = "2.11.1"
-ktoml = "0.2.12"
+ktoml = "0.2.13"
 springdoc = "1.6.9"
 kotlinx-cli = "0.3.5"
 spotless = "6.8.0"

diff --git a/save-api/src/main/kotlin/com/saveourtool/save/api/utils/RequestUtils.kt b/save-api/src/main/kotlin/com/saveourtool/save/api/utils/RequestUtils.kt
@@ -214,7 +214,7 @@ fun initializeHttpClient(
                 // therefore, adding sendWithoutRequest is required
                 sendWithoutRequest { true }
                 credentials {
-                    BasicAuthCredentials(username = authorization.userInformation, password = authorization.token ?: "")
+                    BasicAuthCredentials(username = authorization.userInformation, password = authorization.token.orEmpty())
                 }
             }
         }

diff --git a/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/ContestController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/ContestController.kt
@@ -98,7 +98,7 @@ internal class ContestController(
         }.map { testFilesContent ->
             testFilesContent.copy(
                 language = testSuite.language,
-                tags = test.tagsAsList() ?: emptyList(),
+                tags = test.tagsAsList().orEmpty(),
             )
         }
     }

diff --git a/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/ExecutionController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/ExecutionController.kt
@@ -336,7 +336,7 @@ class ExecutionController(private val executionService: ExecutionService,
         ?.map {
             it.testRootPath
         }
-        ?: emptyList()
+        .orEmpty()
 
     /**
      * @param execution

diff --git a/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/UserDetailsService.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/UserDetailsService.kt
@@ -52,7 +52,7 @@ class UserDetailsService(
         if (!user.isPresent) {
             val sourceMsg = source?.let {
                 " and source=$source"
-            } ?: ""
+            }.orEmpty()
             logger.warn("Couldn't find user with name=$username$sourceMsg in DB!")
         }
         user.isPresent
@@ -67,7 +67,7 @@ class UserDetailsService(
     @Suppress("UnsafeCallOnNullableType")
     private fun User.toIdentitySourceAwareUserDetails(): IdentitySourceAwareUserDetails = IdentitySourceAwareUserDetails(
         username = this.name!!,
-        password = this.password ?: "",
+        password = this.password.orEmpty(),
         authorities = this.role,
         identitySource = this.source,
         id = this.id!!,

diff --git a/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/AgentsControllerTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/AgentsControllerTest.kt
@@ -105,8 +105,7 @@ class AgentsControllerTest {
             transactionTemplate.execute {
                 agentStatusRepository
                     .findAll()
-                    .filter { it.state == AgentState.IDLE && it.agent.containerId == "container-2" }
-                    .size == 1
+                    .count { it.state == AgentState.IDLE && it.agent.containerId == "container-2" } == 1
             }!!
         )
 

diff --git a/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Test.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Test.kt
@@ -53,7 +53,7 @@ class Test(
         pluginName,
         testSuite.id!!,
         hash,
-        tagsAsList() ?: emptyList(),
+        tagsAsList().orEmpty(),
         additionalFilesAsList(),
     )
 }
diff --git a/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/TestExecution.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/TestExecution.kt
@@ -68,12 +68,17 @@ class TestExecution(
         startTime?.toEpochSecond(ZoneOffset.UTC),
         endTime?.toEpochSecond(ZoneOffset.UTC),
         test.testSuite.name,
-        test.tags?.split(";")?.filter { it.isNotBlank() } ?: emptyList(),
+        tagsList(),
         unmatched,
         matched,
         expected,
         unexpected,
         null,
         execution.id,
     )
+
+    private fun tagsList() = test.tags
+        ?.split(";")
+        ?.filter { it.isNotBlank() }
+        .orEmpty()
 }
diff --git a/...-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/storage/AbstractFileBasedStorage.kt b/...-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/storage/AbstractFileBasedStorage.kt
@@ -53,7 +53,7 @@ abstract class AbstractFileBasedStorage<K>(
         return Mono.fromCallable {
             contentPath.parent.createDirectoriesIfRequired()
             contentPath.createFile()
-        }.flatMap {
+        }.flatMap { _ ->
             content.map { byteBuffer ->
                 contentPath.outputStream(StandardOpenOption.APPEND).use { os ->
                     Channels.newChannel(os).use { it.write(byteBuffer) }

diff --git a/...ud-common/src/jvmMain/kotlin/com/saveourtool/save/utils/IdentitySourceAwareUserDetails.kt b/...ud-common/src/jvmMain/kotlin/com/saveourtool/save/utils/IdentitySourceAwareUserDetails.kt
@@ -20,5 +20,5 @@ class IdentitySourceAwareUserDetails(
     authorities?.split(',')
         ?.filter { it.isNotBlank() }
         ?.map { SimpleGrantedAuthority(it) }
-        ?: emptyList()
+        .orEmpty()
 )
diff --git a/...in/kotlin/com/saveourtool/save/frontend/components/basic/projects/ProjectStatisticMenu.kt b/...in/kotlin/com/saveourtool/save/frontend/components/basic/projects/ProjectStatisticMenu.kt
@@ -110,7 +110,7 @@ private fun projectStatisticMenu() = FC<ProjectStatisticMenuProps> { props ->
                 className = ClassName("col-xl col-md-6 mb-4")
                 val data = latestExecutionStatisticDtos?.map {
                     DataPieChart(it.testSuiteName, it.countTest, randomColor())
-                } ?: emptyList()
+                }.orEmpty()
                 pieChart(
                     data.toTypedArray()
                 ) {

diff --git a/...ontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/OrganizationView.kt b/...ontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/OrganizationView.kt
@@ -400,7 +400,7 @@ class OrganizationView : AbstractView<OrganizationProps, OrganizationViewState>(
             div {
                 className = ClassName("col-3")
                 userBoard {
-                    users = state.usersInOrganization ?: emptyList()
+                    users = state.usersInOrganization.orEmpty()
                 }
             }
         }

diff --git a/...rchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/docker/KubernetesManager.kt b/...rchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/docker/KubernetesManager.kt
@@ -110,7 +110,7 @@ class KubernetesManager(
         }
             .take(10)
             .firstOrNull { it.isNotEmpty() }
-            ?: emptyList()
+            .orEmpty()
     }
 
     override fun start(executionId: Long) {