aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTatu Saloranta <tatu.saloranta@iki.fi>2020-07-28 19:36:32 -0700
committerTatu Saloranta <tatu.saloranta@iki.fi>2020-07-28 19:36:32 -0700
commit61069b5752929ff3262433113ede37f1d75821a6 (patch)
tree2a3dce9a8df085456af83bcf05bc9a153302cfef
parentb164e8f8a20d452b5531ee3e56153af0a2f8f719 (diff)
downloadjackson-databind-61069b5752929ff3262433113ede37f1d75821a6.tar.gz
Minor fix to compatibility, related Guava Map serialization
-rw-r--r--src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java2
-rw-r--r--src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java b/src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java
index eb59bfb3d..2900b9a58 100644
--- a/src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java
+++ b/src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java
@@ -365,7 +365,7 @@ public abstract class AnnotationIntrospector
/**
* @since 2.8
- * @deprecated 2.12
+ * @deprecated 2.12, use {@link #findPropertyIgnoralByName} instead.
*/
@Deprecated // since 2.12
public JsonIgnoreProperties.Value findPropertyIgnorals(Annotated ac) {
diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java b/src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java
index c5aa53d14..178e10521 100644
--- a/src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java
+++ b/src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java
@@ -308,6 +308,13 @@ public class JacksonAnnotationIntrospector
return JsonIgnoreProperties.Value.from(v);
}
+ // Keep around until 3.x
+ @Deprecated // since 2.12
+ @Override
+ public JsonIgnoreProperties.Value findPropertyIgnorals(Annotated ac) {
+ return findPropertyIgnoralByName(null, ac);
+ }
+
@Override
public JsonIncludeProperties.Value findPropertyInclusionByName(MapperConfig<?> config, Annotated a)
{