diff options
| author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2016-04-24 21:59:51 -0700 |
|---|---|---|
| committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2016-04-24 21:59:51 -0700 |
| commit | d47221bfd33ded72e3707ce8abe4ec4aa5e4f4bf (patch) | |
| tree | 55dcfb09395bfc9eb88ae872892307111c8f6b0d /src/main/java/com/fasterxml/jackson/databind/SerializationConfig.java | |
| parent | 8e8d2e53c454bfbddaa1f654cda6e1e48d03e85c (diff) | |
| download | jackson-databind-d47221bfd33ded72e3707ce8abe4ec4aa5e4f4bf.tar.gz | |
Renaming "property config override" as "type config override" as configuration is associated with type (of a property or value), not property. In future we may want to have actual property config overrides as well.
Diffstat (limited to 'src/main/java/com/fasterxml/jackson/databind/SerializationConfig.java')
| -rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/SerializationConfig.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/SerializationConfig.java b/src/main/java/com/fasterxml/jackson/databind/SerializationConfig.java index 2c5ce67ac..2ee6d43d1 100644 --- a/src/main/java/com/fasterxml/jackson/databind/SerializationConfig.java +++ b/src/main/java/com/fasterxml/jackson/databind/SerializationConfig.java @@ -132,7 +132,7 @@ public final class SerializationConfig */ public SerializationConfig(BaseSettings base, SubtypeResolver str, SimpleMixInResolver mixins, - RootNameLookup rootNames, PropertyConfigOverrides propertyOverrides) + RootNameLookup rootNames, TypeConfigOverrides propertyOverrides) { super(base, str, mixins, rootNames, propertyOverrides); _serFeatures = collectFeatureDefaults(SerializationFeature.class); @@ -304,7 +304,7 @@ public final class SerializationConfig * @since 2.8 */ protected SerializationConfig(SerializationConfig src, SimpleMixInResolver mixins, - RootNameLookup rootNames, PropertyConfigOverrides propertyOverrides) + RootNameLookup rootNames, TypeConfigOverrides propertyOverrides) { super(src, mixins, rootNames, propertyOverrides); _serFeatures = src._serFeatures; @@ -905,7 +905,7 @@ public final class SerializationConfig @Override public JsonInclude.Value getDefaultPropertyInclusion(Class<?> baseType) { - PropertyConfigOverride overrides = findPropertyConfigOverride(baseType); + TypeConfigOverride overrides = findPropertyConfigOverride(baseType); if (overrides != null) { JsonInclude.Value v = overrides.getInclude(); if (v != null) { |