This is an automated email from the ASF dual-hosted git repository.
jungm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new 841ebb3a [JOHNZON-409] DateConverter: replace DateFormat with
DateTimeFormatter
841ebb3a is described below
commit 841ebb3a8627f6ae617eb1deec013f46678969b8
Author: Markus Jung <[email protected]>
AuthorDate: Wed Aug 28 20:46:57 2024 +0200
[JOHNZON-409] DateConverter: replace DateFormat with DateTimeFormatter
---
.../johnzon/mapper/converter/DateConverter.java | 34 +++++++------
.../mapper/converter/DateWithCopyConverter.java | 2 +-
.../johnzon/mapper/map/LazyConverterMap.java | 45 ++++-------------
.../org/apache/johnzon/mapper/util/DateUtil.java | 56 ++++++++++++++++++++++
.../DeserializationExceptionMessagesTest.java | 2 +-
5 files changed, 87 insertions(+), 52 deletions(-)
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/DateConverter.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/DateConverter.java
index 00af32ac..ba1ae493 100644
---
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/DateConverter.java
+++
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/DateConverter.java
@@ -19,36 +19,40 @@
package org.apache.johnzon.mapper.converter;
import org.apache.johnzon.mapper.Converter;
+import org.apache.johnzon.mapper.util.DateUtil;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
import java.util.Date;
+import java.util.Locale;
public class DateConverter implements Converter<Date> {
- // TODO: see if we can clean it
- private final ThreadLocal<DateFormat> format;
+ // Almost ISO 8601 basic, but zone is defined by generic name instead of
zone-offset
+ public static final DateConverter ISO_8601_SHORT = new
DateConverter("yyyyMMddHHmmssv");
+
+ private static final ZoneId UTC = ZoneId.of("UTC");
+
+ private final DateTimeFormatter formatter;
public DateConverter(final String pattern) {
- format = new ThreadLocal<DateFormat>() {
- @Override
- protected DateFormat initialValue() {
- return new SimpleDateFormat(pattern);
- }
- };
+ this.formatter = DateTimeFormatter.ofPattern(pattern, Locale.ROOT);
}
@Override
public String toString(final Date instance) {
- return format.get().format(instance);
+ return formatter.format(ZonedDateTime.ofInstant(instance.toInstant(),
UTC));
}
@Override
public Date fromString(final String text) {
try {
- return format.get().parse(text);
- } catch (final ParseException e) {
- throw new IllegalArgumentException(e);
+ return Date.from(DateUtil.parseZonedDateTime(text, formatter,
UTC).toInstant());
+ } catch (final DateTimeParseException dpe) {
+ return
Date.from(LocalDateTime.parse(text).toInstant(ZoneOffset.UTC));
}
}
}
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/DateWithCopyConverter.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/DateWithCopyConverter.java
index 85abb26b..2114b800 100644
---
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/DateWithCopyConverter.java
+++
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/DateWithCopyConverter.java
@@ -28,7 +28,7 @@ public class DateWithCopyConverter implements Adapter<Date,
String> {
private final Adapter<Date, String> delegate;
public DateWithCopyConverter(final Adapter<Date, String> delegate) {
- this.delegate = delegate == null ? new ConverterAdapter<>(new
DateConverter("yyyyMMddHHmmssZ"), Date.class) : delegate;
+ this.delegate = delegate == null ? new
ConverterAdapter<>(DateConverter.ISO_8601_SHORT, Date.class) : delegate;
}
@Override
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/map/LazyConverterMap.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/map/LazyConverterMap.java
index 2a6c0bce..22854c7f 100644
---
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/map/LazyConverterMap.java
+++
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/map/LazyConverterMap.java
@@ -31,6 +31,7 @@ import org.apache.johnzon.mapper.converter.URIConverter;
import org.apache.johnzon.mapper.converter.URLConverter;
import org.apache.johnzon.mapper.internal.AdapterKey;
import org.apache.johnzon.mapper.internal.ConverterAdapter;
+import org.apache.johnzon.mapper.util.DateUtil;
import java.lang.reflect.Type;
import java.math.BigDecimal;
@@ -50,13 +51,10 @@ import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
-import java.time.temporal.TemporalAccessor;
-import java.time.temporal.TemporalQueries;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Locale;
-import java.util.Objects;
import java.util.Set;
import java.util.SimpleTimeZone;
import java.util.TimeZone;
@@ -65,13 +63,6 @@ import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Stream;
-import static java.time.temporal.ChronoField.DAY_OF_MONTH;
-import static java.time.temporal.ChronoField.HOUR_OF_DAY;
-import static java.time.temporal.ChronoField.MILLI_OF_SECOND;
-import static java.time.temporal.ChronoField.MINUTE_OF_HOUR;
-import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
-import static java.time.temporal.ChronoField.SECOND_OF_MINUTE;
-import static java.time.temporal.ChronoField.YEAR;
import static java.util.stream.Collectors.toSet;
// important: override all usages,
@@ -322,7 +313,7 @@ public class LazyConverterMap extends
ConcurrentHashMap<AdapterKey, Adapter<?, ?
@Override
public OffsetDateTime fromString(final String text) {
try {
- return parseZonedDateTime(text, dateTimeFormatter,
zoneIDUTC).toOffsetDateTime();
+ return DateUtil.parseZonedDateTime(text,
dateTimeFormatter, zoneIDUTC).toOffsetDateTime();
} catch (final DateTimeParseException dpe) {
return OffsetDateTime.parse(text);
}
@@ -354,7 +345,7 @@ public class LazyConverterMap extends
ConcurrentHashMap<AdapterKey, Adapter<?, ?
@Override
public ZonedDateTime fromString(final String text) {
try {
- return parseZonedDateTime(text, dateTimeFormatter,
zoneIDUTC);
+ return DateUtil.parseZonedDateTime(text,
dateTimeFormatter, zoneIDUTC);
} catch (final DateTimeParseException dpe) {
return ZonedDateTime.parse(text);
}
@@ -387,7 +378,7 @@ public class LazyConverterMap extends
ConcurrentHashMap<AdapterKey, Adapter<?, ?
@Override
public LocalDateTime fromString(final String text) {
try {
- return parseZonedDateTime(text, dateTimeFormatter,
zoneIDUTC).toLocalDateTime();
+ return DateUtil.parseZonedDateTime(text,
dateTimeFormatter, zoneIDUTC).toLocalDateTime();
} catch (final DateTimeParseException dpe) {
return LocalDateTime.parse(text);
}
@@ -419,7 +410,7 @@ public class LazyConverterMap extends
ConcurrentHashMap<AdapterKey, Adapter<?, ?
@Override
public LocalDate fromString(final String text) {
try {
- return parseZonedDateTime(text, dateTimeFormatter,
zoneIDUTC).toLocalDate();
+ return DateUtil.parseZonedDateTime(text,
dateTimeFormatter, zoneIDUTC).toLocalDate();
} catch (final DateTimeParseException dpe) {
return LocalDate.parse(text);
}
@@ -450,7 +441,7 @@ public class LazyConverterMap extends
ConcurrentHashMap<AdapterKey, Adapter<?, ?
@Override
public Instant fromString(final String text) {
- return parseZonedDateTime(text, dateTimeFormatter,
zoneIDUTC).toInstant();
+ return DateUtil.parseZonedDateTime(text,
dateTimeFormatter, zoneIDUTC).toInstant();
}
}, Instant.class));
}
@@ -478,7 +469,7 @@ public class LazyConverterMap extends
ConcurrentHashMap<AdapterKey, Adapter<?, ?
@Override
public GregorianCalendar fromString(final String text) {
- final ZonedDateTime zonedDateTime =
parseZonedDateTime(text, dateTimeFormatter, zoneIDUTC);
+ final ZonedDateTime zonedDateTime =
DateUtil.parseZonedDateTime(text, dateTimeFormatter, zoneIDUTC);
final Calendar instance = GregorianCalendar.getInstance();
instance.setTimeZone(TimeZone.getTimeZone(zonedDateTime.getZone()));
instance.setTime(Date.from(zonedDateTime.toInstant()));
@@ -510,7 +501,7 @@ public class LazyConverterMap extends
ConcurrentHashMap<AdapterKey, Adapter<?, ?
@Override
public Calendar fromString(final String text) {
- final ZonedDateTime zonedDateTime =
parseZonedDateTime(text, dateTimeFormatter, zoneIDUTC);
+ final ZonedDateTime zonedDateTime =
DateUtil.parseZonedDateTime(text, dateTimeFormatter, zoneIDUTC);
final Calendar instance = Calendar.getInstance();
instance.setTimeZone(TimeZone.getTimeZone(zonedDateTime.getZone()));
instance.setTime(Date.from(zonedDateTime.toInstant()));
@@ -539,7 +530,7 @@ public class LazyConverterMap extends
ConcurrentHashMap<AdapterKey, Adapter<?, ?
private Adapter<?, ?> addDateConverter(final AdapterKey key) {
if (useShortISO8601Format) {
- return add(key, new ConverterAdapter<>(new
DateConverter("yyyyMMddHHmmssZ"), Date.class));
+ return add(key, new
ConverterAdapter<>(DateConverter.ISO_8601_SHORT, Date.class));
}
final ZoneId zoneIDUTC = ZoneId.of("UTC");
if (dateTimeFormatter != null) {
@@ -553,7 +544,7 @@ public class LazyConverterMap extends
ConcurrentHashMap<AdapterKey, Adapter<?, ?
@Override
public Date fromString(final String text) {
try {
- return Date.from(parseZonedDateTime(text,
dateTimeFormatter, zoneIDUTC).toInstant());
+ return Date.from(DateUtil.parseZonedDateTime(text,
dateTimeFormatter, zoneIDUTC).toInstant());
} catch (final DateTimeParseException dpe) {
return
Date.from(LocalDateTime.parse(text).toInstant(ZoneOffset.UTC));
}
@@ -578,22 +569,6 @@ public class LazyConverterMap extends
ConcurrentHashMap<AdapterKey, Adapter<?, ?
}, Date.class));
}
- private static ZonedDateTime parseZonedDateTime(final String text, final
DateTimeFormatter formatter, final ZoneId defaultZone) {
- final TemporalAccessor parse = formatter.parse(text);
- ZoneId zone = parse.query(TemporalQueries.zone());
- if (Objects.isNull(zone)) {
- zone = defaultZone;
- }
- final int year = parse.isSupported(YEAR) ? parse.get(YEAR) : 0;
- final int month = parse.isSupported(MONTH_OF_YEAR) ?
parse.get(MONTH_OF_YEAR) : 0;
- final int day = parse.isSupported(DAY_OF_MONTH) ?
parse.get(DAY_OF_MONTH) : 0;
- final int hour = parse.isSupported(HOUR_OF_DAY) ?
parse.get(HOUR_OF_DAY) : 0;
- final int minute = parse.isSupported(MINUTE_OF_HOUR) ?
parse.get(MINUTE_OF_HOUR) : 0;
- final int second = parse.isSupported(SECOND_OF_MINUTE) ?
parse.get(SECOND_OF_MINUTE) : 0;
- final int millisecond = parse.isSupported(MILLI_OF_SECOND) ?
parse.get(MILLI_OF_SECOND) : 0;
- return ZonedDateTime.of(year, month, day, hour, minute, second,
millisecond, zone);
- }
-
private static void checkForDeprecatedTimeZone(final String text) {
switch (text) {
case "CST": // really for TCK, this sucks for end users so we
don't fail for all deprecated zones
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/util/DateUtil.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/util/DateUtil.java
new file mode 100644
index 00000000..e963d44c
--- /dev/null
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/util/DateUtil.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.johnzon.mapper.util;
+
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalAccessor;
+import java.time.temporal.TemporalQueries;
+
+public final class DateUtil {
+ private DateUtil() {
+
+ }
+
+ public static ZonedDateTime parseZonedDateTime(final String text, final
DateTimeFormatter formatter, ZoneId defaultZone) {
+ final TemporalAccessor parse = formatter.parse(text);
+ ZoneId zone = parse.query(TemporalQueries.zone());
+ if (zone == null) {
+ zone = defaultZone;
+ }
+
+ return ZonedDateTime.of(
+ ifSupported(parse, ChronoField.YEAR),
+ ifSupported(parse, ChronoField.MONTH_OF_YEAR),
+ ifSupported(parse, ChronoField.DAY_OF_MONTH),
+ ifSupported(parse, ChronoField.HOUR_OF_DAY),
+ ifSupported(parse, ChronoField.MINUTE_OF_HOUR),
+ ifSupported(parse, ChronoField.SECOND_OF_MINUTE),
+ ifSupported(parse, ChronoField.MILLI_OF_SECOND),
+ zone);
+ }
+
+ public static int ifSupported(TemporalAccessor temporal, ChronoField unit)
{
+ if (temporal.isSupported(unit)) {
+ return temporal.get(unit);
+ }
+
+ return 0;
+ }
+}
diff --git
a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/DeserializationExceptionMessagesTest.java
b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/DeserializationExceptionMessagesTest.java
index 33ff7dd1..f66e8cc2 100644
---
a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/DeserializationExceptionMessagesTest.java
+++
b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/DeserializationExceptionMessagesTest.java
@@ -394,7 +394,7 @@ public class DeserializationExceptionMessagesTest {
public void dateFromString() throws Exception {
assertMessage("{ \"date\" : \"Supercalifragilisticexpialidocious\" }",
"Widget property 'date' of type Date cannot be mapped to json
string value: \"Supercalifragilisti...\n" +
- "java.text.ParseException: Unparseable date:
\"Supercalifragilisticexpialidocious\"");
+ "Text 'Supercalifragilisticexpialidocious' could not
be parsed at index 0");
}
@Test
