aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTatu Saloranta <tatu.saloranta@iki.fi>2020-03-02 19:10:23 -0800
committerTatu Saloranta <tatu.saloranta@iki.fi>2020-03-02 19:10:23 -0800
commit3a110952291555390fefc70ec99f7b9cfce234d2 (patch)
tree4b79ad3ab101f352495e0dc5d137005605f829d7
parent6a0b6a9ac09a164c0dd4524933e17ef4aa78b6f3 (diff)
parentf2c9851640d631925dce035a4a3f68a161d4cf6f (diff)
downloadjackson-annotations-3a110952291555390fefc70ec99f7b9cfce234d2.tar.gz
Merge branch '2.10' into 2.11
-rw-r--r--src/main/java/com/fasterxml/jackson/annotation/JsonTypeInfo.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/com/fasterxml/jackson/annotation/JsonTypeInfo.java b/src/main/java/com/fasterxml/jackson/annotation/JsonTypeInfo.java
index d259ca0..c838d2a 100644
--- a/src/main/java/com/fasterxml/jackson/annotation/JsonTypeInfo.java
+++ b/src/main/java/com/fasterxml/jackson/annotation/JsonTypeInfo.java
@@ -173,9 +173,13 @@ public @interface JsonTypeInfo
* Inclusion mechanism similar to <code>PROPERTY</code>, except that
* property is included one-level higher in hierarchy, i.e. as sibling
* property at same level as JSON Object to type.
- * Note that this choice <b>can only be used for properties</b>, not
+ * Note that this mechanism <b>can only be used for properties</b>, not
* for types (classes). Trying to use it for classes will result in
* inclusion strategy of basic <code>PROPERTY</code> instead.
+ *<p>
+ * Note also that this mechanism <b>can not be used for container values</b>
+ * (arrays, {@link java.util.Collection}s, {@link java.util.Map}s); it only
+ * works for scalar and POJO values.
*/
EXTERNAL_PROPERTY,