Skip to content

Commit ae84e77

Browse files
committed
refactor!: 移除别名配置
1 parent 59f8ad5 commit ae84e77

File tree

3 files changed

+8
-29
lines changed

3 files changed

+8
-29
lines changed

applications/vertx/src/main/kotlin/io/github/shoaky/sourcedownloader/application/vertx/SourceDownloaderVertxApplication.kt

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package io.github.shoaky.sourcedownloader.application.vertx
22

3-
import com.fasterxml.jackson.databind.module.SimpleModule
4-
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer
3+
import com.fasterxml.jackson.databind.DeserializationFeature
4+
import com.fasterxml.jackson.databind.SerializationFeature
55
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
6-
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer
7-
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer
86
import com.fasterxml.jackson.module.kotlin.registerKotlinModule
97
import com.zaxxer.hikari.HikariDataSource
108
import io.github.shoaky.sourcedownloader.CoreApplication
@@ -23,6 +21,7 @@ import io.github.shoaky.sourcedownloader.core.processor.DefaultProcessorManager
2321
import io.github.shoaky.sourcedownloader.core.processor.ProcessorManager
2422
import io.github.shoaky.sourcedownloader.core.processor.log
2523
import io.github.shoaky.sourcedownloader.repo.exposed.ExposedProcessingStorage
24+
import io.github.shoaky.sourcedownloader.sdk.util.AdaptabilityHandler
2625
import io.github.shoaky.sourcedownloader.service.ComponentService
2726
import io.github.shoaky.sourcedownloader.service.ProcessingContentService
2827
import io.github.shoaky.sourcedownloader.service.ProcessorService
@@ -38,9 +37,6 @@ import io.vertx.kotlin.core.vertxOptionsOf
3837
import io.vertx.kotlin.micrometer.micrometerMetricsOptionsOf
3938
import io.vertx.kotlin.micrometer.vertxJmxMetricsOptionsOf
4039
import org.jetbrains.exposed.sql.Database
41-
import java.time.LocalDate
42-
import java.time.LocalDateTime
43-
import java.time.format.DateTimeFormatter
4440

4541
class SourceDownloaderVertxApplication {
4642

@@ -75,26 +71,12 @@ class SourceDownloaderVertxApplication {
7571
}
7672

7773
private fun setupObjectMapper() {
78-
val simpleModule = SimpleModule()
79-
.addSerializer(
80-
ToStringSerializer(LocalDateTime::class.java)
81-
)
82-
.addSerializer(
83-
ToStringSerializer(LocalDate::class.java)
84-
)
85-
.addDeserializer(
86-
LocalDate::class.java,
87-
LocalDateDeserializer(DateTimeFormatter.BASIC_ISO_DATE)
88-
)
89-
.addDeserializer(
90-
LocalDateTime::class.java,
91-
LocalDateTimeDeserializer(DateTimeFormatter.BASIC_ISO_DATE)
92-
)
93-
LocalDateTime.now().toString()
9474
DatabindCodec.mapper()
9575
.registerKotlinModule()
9676
.registerModule(JavaTimeModule())
97-
.registerModule(simpleModule)
77+
.disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE)
78+
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
79+
.addHandler(AdaptabilityHandler)
9880
}
9981

10082
private fun vertx(): Vertx {

core/src/main/kotlin/io/github/shoaky/sourcedownloader/core/ProcessorConfig.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.github.shoaky.sourcedownloader.core
22

3-
import com.fasterxml.jackson.annotation.JsonAlias
43
import com.fasterxml.jackson.annotation.JsonFormat
54
import com.fasterxml.jackson.annotation.JsonIgnore
65
import com.fasterxml.jackson.annotation.JsonInclude
@@ -22,10 +21,8 @@ data class ProcessorConfig(
2221
val name: String,
2322
val triggers: List<ComponentId> = emptyList(),
2423
val source: ComponentId,
25-
@JsonAlias("file-resolver")
2624
val itemFileResolver: ComponentId,
2725
val downloader: ComponentId,
28-
@JsonAlias("mover")
2926
val fileMover: ComponentId = ComponentId("mover:general"),
3027
@JsonSerialize(using = ToStringSerializer::class)
3128
val savePath: Path,

sdk/src/main/kotlin/io/github/shoaky/sourcedownloader/sdk/util/Jackson.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object Jackson {
3636
.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
3737
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
3838
.setSerializationInclusion(JsonInclude.Include.NON_NULL)
39-
.addHandler(DefaultHandler)
39+
.addHandler(AdaptabilityHandler)
4040
}
4141

4242
fun <T : Any> fromJson(json: String, type: KClass<T>): T {
@@ -85,7 +85,7 @@ object Jackson {
8585

8686
}
8787

88-
private object DefaultHandler : DeserializationProblemHandler() {
88+
object AdaptabilityHandler : DeserializationProblemHandler() {
8989

9090
private val ZONE_ID = ZoneId.systemDefault()
9191

0 commit comments

Comments
 (0)