Fix #1062

FasterXML · Dec 30, 2015 · 7e30b06 · 7e30b06
1 parent 1a8b5d3
commit 7e30b06
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -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)
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatTypes.java b/src/main/java/com/fasterxml/jackson/databind/jsonFormatVisitors/JsonFormatTypes.java
@@ -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>();