Skip to content

[Jackson 3] Minor clean up #5343

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

Merged
merged 3 commits into from
Oct 12, 2025
+1 −43
Merged

[Jackson 3] Minor clean up #5343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f492eb6
Clean up EnumDeserializer deprecated methods
JooHyukKim Oct 11, 2025
e149dde
Clean up `DeserializationFeature` javaDoc
JooHyukKim Oct 11, 2025
dc68d60
Merge branch '3.x' into clean-up-Enum-deser
cowtowncoder Oct 12, 2025
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
9 changes: 1 addition & 8 deletions src/main/java/tools/jackson/databind/DeserializationFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,19 +236,12 @@ public enum DeserializationFeature implements ConfigFeature
* for binding the full value, and nothing more (except for possible ignorable
* white space or comments, if supported by data format).
*<p>
<<<<<<< HEAD:src/main/java/tools/jackson/databind/DeserializationFeature.java
* NOTE: this feature should usually be disabled when reading from
* {@link java.io.DataInput}, since it cannot detect end-of-input efficiently
* (but by throwing an {@link java.io.IOException}). Disabling is NOT done
* automatically by Jackson: users are recommended to disable it.
*<p>
* Feature is enabled by default as of Jackson 3.0 (in 2.x it was disabled).
=======
* Feature is disabled by default (so that no check is made for possible trailing
* token(s)) for backwards-compatibility reasons.
*
* @since 2.9
>>>>>>> 2.x:src/main/java/com/fasterxml/jackson/databind/DeserializationFeature.java
*/
FAIL_ON_TRAILING_TOKENS(true),

Expand Down Expand Up @@ -395,7 +388,7 @@ public enum DeserializationFeature implements ConfigFeature

/**
* Feature that can be enabled to allow empty JSON Array
* value (that is, {@code[ ]} to be bound to POJOs {@code null}.
* value (that is, {@code [ ]} to be bound to POJOs {@code null}.
* If disabled, standard POJOs can only be bound from JSON {@code null} or
* JSON Object (standard meaning that no custom deserializers or
* constructors are defined; both of which can add support for other
Expand Down
35 changes: 0 additions & 35 deletions src/main/java/tools/jackson/databind/deser/jdk/EnumDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,41 +65,6 @@ public class EnumDeserializer
*/
protected final CompactStringObjectMap _lookupByEnumNaming;

/**
<<<<<<< HEAD:src/main/java/tools/jackson/databind/deser/jdk/EnumDeserializer.java
=======
* @since 2.9
* @deprecated since 2.16
*/
@Deprecated
public EnumDeserializer(EnumResolver byNameResolver, Boolean caseInsensitive)
{
this(byNameResolver, Boolean.TRUE.equals(caseInsensitive), null);
}

/**
* @since 2.15
* @deprecated since 2.16
*/
@Deprecated
public EnumDeserializer(EnumResolver byNameResolver, boolean caseInsensitive,
EnumResolver byEnumNamingResolver)
{
super(byNameResolver.getEnumClass());
_lookupByName = byNameResolver.constructLookup();
_hasAsValueAnnotation = byNameResolver.hasAsValueAnnotation();
_enumsByIndex = byNameResolver.getRawEnums();
_enumDefaultValue = byNameResolver.getDefaultValue();
_caseInsensitive = caseInsensitive;
_isFromIntValue = byNameResolver.isFromIntValue();
_lookupByEnumNaming = byEnumNamingResolver == null ? null : byEnumNamingResolver.constructLookup();
_lookupByToString = null;
}

/**
>>>>>>> 2.x:src/main/java/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.java
* @since 2.16
*/
public EnumDeserializer(EnumResolver byNameResolver, boolean caseInsensitive,
EnumResolver byEnumNamingResolver, EnumResolver toStringResolver)
{
Expand Down