diff options
author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2016-10-20 23:04:31 -0700 |
---|---|---|
committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2016-10-20 23:04:31 -0700 |
commit | 4fc0fb34415310e9927249a56ba4987564151b2a (patch) | |
tree | 814c1df63bbf15e835a165cd538c253ebf15da29 /src/main/java/com/fasterxml/jackson/databind/SerializationConfig.java | |
parent | a2d3a5ac8680f5cc29f6c66bc32fd006dad8dc95 (diff) | |
download | jackson-databind-4fc0fb34415310e9927249a56ba4987564151b2a.tar.gz |
incremental test coverage improvements
Diffstat (limited to 'src/main/java/com/fasterxml/jackson/databind/SerializationConfig.java')
-rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/SerializationConfig.java | 57 |
1 files changed, 1 insertions, 56 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/SerializationConfig.java b/src/main/java/com/fasterxml/jackson/databind/SerializationConfig.java index 693877e68..19c2abe21 100644 --- a/src/main/java/com/fasterxml/jackson/databind/SerializationConfig.java +++ b/src/main/java/com/fasterxml/jackson/databind/SerializationConfig.java @@ -146,17 +146,6 @@ public final class SerializationConfig _serializationInclusion = DEFAULT_INCLUSION; } - /** - * @deprecated Since 2.8, remove from 2.9 or later - */ - @Deprecated - public SerializationConfig(BaseSettings base, - SubtypeResolver str, SimpleMixInResolver mixins, - RootNameLookup rootNames) - { - this(base, str, mixins, rootNames, null); - } - private SerializationConfig(SerializationConfig src, SubtypeResolver str) { super(src, str); @@ -751,14 +740,6 @@ public final class SerializationConfig } /** - * @deprecated Since 2.7 use {@link #withPropertyInclusion} instead - */ - @Deprecated - public SerializationConfig withSerializationInclusion(JsonInclude.Include incl) { - return withPropertyInclusion(DEFAULT_INCLUSION.withValueInclusion(incl)); - } - - /** * @since 2.7 */ public SerializationConfig withPropertyInclusion(JsonInclude.Value incl) { @@ -834,35 +815,10 @@ public final class SerializationConfig /* /********************************************************** - /* MapperConfig implementation/overrides: introspection - /********************************************************** - */ - - @Override - public AnnotationIntrospector getAnnotationIntrospector() - { - if (isEnabled(MapperFeature.USE_ANNOTATIONS)) { - return super.getAnnotationIntrospector(); - } - return AnnotationIntrospector.nopInstance(); - } - - /** - * Accessor for getting bean description that only contains immediate class - * annotations: ones from the class, and its direct mix-in, if any, but - * not from super types. - */ - @Override - public BeanDescription introspectDirectClassAnnotations(JavaType type) { - return getClassIntrospector().forDirectClassAnnotations(this, type, this); - } - - /* - /********************************************************** /* Configuration: default settings with per-type overrides /********************************************************** */ - + /** * @deprecated Since 2.7 use {@link #getDefaultPropertyInclusion} instead */ @@ -964,15 +920,4 @@ public final class SerializationConfig public <T extends BeanDescription> T introspect(JavaType type) { return (T) getClassIntrospector().forSerialization(this, type, this); } - - /* - /********************************************************** - /* Debug support - /********************************************************** - */ - - @Override - public String toString() { - return "[SerializationConfig: flags=0x"+Integer.toHexString(_serFeatures)+"]"; - } } |