diff --git a/domino-jackson-super/src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java b/domino-jackson-super/src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java index 015bf2b1..f9c82a25 100644 --- a/domino-jackson-super/src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java +++ b/domino-jackson-super/src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java @@ -238,16 +238,51 @@ public enum Feature { ACCEPT_SINGLE_VALUE_AS_ARRAY, /** - * Override for MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES. Only affects - * deserialization, has no effect on serialization. + * Override for MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, which allows + * case-insensitive matching of property names (but NOT values, see {@link + * #ACCEPT_CASE_INSENSITIVE_VALUES} for that). * - *

NOTE: starting with 2.9 can also effect Enum handling (and potentially other places where - * case-insensitive property values are accepted). + *

Only affects deserialization, has no effect on serialization. * * @since 2.8 */ ACCEPT_CASE_INSENSITIVE_PROPERTIES, + /** + * Override for DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, which + * allows unknown Enum values to be parsed as null values. + * + * @since 2.15 + */ + READ_UNKNOWN_ENUM_VALUES_AS_NULL, + + /** + * Override for DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE + * , which allows unknown Enum values to be ignored and a predefined value specified through + * {@link com.fasterxml.jackson.annotation.JsonEnumDefaultValue @JsonEnumDefaultValue} + * annotation. + * + * @since 2.15 + */ + READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE, + + /** + * Override for {@code DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE}, + * (counterpart to {@link #WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS}), similar constraints apply. + * + * @since 2.15 + */ + READ_DATE_TIMESTAMPS_AS_NANOSECONDS, + + /** + * Override for MapperFeature.ACCEPT_CASE_INSENSITIVE_VALUES, which allows + * case-sensitive matching of (some) property values, such as {@code Enum}s. Only affects + * deserialization, has no effect on serialization. + * + * @since 2.10 + */ + ACCEPT_CASE_INSENSITIVE_VALUES, + /** * Override for SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS, similar * constraints apply. @@ -272,6 +307,20 @@ public enum Feature { * will force sorting of {@link java.util.Map} keys before serialization. */ WRITE_SORTED_MAP_ENTRIES, - ; + + /** + * Override for DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIMEZONE that + * specifies whether context provided timezone DeserializationContext.getTimeZone() + * should be used to adjust Date/Time values on deserialization, even if value itself contains + * timezone information + * + *

NOTE: due to limitations of "old" JDK date/time types (that is, {@link java.util.Date} and + * {@link java.util.Calendar}), this setting is only applicable to Joda and + * Java 8 date/time values, but not to java.util.Date or + * java.util.Calendar. + * + * @since 2.8 + */ + ADJUST_DATES_TO_CONTEXT_TIME_ZONE } }