Skip to content

Commit bfaeb4f

Browse files
committed
fix(servlet): 修复转换器返回可空类型的问题
- 将 AnyEnumConverterFactory 中的转换器泛型改为允许返回可空类型 - 修改 AnyEnumConverter 内部转换器泛型为可空类型 - 更新 JavaLocalDateConverter 返回类型为可空 LocalDate - 更新 JavaLocalDateTimeConverter 返回可空 LocalDateTime - 更新 JavaLocalTimeConverter 返回可空 LocalTime
1 parent 8fb3266 commit bfaeb4f

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

depend/depend-servlet/src/main/kotlin/io/github/truenine/composeserver/depend/servlet/converters/AnyEnumConverterFactory.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import org.springframework.core.convert.converter.ConverterFactory
1010
@Deprecated(message = "API burden is too high", level = DeprecationLevel.ERROR)
1111
open class AnyEnumConverterFactory : ConverterFactory<String, IAnyEnum> {
1212
companion object {
13-
@JvmStatic private val converters = ConcurrentHashMap<Class<*>, Converter<String, IAnyEnum>>()
13+
@JvmStatic private val converters = ConcurrentHashMap<Class<*>, Converter<String, IAnyEnum?>>()
1414
}
1515

1616
@Suppress("UNCHECKED_CAST")
@@ -24,7 +24,7 @@ open class AnyEnumConverterFactory : ConverterFactory<String, IAnyEnum> {
2424
} as Converter<String, T>
2525
}
2626

27-
private class AnyEnumConverter(targetClass: Class<out IAnyEnum?>) : Converter<String, IAnyEnum> {
27+
private class AnyEnumConverter(targetClass: Class<out IAnyEnum?>) : Converter<String, IAnyEnum?> {
2828
private val isString = IStringEnum::class.java.isAssignableFrom(targetClass)
2929
private val isInt = IIntEnum::class.java.isAssignableFrom(targetClass)
3030
private val valueMappingMap = targetClass.enumConstants.associateBy { it?.value }

depend/depend-servlet/src/main/kotlin/io/github/truenine/composeserver/depend/servlet/converters/JavaLocalDateConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import org.springframework.core.convert.converter.Converter
77

88
private val log = slf4j(JavaLocalDateConverter::class)
99

10-
open class JavaLocalDateConverter : Converter<String, LocalDate> {
10+
open class JavaLocalDateConverter : Converter<String, LocalDate?> {
1111
override fun convert(source: String): LocalDate? {
1212
log.trace("Converting date = {}", source)
1313
return source.toLongOrNull()?.toLocalDate()

depend/depend-servlet/src/main/kotlin/io/github/truenine/composeserver/depend/servlet/converters/JavaLocalDateTimeConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import org.springframework.core.convert.converter.Converter
77

88
private val log = slf4j(JavaLocalDateTimeConverter::class)
99

10-
open class JavaLocalDateTimeConverter : Converter<String, LocalDateTime> {
10+
open class JavaLocalDateTimeConverter : Converter<String, LocalDateTime?> {
1111
override fun convert(source: String): LocalDateTime? {
1212
log.trace("Converting date-time = {}", source)
1313
return source.toLongOrNull()?.toLocalDateTime()

depend/depend-servlet/src/main/kotlin/io/github/truenine/composeserver/depend/servlet/converters/JavaLocalTimeConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import org.springframework.core.convert.converter.Converter
77

88
private val log = slf4j(JavaLocalTimeConverter::class)
99

10-
open class JavaLocalTimeConverter : Converter<String, LocalTime> {
10+
open class JavaLocalTimeConverter : Converter<String, LocalTime?> {
1111
override fun convert(source: String): LocalTime? {
1212
log.trace("Converting time = {}", source)
1313
return source.toLongOrNull()?.toLocalTime()

0 commit comments

Comments
 (0)