Commit 33d47341 authored by liaozan's avatar liaozan 🏀

Polish

parent 52fc332d
...@@ -23,7 +23,7 @@ abstract class DateTimeConditionalConverter<T> implements ConditionalGenericConv ...@@ -23,7 +23,7 @@ abstract class DateTimeConditionalConverter<T> implements ConditionalGenericConv
private final TypeDescriptor stringType = TypeDescriptor.valueOf(String.class); private final TypeDescriptor stringType = TypeDescriptor.valueOf(String.class);
private final Map<String, DateTimeFormatter> formatters = new ConcurrentHashMap<>(); private final Map<String, DateTimeFormatter> formatters = new ConcurrentHashMap<>();
public DateTimeConditionalConverter() { DateTimeConditionalConverter() {
this.targetType = TypeDescriptor.valueOf(ResolvableType.forClass(getClass()).getSuperType().getGeneric(0).getRawClass()); this.targetType = TypeDescriptor.valueOf(ResolvableType.forClass(getClass()).getSuperType().getGeneric(0).getRawClass());
} }
...@@ -45,7 +45,7 @@ abstract class DateTimeConditionalConverter<T> implements ConditionalGenericConv ...@@ -45,7 +45,7 @@ abstract class DateTimeConditionalConverter<T> implements ConditionalGenericConv
return convert((String) source, targetType); return convert((String) source, targetType);
} }
protected final T convert(String source, TypeDescriptor targetType) { protected T convert(String source, TypeDescriptor targetType) {
if (StringUtils.isBlank(source)) { if (StringUtils.isBlank(source)) {
return null; return null;
} }
...@@ -69,14 +69,12 @@ abstract class DateTimeConditionalConverter<T> implements ConditionalGenericConv ...@@ -69,14 +69,12 @@ abstract class DateTimeConditionalConverter<T> implements ConditionalGenericConv
return pattern; return pattern;
} }
protected String defaultPattern() {
return DatePattern.NORM_DATETIME_PATTERN;
}
protected DateTimeFormatter ofPattern(String pattern) { protected DateTimeFormatter ofPattern(String pattern) {
return formatters.computeIfAbsent(pattern, ignore -> DatePattern.createFormatter(pattern)); return formatters.computeIfAbsent(pattern, ignore -> DatePattern.createFormatter(pattern));
} }
protected abstract String defaultPattern();
protected abstract T doConvert(Long source); protected abstract T doConvert(Long source);
protected abstract T doConvert(String source, DateTimeFormatter formatter); protected abstract T doConvert(String source, DateTimeFormatter formatter);
......
package com.schbrain.common.web.support.converter.datetime; package com.schbrain.common.web.support.converter.datetime;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
...@@ -13,6 +14,11 @@ class StringToDateConditionalConverter extends DateTimeConditionalConverter<Date ...@@ -13,6 +14,11 @@ class StringToDateConditionalConverter extends DateTimeConditionalConverter<Date
static final StringToDateConditionalConverter INSTANCE = new StringToDateConditionalConverter(); static final StringToDateConditionalConverter INSTANCE = new StringToDateConditionalConverter();
@Override
protected String defaultPattern() {
return DatePattern.NORM_DATETIME_PATTERN;
}
@Override @Override
protected Date doConvert(Long source) { protected Date doConvert(Long source) {
return DateUtil.date(source); return DateUtil.date(source);
......
package com.schbrain.common.web.support.converter.datetime; package com.schbrain.common.web.support.converter.datetime;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.date.LocalDateTimeUtil;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -13,6 +14,11 @@ class StringToLocalDateTimeConditionalConverter extends DateTimeConditionalConve ...@@ -13,6 +14,11 @@ class StringToLocalDateTimeConditionalConverter extends DateTimeConditionalConve
static final StringToLocalDateTimeConditionalConverter INSTANCE = new StringToLocalDateTimeConditionalConverter(); static final StringToLocalDateTimeConditionalConverter INSTANCE = new StringToLocalDateTimeConditionalConverter();
@Override
protected String defaultPattern() {
return DatePattern.NORM_DATETIME_PATTERN;
}
@Override @Override
protected LocalDateTime doConvert(Long source) { protected LocalDateTime doConvert(Long source) {
return LocalDateTimeUtil.of(source); return LocalDateTimeUtil.of(source);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment