diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/DateTimeConvertersWebMvcConfigurer.java b/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/DateTimeConvertersWebMvcConfigurer.java index e61d120320608677d7d238c644348ccaab2db028..508ea90d2b6c559de1623a454435b48c2c4d1f3d 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/DateTimeConvertersWebMvcConfigurer.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/DateTimeConvertersWebMvcConfigurer.java @@ -11,10 +11,10 @@ public class DateTimeConvertersWebMvcConfigurer implements WebMvcConfigurer { @Override public void addFormatters(FormatterRegistry registry) { - registry.addConverter(StringToDateConverter.INSTANCE); - registry.addConverter(StringToLocalTimeConverter.INSTANCE); - registry.addConverter(StringToLocalDateConverter.INSTANCE); - registry.addConverter(StringToLocalDateTimeConverter.INSTANCE); + registry.addConverter(StringToDateConditionalConverter.INSTANCE); + registry.addConverter(StringToLocalTimeConditionalConverter.INSTANCE); + registry.addConverter(StringToLocalDateConditionalConverter.INSTANCE); + registry.addConverter(StringToLocalDateTimeConditionalConverter.INSTANCE); } } diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToDateConverter.java b/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToDateConditionalConverter.java similarity index 71% rename from commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToDateConverter.java rename to commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToDateConditionalConverter.java index 8bf968061b6d484c6fb61d2d41bf521782332c80..d264f4a568bc795d7cd9b8728148b203b0a9678c 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToDateConverter.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToDateConditionalConverter.java @@ -9,9 +9,9 @@ import java.util.Date; * @author liaozan * @since 2023/9/16 */ -class StringToDateConverter extends DateTimeConditionalConverter { +class StringToDateConditionalConverter extends DateTimeConditionalConverter { - static final StringToDateConverter INSTANCE = new StringToDateConverter(); + static final StringToDateConditionalConverter INSTANCE = new StringToDateConditionalConverter(); @Override protected Date doConvert(Long source) { diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalDateConverter.java b/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalDateConditionalConverter.java similarity index 76% rename from commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalDateConverter.java rename to commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalDateConditionalConverter.java index be04396cb315d411225c405875381dd528b14598..238c5f66fc245c702f64191800c512c338488a3e 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalDateConverter.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalDateConditionalConverter.java @@ -10,9 +10,9 @@ import java.time.format.DateTimeFormatter; * @author liaozan * @since 2023/9/16 */ -class StringToLocalDateConverter extends DateTimeConditionalConverter { +class StringToLocalDateConditionalConverter extends DateTimeConditionalConverter { - static final StringToLocalDateConverter INSTANCE = new StringToLocalDateConverter(); + static final StringToLocalDateConditionalConverter INSTANCE = new StringToLocalDateConditionalConverter(); @Override protected String defaultPattern() { diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalDateTimeConverter.java b/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalDateTimeConditionalConverter.java similarity index 69% rename from commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalDateTimeConverter.java rename to commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalDateTimeConditionalConverter.java index 35ef259d4da31c231c91c4159737c084f6d97116..413930b1f2c8df6c7f5a83aec1bdf453e9c62cbd 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalDateTimeConverter.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalDateTimeConditionalConverter.java @@ -9,9 +9,9 @@ import java.time.format.DateTimeFormatter; * @author liaozan * @since 2023/9/16 */ -class StringToLocalDateTimeConverter extends DateTimeConditionalConverter { +class StringToLocalDateTimeConditionalConverter extends DateTimeConditionalConverter { - static final StringToLocalDateTimeConverter INSTANCE = new StringToLocalDateTimeConverter(); + static final StringToLocalDateTimeConditionalConverter INSTANCE = new StringToLocalDateTimeConditionalConverter(); @Override protected LocalDateTime doConvert(Long source) { diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalTimeConverter.java b/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalTimeConditionalConverter.java similarity index 76% rename from commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalTimeConverter.java rename to commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalTimeConditionalConverter.java index a17ff66da1f6ca938106889cf3837e9164ef2ff8..0df4ced4fa8a1b52730d898eac27c2b24abffdb2 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalTimeConverter.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalTimeConditionalConverter.java @@ -10,9 +10,9 @@ import java.time.format.DateTimeFormatter; * @author liaozan * @since 2023/9/16 */ -class StringToLocalTimeConverter extends DateTimeConditionalConverter { +class StringToLocalTimeConditionalConverter extends DateTimeConditionalConverter { - static final StringToLocalTimeConverter INSTANCE = new StringToLocalTimeConverter(); + static final StringToLocalTimeConditionalConverter INSTANCE = new StringToLocalTimeConditionalConverter(); @Override protected String defaultPattern() {