diff --git a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor.java b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor.java index 6c6bb24d0f..40dd3c37fa 100644 --- a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor.java +++ b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor.java @@ -34,10 +34,10 @@ public Base() { } public Base(SerializationContext p) { _provider = p; } @Override - public SerializationContext getProvider() { return _provider; } + public SerializationContext getContext() { return _provider; } @Override - public void setProvider(SerializationContext p) { _provider = p; } + public void setContext(SerializationContext p) { _provider = p; } @Override public void itemsFormat(JsonFormatVisitable handler, JavaType elementType) { } diff --git a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWithSerializationContext.java b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWithSerializationContext.java index 7b8d7c8324..ac80233a4c 100644 --- a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWithSerializationContext.java +++ b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWithSerializationContext.java @@ -9,6 +9,6 @@ * @author jphelan */ public interface JsonFormatVisitorWithSerializationContext { - public SerializationContext getProvider(); - public abstract void setProvider(SerializationContext provider); + public SerializationContext getContext(); + public abstract void setContext(SerializationContext provider); } diff --git a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper.java b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper.java index eea78bacae..a41298c8cf 100644 --- a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper.java +++ b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper.java @@ -62,29 +62,29 @@ public interface JsonFormatVisitorWrapper extends JsonFormatVisitorWithSerializa /** * Empty "no-op" implementation of {@link JsonFormatVisitorWrapper}, suitable for - * sub-classing. Does implement {@link #setProvider(SerializationContext)} and - * {@link #getProvider()} as expected; other methods simply return null + * sub-classing. Does implement {@link #setContext(SerializationContext)} and + * {@link #getContext()} as expected; other methods simply return null * and do nothing. * * @since 2.5 */ public static class Base implements JsonFormatVisitorWrapper { - protected SerializationContext _provider; + protected SerializationContext _context; public Base() { } public Base(SerializationContext p) { - _provider = p; + _context = p; } @Override - public SerializationContext getProvider() { - return _provider; + public SerializationContext getContext() { + return _context; } @Override - public void setProvider(SerializationContext p) { - _provider = p; + public void setContext(SerializationContext p) { + _context = p; } @Override diff --git a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonMapFormatVisitor.java b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonMapFormatVisitor.java index e6bf04a5be..0fdacdf75c 100644 --- a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonMapFormatVisitor.java +++ b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonMapFormatVisitor.java @@ -31,10 +31,10 @@ public Base() { } public Base(SerializationContext p) { _provider = p; } @Override - public SerializationContext getProvider() { return _provider; } + public SerializationContext getContext() { return _provider; } @Override - public void setProvider(SerializationContext p) { _provider = p; } + public void setContext(SerializationContext p) { _provider = p; } @Override public void keyFormat(JsonFormatVisitable handler, JavaType keyType) { } diff --git a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonObjectFormatVisitor.java b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonObjectFormatVisitor.java index b8df35d9ef..39ea0100d5 100644 --- a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonObjectFormatVisitor.java +++ b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonObjectFormatVisitor.java @@ -41,10 +41,10 @@ public Base() { } public Base(SerializationContext p) { _provider = p; } @Override - public SerializationContext getProvider() { return _provider; } + public SerializationContext getContext() { return _provider; } @Override - public void setProvider(SerializationContext p) { _provider = p; } + public void setContext(SerializationContext p) { _provider = p; } @Override public void property(BeanProperty prop) { } diff --git a/src/main/java/tools/jackson/databind/ser/SerializationContextExt.java b/src/main/java/tools/jackson/databind/ser/SerializationContextExt.java index c4bbbb8bee..e91f22535d 100644 --- a/src/main/java/tools/jackson/databind/ser/SerializationContextExt.java +++ b/src/main/java/tools/jackson/databind/ser/SerializationContextExt.java @@ -482,7 +482,7 @@ public void acceptJsonFormatVisitor(JavaType javaType, JsonFormatVisitorWrapper Objects.requireNonNull(javaType); // no need for embedded type information for JSON schema generation (all // type information it needs is accessible via "untyped" serializer) - visitor.setProvider(this); + visitor.setContext(this); findRootValueSerializer(javaType).acceptJsonFormatVisitor(visitor, javaType); } diff --git a/src/main/java/tools/jackson/databind/ser/bean/BeanSerializerBase.java b/src/main/java/tools/jackson/databind/ser/bean/BeanSerializerBase.java index 88ebb3aa9c..a31c2c45d4 100644 --- a/src/main/java/tools/jackson/databind/ser/bean/BeanSerializerBase.java +++ b/src/main/java/tools/jackson/databind/ser/bean/BeanSerializerBase.java @@ -937,9 +937,9 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t if (objectVisitor == null) { return; } - final SerializationContext provider = visitor.getProvider(); + final SerializationContext provider = visitor.getContext(); if (_propertyFilterId != null) { - PropertyFilter filter = findPropertyFilter(visitor.getProvider(), + PropertyFilter filter = findPropertyFilter(visitor.getContext(), _propertyFilterId, null); for (int i = 0, end = _props.length; i < end; ++i) { filter.depositSchemaProperty(_props[i], objectVisitor, provider); diff --git a/src/main/java/tools/jackson/databind/ser/jackson/JsonValueSerializer.java b/src/main/java/tools/jackson/databind/ser/jackson/JsonValueSerializer.java index 7106b7a184..ea5efe87b9 100644 --- a/src/main/java/tools/jackson/databind/ser/jackson/JsonValueSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jackson/JsonValueSerializer.java @@ -334,7 +334,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t } ValueSerializer ser = _valueSerializer; if (ser == null) { - ser = visitor.getProvider().findPrimaryPropertySerializer(type, _property); + ser = visitor.getContext().findPrimaryPropertySerializer(type, _property); if (ser == null) { // can this ever occur? visitor.expectAnyFormat(typeHint); return; diff --git a/src/main/java/tools/jackson/databind/ser/jdk/DateTimeSerializerBase.java b/src/main/java/tools/jackson/databind/ser/jdk/DateTimeSerializerBase.java index f73a016856..af7c0e3687 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/DateTimeSerializerBase.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/DateTimeSerializerBase.java @@ -147,7 +147,7 @@ public boolean isEmpty(SerializationContext serializers, T value) { @Override public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint) { - _acceptJsonFormatVisitor(visitor, typeHint, _asTimestamp(visitor.getProvider())); + _acceptJsonFormatVisitor(visitor, typeHint, _asTimestamp(visitor.getContext())); } /* diff --git a/src/main/java/tools/jackson/databind/ser/jdk/EnumSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/EnumSerializer.java index a19c4c3738..525305c473 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/EnumSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/EnumSerializer.java @@ -153,7 +153,7 @@ public final void serialize(Enum en, JsonGenerator g, SerializationContext ct @Override public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint) { - SerializationContext serializers = visitor.getProvider(); + SerializationContext serializers = visitor.getContext(); if (_serializeAsIndex(serializers)) { visitIntFormat(visitor, typeHint, JsonParser.NumberType.INT); return; diff --git a/src/main/java/tools/jackson/databind/ser/jdk/MapSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/MapSerializer.java index 406e4b9885..8ed73da865 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/MapSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/MapSerializer.java @@ -965,7 +965,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t v2.keyFormat(_keySerializer, _keyType); ValueSerializer valueSer = _valueSerializer; if (valueSer == null) { - valueSer = _findAndAddDynamic(visitor.getProvider(), _valueType); + valueSer = _findAndAddDynamic(visitor.getContext(), _valueType); } v2.valueFormat(valueSer, _valueType); } diff --git a/src/main/java/tools/jackson/databind/ser/jdk/ObjectArraySerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/ObjectArraySerializer.java index 29807525de..b2433a3641 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/ObjectArraySerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/ObjectArraySerializer.java @@ -298,7 +298,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t JavaType contentType = _elementType; ValueSerializer valueSer = _elementSerializer; if (valueSer == null) { - valueSer = visitor.getProvider().findContentValueSerializer(contentType, _property); + valueSer = visitor.getContext().findContentValueSerializer(contentType, _property); } arrayVisitor.itemsFormat(valueSer, contentType); } diff --git a/src/main/java/tools/jackson/databind/ser/std/AsArraySerializerBase.java b/src/main/java/tools/jackson/databind/ser/std/AsArraySerializerBase.java index 659cb006de..3fd41edcaa 100644 --- a/src/main/java/tools/jackson/databind/ser/std/AsArraySerializerBase.java +++ b/src/main/java/tools/jackson/databind/ser/std/AsArraySerializerBase.java @@ -233,7 +233,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t // 19-Oct-2016, tatu: Apparently we get null for untyped/raw `EnumSet`s... not 100% // sure what'd be the clean way but let's try this for now: if (_elementType != null) { - valueSer = visitor.getProvider().findContentValueSerializer(_elementType, _property); + valueSer = visitor.getContext().findContentValueSerializer(_elementType, _property); } } visitArrayFormat(visitor, typeHint, valueSer, _elementType); diff --git a/src/main/java/tools/jackson/databind/ser/std/ReferenceTypeSerializer.java b/src/main/java/tools/jackson/databind/ser/std/ReferenceTypeSerializer.java index 3d2609ae9c..fd8442a130 100644 --- a/src/main/java/tools/jackson/databind/ser/std/ReferenceTypeSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/std/ReferenceTypeSerializer.java @@ -379,7 +379,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t { ValueSerializer ser = _valueSerializer; if (ser == null) { - ser = _findSerializer(visitor.getProvider(), _referredType, _property); + ser = _findSerializer(visitor.getContext(), _referredType, _property); if (_unwrapper != null) { ser = ser.unwrappingSerializer(_unwrapper); } diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalUnwrappedTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalUnwrappedTest.java index 2329babda0..407dace573 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalUnwrappedTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalUnwrappedTest.java @@ -79,7 +79,7 @@ public void testPropogatePrefixToSchema() throws Exception { BeanSerializerFactory.instance, new SerializerCache())) { @Override public JsonObjectFormatVisitor expectObjectFormat(JavaType type) { - return new JsonObjectFormatVisitor.Base(getProvider()) { + return new JsonObjectFormatVisitor.Base(getContext()) { @Override public void optionalProperty(BeanProperty prop) { propertyName.set(prop.getName()); diff --git a/src/test/java/tools/jackson/databind/jsonschema/NewSchemaTest.java b/src/test/java/tools/jackson/databind/jsonschema/NewSchemaTest.java index 36490314a8..be022347a8 100644 --- a/src/test/java/tools/jackson/databind/jsonschema/NewSchemaTest.java +++ b/src/test/java/tools/jackson/databind/jsonschema/NewSchemaTest.java @@ -118,7 +118,7 @@ static class BogusJsonFormatVisitorWrapper @Override public JsonObjectFormatVisitor expectObjectFormat(JavaType type) { - return new JsonObjectFormatVisitor.Base(getProvider()) { + return new JsonObjectFormatVisitor.Base(getContext()) { @Override public void property(BeanProperty prop) { _visit(prop); @@ -144,14 +144,14 @@ private void _visit(BeanProperty prop) } BeanPropertyWriter bpw = (BeanPropertyWriter) prop; ValueSerializer ser = bpw.getSerializer(); - final SerializationContext prov = getProvider(); + final SerializationContext prov = getContext(); if (ser == null) { if (prov == null) { throw new Error("SerializationContext missing"); } ser = prov.findPrimaryPropertySerializer(prop.getType(), prop); } - JsonFormatVisitorWrapper visitor = new JsonFormatVisitorWrapper.Base(getProvider()); + JsonFormatVisitorWrapper visitor = new JsonFormatVisitorWrapper.Base(getContext()); ser.acceptJsonFormatVisitor(visitor, prop.getType()); } }; @@ -159,7 +159,7 @@ private void _visit(BeanProperty prop) @Override public JsonArrayFormatVisitor expectArrayFormat(JavaType type) { - return new JsonArrayFormatVisitor.Base(getProvider()); + return new JsonArrayFormatVisitor.Base(getContext()); } @Override @@ -305,7 +305,7 @@ public void testSimpleNumbers() throws Exception new JsonFormatVisitorWrapper.Base() { @Override public JsonObjectFormatVisitor expectObjectFormat(final JavaType type) { - return new JsonObjectFormatVisitor.Base(getProvider()) { + return new JsonObjectFormatVisitor.Base(getContext()) { @Override public void optionalProperty(BeanProperty prop) { sb.append("[optProp ").append(prop.getName()).append("("); @@ -314,7 +314,7 @@ public void optionalProperty(BeanProperty prop) { BeanPropertyWriter bpw = (BeanPropertyWriter) prop; ser = bpw.getSerializer(); } - final SerializationContext prov = getProvider(); + final SerializationContext prov = getContext(); if (ser == null) { ser = prov.findPrimaryPropertySerializer(prop.getType(), prop); }