Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Date/Time API continued replace Old #145

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

New Date/Time API continued replace Old #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c0cfe3d
LocalDateTime、ZonedDateTime Convert Seconds and Nanos Replace millise…
digithuman Oct 22, 2022
8183c2a
add java.time.Instant、InstantConverter
digithuman Oct 22, 2022
f5cba57
DateTimeFormatter replace SimpleDateFormat,Locate.US AM PM UpperCase…
digithuman Oct 23, 2022
9ad485e
ZoneId replace TimeZone
digithuman Oct 23, 2022
f6d19d9
LocalDate parse pattern yyyy-MM .
digithuman Oct 24, 2022
4c3b64d
LocalTime
digithuman Oct 25, 2022
ef7241d
Time Parse '10:36 pm' DateTimeFormatter CaseInsensitive.
digithuman Oct 25, 2022
d9befb8
Enum to String/Integer ，String/Integer to Enum .
digithuman Oct 25, 2022
8d05385
Enum ConvertUtilsBean Bug
digithuman Oct 26, 2022
475bb2b
调整默认值
digithuman Nov 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.nio.file.Path;
import java.sql.Timestamp;
import java.time.Duration;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
Expand Down Expand Up @@ -53,10 +54,11 @@
import org.apache.commons.beanutils2.converters.ConverterFacade;
import org.apache.commons.beanutils2.converters.DateConverter;
import org.apache.commons.beanutils2.converters.DoubleConverter;
import org.apache.commons.beanutils2.converters.EnumConverter;
import org.apache.commons.beanutils2.converters.DurationConverter;
import org.apache.commons.beanutils2.converters.EnumConverter;
import org.apache.commons.beanutils2.converters.FileConverter;
import org.apache.commons.beanutils2.converters.FloatConverter;
import org.apache.commons.beanutils2.converters.InstantConverter;
import org.apache.commons.beanutils2.converters.IntegerConverter;
import org.apache.commons.beanutils2.converters.LocalDateConverter;
import org.apache.commons.beanutils2.converters.LocalDateTimeConverter;
Expand Down Expand Up @@ -112,6 +114,7 @@
* <li>java.sql.Date (no default value)</li>
* <li>java.sql.Time (no default value)</li>
* <li>java.sql.Timestamp (no default value)</li>
* <li>java.time.Instant (no default value)</li>
* <li>java.time.LocalDate (no default value)</li>
* <li>java.time.LocalDateTime (no default value)</li>
* <li>java.time.LocalTime (no default value)</li>
Expand Down Expand Up @@ -243,11 +246,17 @@ public String convert(Object value) {
*
* @throws ConversionException if thrown by an underlying Converter
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
public <T> Object convert(final String value, final Class<T> clazz) {
if (log.isDebugEnabled()) {
log.debug("Convert string '" + value + "' to class '" + clazz.getName() + "'");
}
Converter<T> converter = lookup(clazz);
//Enum Converter
if (converter == null && clazz.isEnum()) {
converter = (Converter)lookup(Enum.class);
}

if (converter == null) {
Converter<String> sConverter = lookup(String.class);
if (log.isTraceEnabled()) {
Expand Down Expand Up @@ -324,6 +333,12 @@ public Object convert(final Object value, final Class<?> targetType) {

Object converted = value;
Converter converter = lookup(sourceType, targetType);

//Enum Converter
if ((sourceType !=null && sourceType.isEnum()) || targetType.isEnum()) {
converter = (Converter)lookup(Enum.class);
}

if (converter != null) {
if (log.isTraceEnabled()) {
log.trace(" Using converter " + converter);
Expand Down Expand Up @@ -484,6 +499,7 @@ private void registerStandard(final boolean throwException, final boolean defaul
* <li>{@code URL.class} - {@link URLConverter}</li>
* <li>{@code URI.class} - {@link URIConverter}</li>
* <li>{@code UUID.class} - {@link UUIDConverter}</li>
* <li>{@code Instant.class} - {@link InstantConverter}</li>
* <li>{@code LocalDate.class} - {@link LocalDateConverter}</li>
* <li>{@code LocalDateTime.class} - {@link LocalDateTimeConverter}</li>
* <li>{@code LocalTime.class} - {@link LocalTimeConverter}</li>
Expand Down Expand Up @@ -516,6 +532,7 @@ private void registerOther(final boolean throwException) {
register(URL.class, throwException ? new URLConverter() : new URLConverter(null));
register(URI.class, throwException ? new URIConverter() : new URIConverter(null));
register(UUID.class, throwException ? new UUIDConverter() : new UUIDConverter(null));
register(Instant.class, throwException ? new InstantConverter() : new InstantConverter(null));
register(LocalDate.class, throwException ? new LocalDateConverter() : new LocalDateConverter(null));
register(LocalDateTime.class, throwException ? new LocalDateTimeConverter() : new LocalDateTimeConverter(null));
register(LocalTime.class, throwException ? new LocalTimeConverter() : new LocalTimeConverter(null));
Expand Down Expand Up @@ -582,6 +599,7 @@ private void registerArrays(final boolean throwException, final int defaultArray
registerArrayConverter(URL.class, new URLConverter(), throwException, defaultArraySize);
registerArrayConverter(URI.class, new URIConverter(), throwException, defaultArraySize);
registerArrayConverter(UUID.class, new UUIDConverter(), throwException, defaultArraySize);
registerArrayConverter(Instant.class, new InstantConverter(), throwException, defaultArraySize);
registerArrayConverter(LocalDate.class, new LocalDateConverter(), throwException, defaultArraySize);
registerArrayConverter(LocalDateTime.class, new LocalDateTimeConverter(), throwException, defaultArraySize);
registerArrayConverter(LocalTime.class, new LocalTimeConverter(), throwException, defaultArraySize);
Expand Down
Loading