Skip to content

Commit 68cc5f0

Browse files
authored
Move WebConfig.kt to common (#2923)
* Move WebConfig.kt to common
1 parent a90a234 commit 68cc5f0

File tree

6 files changed

+11
-41
lines changed

6 files changed

+11
-41
lines changed

save-backend/src/main/kotlin/com/saveourtool/save/backend/SaveApplication.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import org.springframework.context.annotation.Import
1111
* An entrypoint for spring for save-backend
1212
*/
1313
@SpringBootApplication(scanBasePackages = [
14+
"com.saveourtool.save.configs",
1415
"com.saveourtool.save.backend",
1516
"com.saveourtool.save.service",
1617
"com.saveourtool.save.storage",

save-backend/src/test/kotlin/com/saveourtool/save/backend/DownloadFilesTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package com.saveourtool.save.backend
22

33
import com.saveourtool.save.backend.configs.ConfigProperties
44
import com.saveourtool.save.authservice.config.NoopWebSecurityConfig
5-
import com.saveourtool.save.backend.configs.WebConfig
65
import com.saveourtool.save.backend.controllers.DownloadFilesController
76
import com.saveourtool.save.backend.controllers.FileController
87
import com.saveourtool.save.backend.controllers.internal.FileInternalController
98
import com.saveourtool.save.backend.service.*
109
import com.saveourtool.save.backend.storage.*
1110
import com.saveourtool.save.backend.utils.mutateMockedUser
11+
import com.saveourtool.save.configs.WebConfig
1212
import com.saveourtool.save.core.result.DebugInfo
1313
import com.saveourtool.save.core.result.Pass
1414
import com.saveourtool.save.domain.*

save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/OrganizationControllerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.saveourtool.save.backend.controller
22

33
import com.saveourtool.save.authservice.config.NoopWebSecurityConfig
4-
import com.saveourtool.save.backend.configs.WebConfig
54
import com.saveourtool.save.backend.controllers.OrganizationController
65
import com.saveourtool.save.backend.repository.*
76
import com.saveourtool.save.backend.service.*
87
import com.saveourtool.save.backend.S11nTestConfig
98
import com.saveourtool.save.backend.storage.TestsSourceSnapshotStorage
109
import com.saveourtool.save.backend.utils.mutateMockedUser
10+
import com.saveourtool.save.configs.WebConfig
1111
import com.saveourtool.save.domain.Role
1212
import com.saveourtool.save.entities.*
1313
import com.saveourtool.save.repository.*

save-cloud-common/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ kotlin {
7474
implementation(libs.spring.web)
7575
implementation(libs.spring.webflux)
7676
implementation(libs.spring.boot)
77+
implementation(libs.spring.boot.starter.quartz)
7778
implementation(libs.spring.data.jpa)
7879
implementation(libs.jackson.module.kotlin)
7980
implementation(libs.hibernate.core)

save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/WebConfig.kt renamed to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/configs/WebConfig.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"MISSING_KDOC_ON_FUNCTION",
66
)
77

8-
package com.saveourtool.save.backend.configs
8+
package com.saveourtool.save.configs
99

1010
import com.saveourtool.save.domain.supportTestStatus
1111
import com.saveourtool.save.test.analysis.metrics.supportTestMetrics
@@ -24,9 +24,9 @@ import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder
2424
import org.springframework.web.reactive.config.WebFluxConfigurer
2525

2626
@Configuration
27-
class WebConfig {
27+
open class WebConfig {
2828
@Bean
29-
fun jackson2ObjectMapperBuilderCustomizer() = Jackson2ObjectMapperBuilderCustomizer { builder: Jackson2ObjectMapperBuilder ->
29+
open fun jackson2ObjectMapperBuilderCustomizer() = Jackson2ObjectMapperBuilderCustomizer { builder: Jackson2ObjectMapperBuilder ->
3030
builder
3131
.supportTestStatus()
3232
.supportKLocalDateTime()
@@ -35,13 +35,13 @@ class WebConfig {
3535
}
3636

3737
@Bean
38-
fun jackson2JsonEncoder(mapper: ObjectMapper) = Jackson2JsonEncoder(mapper)
38+
open fun jackson2JsonEncoder(mapper: ObjectMapper) = Jackson2JsonEncoder(mapper)
3939

4040
@Bean
41-
fun jackson2JsonDecoder(mapper: ObjectMapper) = Jackson2JsonDecoder(mapper)
41+
open fun jackson2JsonDecoder(mapper: ObjectMapper) = Jackson2JsonDecoder(mapper)
4242

4343
@Bean
44-
fun webFluxConfigurer(encoder: Jackson2JsonEncoder, decoder: Jackson2JsonDecoder) =
44+
open fun webFluxConfigurer(encoder: Jackson2JsonEncoder, decoder: Jackson2JsonDecoder) =
4545
object : WebFluxConfigurer {
4646
override fun configureHttpMessageCodecs(configurer: ServerCodecConfigurer) {
4747
configurer.defaultCodecs().jackson2JsonEncoder(encoder)
@@ -50,7 +50,7 @@ class WebConfig {
5050
}
5151

5252
@Bean
53-
fun jackson2WebClientCustomizer(jackson2JsonEncoder: Jackson2JsonEncoder, jackson2JsonDecoder: Jackson2JsonDecoder): WebClientCustomizer = WebClientCustomizer { builder ->
53+
open fun jackson2WebClientCustomizer(jackson2JsonEncoder: Jackson2JsonEncoder, jackson2JsonDecoder: Jackson2JsonDecoder): WebClientCustomizer = WebClientCustomizer { builder ->
5454
builder.codecs {
5555
it.defaultCodecs().jackson2JsonEncoder(jackson2JsonEncoder)
5656
it.defaultCodecs().jackson2JsonDecoder(jackson2JsonDecoder)

save-cosv/src/main/kotlin/com/saveourtool/save/cosv/configs/WebConfig.kt

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)