Skip to content

Commit

Permalink
Update all non-major dependencies (except core Kotlin) (#2141)
Browse files Browse the repository at this point in the history
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Nariman Abdullin <[email protected]>
  • Loading branch information
3 people authored Jun 13, 2023
1 parent 0ada78a commit 57cf27c
Show file tree
Hide file tree
Showing 52 changed files with 255 additions and 289 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.saveourtool.save.gateway.controller

import com.saveourtool.save.gateway.utils.userName
import com.saveourtool.save.info.OauthProviderInfo
import org.slf4j.LoggerFactory
import org.springframework.security.oauth2.client.registration.InMemoryReactiveClientRegistrationRepository
import org.springframework.web.bind.annotation.*
import java.security.Principal
Expand All @@ -15,8 +14,6 @@ import java.security.Principal
class SecurityInfoController(
private val clientRegistrationRepository: InMemoryReactiveClientRegistrationRepository,
) {
private val logger = LoggerFactory.getLogger(SecurityInfoController::class.java)

/**
* @return a list of [OauthProviderInfo] for all configured providers
*/
Expand Down
37 changes: 19 additions & 18 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
[versions]
kotlin = "1.8.22"
jetbrains-annotations = "24.0.1"
save-cli = "0.3.9"
ktor = "2.3.0"
save-cli = "0.4.0-SNAPSHOT"
ktor = "2.3.1"
okio = "3.3.0"
serialization = "1.5.0"
serialization = "1.5.1"
kotlinx-datetime = "0.4.0"
kotlinx-coroutines = "1.6.4"
kotlin-wrappers = "1.0.0-pre.545"
spring-boot = "2.7.11"
kotlinx-coroutines = "1.7.1"
kotlin-wrappers = "1.0.0-pre.566"
spring-boot = "2.7.12"
spring-cloud = "3.1.7"
spring-cloud-kubernetes = "2.1.7"
kafka-client = "3.4.0"
kafka-client = "3.5.0"
junit = "5.9.3"
assertj = "3.24.2"
diktat = "1.2.5"
detekt = "1.22.0"
liquibase-core = "4.21.1"
docker-java = "3.3.0"
jgit = "6.5.0.202303070854-r"
detekt = "1.23.0"
liquibase-core = "4.22.0"
docker-java = "3.3.1"
jgit = "6.6.0.202305301015-r"
mockito = "5.3.1"
mockito-kotlin = "5.0.0"
# only in save-cli
log4j = "2.20.0"
jpa = "1.0.2"
mySql = "8.0.33"
testcontainers = "1.18.0"
testcontainers = "1.18.3"
okhttp3 = "4.11.0"
reckon = "0.18.0"
commons-compress = "1.23.0"
zip4j = "2.11.5"
ktoml = "0.4.1"
ktoml = "0.5.0"
springdoc = "1.7.0"
kotlinx-cli = "0.3.5"
spotless = "6.18.0"
fabric8 = "6.5.1"
spotless = "6.19.0"
fabric8 = "6.7.1"
arrow-kt = "1.1.5"
publish = "1.3.0"
download = "5.4.0"
cpg = "7.0.0"
# should be taken from cpg
cpg-neo4j-ogm = { strictly = "4.0.4" }
cpg-neo4j-java-driver = { strictly = "5.6.0" }
aws-sdk = "2.20.56"
aws-sdk = "2.20.84"

[plugins]
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
Expand Down Expand Up @@ -86,6 +86,7 @@ kotlinx-coroutines-core-linuxx64 = { module = "org.jetbrains.kotlinx:kotlinx-cor
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" }
ktoml-core = { module = "com.akuleshov7:ktoml-core", version.ref = "ktoml" }
ktoml-source = { module = "com.akuleshov7:ktoml-source", version.ref = "ktoml" }
ktoml-file = { module = "com.akuleshov7:ktoml-file", version.ref = "ktoml" }

spring-boot-dependencies = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "spring-boot" }
Expand Down Expand Up @@ -119,7 +120,7 @@ springdoc-openapi-ui = { module = "org.springdoc:springdoc-openapi-ui", version.
springdoc-openapi-webflux-ui = { module = "org.springdoc:springdoc-openapi-webflux-ui", version.ref = "springdoc" }
springdoc-openapi-security = { module = "org.springdoc:springdoc-openapi-security", version.ref = "springdoc" }
springdoc-openapi-kotlin = { module = "org.springdoc:springdoc-openapi-kotlin", version.ref = "springdoc" }
swagger-annotations = { module = "io.swagger.core.v3:swagger-annotations", version = "2.2.9" }
swagger-annotations = { module = "io.swagger.core.v3:swagger-annotations", version = "2.2.11" }

ktor-client-apache = { module = "io.ktor:ktor-client-apache", version.ref = "ktor" }
ktor-client-auth = { module = "io.ktor:ktor-client-auth", version.ref = "ktor" }
Expand Down Expand Up @@ -168,7 +169,7 @@ okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.
mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockito-kotlin" }
mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version = "5.6.1" }
kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version = "5.6.2" }

okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
slf4j-api = { module = "org.slf4j:slf4j-api" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ internal class ContestController(
@ApiResponse(responseCode = "404", description = "Contest with given name is not found.")
fun addOrDeleteContestToFeatured(
@RequestParam contestName: String,
authentication: Authentication,
): Mono<StringResponse> = getContestOrNotFound(contestName)
.flatMap {
blockingToMono {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,4 @@ class DemoManagerController(
) = onStatus({ it == HttpStatus.NOT_FOUND }) {
Mono.error(ResponseStatusException(HttpStatus.NOT_FOUND, "Could not find demo for $organizationName/$projectName."))
}
companion object {
private const val SAVE_DEMO_AGENT_KOMPOSE_NAME = "save-demo-agent"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ class LnkContestProjectController(
fun getAvailableContestsForProject(
@PathVariable organizationName: String,
@PathVariable projectName: String,
authentication: Authentication,
): Mono<List<String>> = Mono.fromCallable {
lnkContestProjectService.getByProjectNameAndOrganizationName(projectName, organizationName, MAX_AMOUNT)
.mapNotNull { it.contest.id }
Expand Down Expand Up @@ -168,7 +167,6 @@ class LnkContestProjectController(
@PathVariable contestName: String,
@PathVariable organizationName: String,
@PathVariable projectName: String,
authentication: Authentication,
): Flux<ExecutionDto> = getContestAndProject(contestName, organizationName, projectName)
.flatMapIterable { (contest, project) ->
lnkContestExecutionService.getPageExecutionsByContestAndProject(
Expand Down Expand Up @@ -200,7 +198,6 @@ class LnkContestProjectController(
@PathVariable organizationName: String,
@PathVariable projectName: String,
@PathVariable contestName: String,
authentication: Authentication
): Mono<ExecutionDto> = getContestAndProject(contestName, organizationName, projectName)
.flatMap { (contest, project) ->
lnkContestExecutionService.getLatestExecutionByContestAndProject(contest, project).toMono()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ class LnkUserOrganizationController(
fun getAllUsersNotFromOrganizationWithNamesStartingWith(
@PathVariable organizationName: String,
@RequestParam prefix: String,
authentication: Authentication,
): Mono<List<UserInfo>> = Mono.just(organizationName)
.filter {
prefix.isNotEmpty()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ internal class OrganizationController(
private val organizationPermissionEvaluator: OrganizationPermissionEvaluator,
private val gitService: GitService,
private val testSuitesSourceService: TestSuitesSourceService,
private val testSuitesService: TestSuitesService,
private val testsSourceVersionService: TestsSourceVersionService,
private val testsSourceSnapshotStorage: TestsSourceSnapshotStorage,
config: ConfigProperties,
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ class ProjectController(
@PreAuthorize("permitAll()")
fun update(
@RequestBody projectProblemDto: ProjectProblemDto,
authentication: Authentication,
): Mono<StringResponse> = blockingToMono {
projectProblemService.updateProjectProblem(projectProblemDto)
}.map {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@ class TestSuitesSourceController(
fun tagListToFetch(
@PathVariable organizationName: String,
@PathVariable sourceName: String,
authentication: Authentication,
): Mono<StringListResponse> = blockingToMono { testSuitesSourceService.findByName(organizationName, sourceName) }
.flatMap { testSuitesSourceService.tagList(it.toDto()) }
.map { tags ->
Expand All @@ -324,7 +323,6 @@ class TestSuitesSourceController(
fun branchListToFetch(
@PathVariable organizationName: String,
@PathVariable sourceName: String,
authentication: Authentication,
): Mono<StringListResponse> = blockingToMono { testSuitesSourceService.findByName(organizationName, sourceName) }
.flatMap { testSuitesSourceService.branchList(it.toDto()) }
.map { ResponseEntity.ok().body(it) }
Expand All @@ -339,9 +337,8 @@ class TestSuitesSourceController(
)
@ApiResponse(responseCode = "200", description = "Successfully fetched organizations with public test suite sources.")
fun getOrganizationNamesWithPublicTestSuiteSources(
authentication: Authentication,
): Mono<TestSuitesSourceDtoList> = testSuitesSourceService.getAvailableTestSuiteSources().toMono()
.map {testSuitesSourceList ->
.map { testSuitesSourceList ->
testSuitesSourceList.map { it.toDto() }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class OrganizationPermissionEvaluator(
* Only [SUPER_ADMIN] can ban the project. And a user with such a global role has permissions for all actions.
* Since we have all the rights issued depending on the following, you need to set [false] here
*/
@Suppress("FunctionOnlyReturningConstant")
@Suppress("FunctionOnlyReturningConstant", "UnusedParameter")
private fun hasBanAccess(userId: Long?, organizationRole: Role): Boolean = false

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class ProjectPermissionEvaluator(
* Only [SUPER_ADMIN] can ban the project. And a user with such a global role has permissions for all actions.
* Since we have all the rights issued depending on the following, you need to set [false] here
*/
@Suppress("FunctionOnlyReturningConstant")
@Suppress("FunctionOnlyReturningConstant", "UnusedParameter")
private fun hasBanAccess(userId: Long?, projectRole: Role, organizationRole: Role): Boolean = false

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class TestSuitePermissionEvaluator(
organization: Organization,
testSuite: TestSuite,
permission: Permission,
authentication: Authentication?,
@Suppress("UnusedParameter") authentication: Authentication?,
): Boolean = lnkOrganizationTestSuiteService.getDto(organization, testSuite).rights.let { currentRights ->
when (permission) {
Permission.READ -> testSuite.isPublic || canAccessTestSuite(currentRights)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.saveourtool.save.backend.service

import com.saveourtool.save.backend.repository.AgentRepository
import com.saveourtool.save.backend.repository.ExecutionRepository
import com.saveourtool.save.backend.repository.TestExecutionRepository
import com.saveourtool.save.backend.repository.TestRepository
Expand Down Expand Up @@ -35,8 +34,6 @@ import java.util.concurrent.ConcurrentHashMap
@Suppress("LongParameterList")
class TestService(
private val testRepository: TestRepository,
private val agentRepository: AgentRepository,
private val agentService: AgentService,
private val executionRepository: ExecutionRepository,
private val testExecutionRepository: TestExecutionRepository,
private val testSuitesService: TestSuitesService,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import com.saveourtool.save.entities.User
import com.saveourtool.save.utils.AvatarType
import com.saveourtool.save.utils.orNotFound

import org.slf4j.LoggerFactory
import org.springframework.security.core.Authentication
import org.springframework.security.core.userdetails.ReactiveUserDetailsService
import org.springframework.security.core.userdetails.UserDetails
Expand All @@ -29,8 +28,6 @@ class UserDetailsService(
private val userRepository: UserRepository,
private val originalLoginRepository: OriginalLoginRepository,
) : ReactiveUserDetailsService {
private val logger = LoggerFactory.getLogger(javaClass)

override fun findByUsername(username: String): Mono<UserDetails> = {
userRepository.findByName(username) ?: originalLoginRepository.findByName(username)?.user
}.toMono().getIdentitySourceAwareUserDetails(username)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import org.springframework.web.reactive.function.BodyInserters
@ExtendWith(InfraExtension::class)
@MockBeans(
MockBean(ProjectController::class),
MockBean(LnkContestExecutionService::class),
)
class ExecutionControllerTest {
@Autowired
Expand All @@ -46,9 +47,6 @@ class ExecutionControllerTest {
@Autowired
lateinit var projectRepository: ProjectRepository

@MockBean
private lateinit var lnkContestExecutionService: LnkContestExecutionService

@Test
@WithMockUser("JohnDoe")
@Suppress("TOO_LONG_FUNCTION")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient
import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest
import org.springframework.boot.test.mock.mockito.MockBean
import org.springframework.boot.test.mock.mockito.MockBeans
import org.springframework.context.annotation.Import
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
import org.springframework.security.test.context.support.WithMockUser
Expand All @@ -36,6 +37,10 @@ import org.springframework.test.web.reactive.server.WebTestClient
AuthenticationUserDetailsService::class,
AuthenticationUserRepository::class,
)
@MockBeans(
MockBean(OriginalLoginRepository::class),
MockBean(NamedParameterJdbcTemplate::class),
)
@AutoConfigureWebTestClient
class LnkUserOrganizationControllerTest {
@Autowired
Expand All @@ -53,12 +58,6 @@ class LnkUserOrganizationControllerTest {
@MockBean
private lateinit var organizationService: OrganizationService

@MockBean
private lateinit var originalLoginRepository: OriginalLoginRepository

@MockBean
private lateinit var namedParameterJdbcTemplate: NamedParameterJdbcTemplate

@Test
@WithMockUser
fun `should allow changing roles for organization owners`() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient
import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest
import org.springframework.boot.test.mock.mockito.MockBean
import org.springframework.boot.test.mock.mockito.MockBeans
import org.springframework.context.annotation.Import
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
import org.springframework.security.test.context.support.WithMockUser
Expand All @@ -43,6 +44,12 @@ import reactor.util.function.Tuples
AuthenticationUserDetailsService::class,
AuthenticationUserRepository::class,
)
@MockBeans(
MockBean(LnkUserProjectService::class),
MockBean(LnkUserOrganizationService::class),
MockBean(OriginalLoginRepository::class),
MockBean(NamedParameterJdbcTemplate::class),
)
@AutoConfigureWebTestClient
class PermissionControllerTest {
@Autowired private lateinit var webTestClient: WebTestClient
Expand All @@ -52,11 +59,7 @@ class PermissionControllerTest {
@MockBean private lateinit var userRepository: UserRepository
@MockBean private lateinit var projectService: ProjectService
@MockBean private lateinit var organizationPermissionEvaluator: OrganizationPermissionEvaluator
@MockBean private lateinit var lnkUserProjectService: LnkUserProjectService
@MockBean private lateinit var lnkUserOrganizationService: LnkUserOrganizationService
@MockBean private lateinit var organizationService: OrganizationService
@MockBean private lateinit var originalLoginRepository: OriginalLoginRepository
@MockBean private lateinit var namedParameterJdbcTemplate: NamedParameterJdbcTemplate

@Test
@WithMockUser
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.saveourtool.save.backend.controller

import com.saveourtool.save.backend.SaveApplication
import com.saveourtool.save.backend.repository.GitRepository
import com.saveourtool.save.backend.repository.OrganizationRepository
import com.saveourtool.save.backend.repository.ProjectRepository
import com.saveourtool.save.backend.service.LnkUserProjectService
Expand All @@ -21,7 +20,6 @@ import org.springframework.boot.test.context.SpringBootTest
import org.springframework.boot.test.mock.mockito.MockBean
import org.springframework.boot.test.mock.mockito.MockBeans
import org.springframework.http.MediaType
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
import org.springframework.security.test.context.support.WithMockUser
import org.springframework.test.web.reactive.server.WebTestClient
import org.springframework.test.web.reactive.server.expectBody
Expand All @@ -41,15 +39,9 @@ class ProjectControllerTest {
@Autowired
private lateinit var organizationRepository: OrganizationRepository

@Autowired
private lateinit var gitRepository: GitRepository

@Autowired
lateinit var webClient: WebTestClient

@Autowired
private lateinit var namedParameterJdbcTemplate: NamedParameterJdbcTemplate

@Test
@WithMockUser
fun `should return all public projects`() {
Expand Down
Loading

0 comments on commit 57cf27c

Please sign in to comment.