Skip to content

Commit

Permalink
Fix #1062
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed Dec 30, 2015
1 parent 1a8b5d3 commit 7e30b06
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
1 change: 1 addition & 0 deletions release-notes/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ Project: jackson-databind
(reported by fabiolaa@github)
#1044: Add `AnnotationIntrospector.resolveSetterConflict(...)` to allow custom setter conflict resolution
(suggested by clydebarrow@github)
#1062: Add new `JsonFormatTypes` enumerated value, `UNION`
- Make `JsonValueFormat` (self-)serializable, deserializable, to/from valid external
value (as per JSON Schema spec)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ public enum JsonFormatTypes
OBJECT,
ARRAY,
NULL,

/**
* Virtual type used for union types; needed to make JSON Schema work with union types.
*
* @since 2.7
*/
UNION,

ANY;

private static final Map<String,JsonFormatTypes> _byLCName = new HashMap<String,JsonFormatTypes>();
Expand Down

0 comments on commit 7e30b06

Please sign in to comment.