diff --git a/release-notes/VERSION b/release-notes/VERSION index 2bbee0a57d..2945af95fa 100644 --- a/release-notes/VERSION +++ b/release-notes/VERSION @@ -51,6 +51,7 @@ Versions: 3.x (for earlier see VERSION-2.x) #3028: Change `UUIDSerializer` to use `StreamWriteCapability` check instead of `JsonGenerator.canWriteBinaryNatively()` #3037: Rename `Module` as `JacksonModule` in 3.0 (to avoid overlap with `java.lang.Module`) +#3043: Rename `SerializerProvider` as `SerializationContext` #3044: Rename `JsonDeserializer`/`JsonSerializer` as `ValueDeserializer`/`ValueSerializer` #3046: Rename `JsonSerializable` as `JacksonSerializable` #3047: Rename `Bean[De]SerializerModifier` as `Value[De]SerializerModifier` diff --git a/src/main/java/tools/jackson/databind/BeanProperty.java b/src/main/java/tools/jackson/databind/BeanProperty.java index 4ce0a7dc96..86f635ccf4 100644 --- a/src/main/java/tools/jackson/databind/BeanProperty.java +++ b/src/main/java/tools/jackson/databind/BeanProperty.java @@ -161,7 +161,7 @@ public interface BeanProperty extends FullyNamed * @param objectVisitor Visitor to used as the callback handler */ public void depositSchemaProperty(JsonObjectFormatVisitor objectVisitor, - SerializerProvider provider); + SerializationContext provider); /* /********************************************************************** @@ -279,7 +279,7 @@ public List findAliases(MapperConfig config) { */ @Override public void depositSchemaProperty(JsonObjectFormatVisitor objectVisitor, - SerializerProvider provider) { + SerializationContext provider) { throw new UnsupportedOperationException("Instances of "+getClass().getName()+" should not get visited"); } } @@ -364,7 +364,7 @@ public List findAliases(MapperConfig config) { @Override public void depositSchemaProperty(JsonObjectFormatVisitor objectVisitor, - SerializerProvider provider) { + SerializationContext provider) { } } } diff --git a/src/main/java/tools/jackson/databind/DatabindContext.java b/src/main/java/tools/jackson/databind/DatabindContext.java index ef483b7c45..7a79dfdcfa 100644 --- a/src/main/java/tools/jackson/databind/DatabindContext.java +++ b/src/main/java/tools/jackson/databind/DatabindContext.java @@ -22,7 +22,7 @@ /** * Shared base class for {@link DeserializationContext} and - * {@link SerializerProvider}, context objects passed through data-binding + * {@link SerializationContext}, context objects passed through data-binding * process. Designed so that some of implementations can rely on shared * aspects like access to secondary contextual objects like type factories * or handler instantiators. diff --git a/src/main/java/tools/jackson/databind/DatabindException.java b/src/main/java/tools/jackson/databind/DatabindException.java index 3b521813c4..0cfdd17ba9 100644 --- a/src/main/java/tools/jackson/databind/DatabindException.java +++ b/src/main/java/tools/jackson/databind/DatabindException.java @@ -78,17 +78,17 @@ private static JsonParser _parser(DeserializationContext ctxt) { return (ctxt == null) ? null : ctxt.getParser(); } - public static DatabindException from(SerializerProvider ctxt, String msg) { + public static DatabindException from(SerializationContext ctxt, String msg) { return new DatabindException(_generator(ctxt), msg); } - public static DatabindException from(SerializerProvider ctxt, String msg, Throwable problem) { + public static DatabindException from(SerializationContext ctxt, String msg, Throwable problem) { // 17-Aug-2015, tatu: As per [databind#903] this is bit problematic as - // SerializerProvider instance does not currently hold on to generator... + // SerializationContext instance does not currently hold on to generator... return new DatabindException(_generator(ctxt), msg, problem); } - private static JsonGenerator _generator(SerializerProvider ctxt) { + private static JsonGenerator _generator(SerializationContext ctxt) { return (ctxt == null) ? null : ctxt.getGenerator(); } } diff --git a/src/main/java/tools/jackson/databind/JacksonSerializable.java b/src/main/java/tools/jackson/databind/JacksonSerializable.java index cf04b562dd..2aca1ec06d 100644 --- a/src/main/java/tools/jackson/databind/JacksonSerializable.java +++ b/src/main/java/tools/jackson/databind/JacksonSerializable.java @@ -6,7 +6,7 @@ /** * Interface that can be implemented by objects that know how to * serialize themselves to JSON, using {@link JsonGenerator} - * (and {@link SerializerProvider} if necessary). + * (and {@link SerializationContext} if necessary). *

* Note that implementing this interface binds implementing object * closely to Jackson API, and that it is often not necessary to do @@ -25,7 +25,7 @@ public interface JacksonSerializable * Serialization method called when no additional type information is * to be included in serialization. */ - public void serialize(JsonGenerator gen, SerializerProvider serializers) + public void serialize(JsonGenerator gen, SerializationContext serializers) throws JacksonException; /** @@ -41,7 +41,7 @@ public void serialize(JsonGenerator gen, SerializerProvider serializers) * Note that some types (most notably, "natural" types: String, Integer, * Double and Boolean) never include type information. */ - public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, + public void serializeWithType(JsonGenerator gen, SerializationContext serializers, TypeSerializer typeSer) throws JacksonException; @@ -57,7 +57,7 @@ public abstract static class Base implements JacksonSerializable * Method that may be called on instance to determine if it is considered * "empty" for purposes of serialization filtering or not. */ - public boolean isEmpty(SerializerProvider serializers) { + public boolean isEmpty(SerializationContext serializers) { return false; } } diff --git a/src/main/java/tools/jackson/databind/ObjectMapper.java b/src/main/java/tools/jackson/databind/ObjectMapper.java index bfd95453ea..d5604104d0 100644 --- a/src/main/java/tools/jackson/databind/ObjectMapper.java +++ b/src/main/java/tools/jackson/databind/ObjectMapper.java @@ -187,9 +187,9 @@ protected Object readResolve() { */ /** - * Factory used for constructing per-call {@link SerializerProvider}s. + * Factory used for constructing per-call {@link SerializationContext}s. *

- * Note: while serializers are only exposed {@link SerializerProvider}, + * Note: while serializers are only exposed {@link SerializationContext}, * mappers and readers need to access additional API defined by * {@link SerializationContextExt} */ @@ -754,7 +754,7 @@ public JsonParser createNonBlockingByteArrayParser() throws JacksonException { */ public JsonGenerator createGenerator(OutputStream out) throws JacksonException { _assertNotNull("out", out); - return _streamFactory.createGenerator(_serializerProvider(), out); + return _streamFactory.createGenerator(_serializationContext(), out); } /** @@ -767,7 +767,7 @@ public JsonGenerator createGenerator(OutputStream out) throws JacksonException { */ public JsonGenerator createGenerator(OutputStream out, JsonEncoding enc) throws JacksonException { _assertNotNull("out", out); - return _streamFactory.createGenerator(_serializerProvider(), out, enc); + return _streamFactory.createGenerator(_serializationContext(), out, enc); } /** @@ -780,7 +780,7 @@ public JsonGenerator createGenerator(OutputStream out, JsonEncoding enc) throws */ public JsonGenerator createGenerator(Writer w) throws JacksonException { _assertNotNull("w", w); - return _streamFactory.createGenerator(_serializerProvider(), w); + return _streamFactory.createGenerator(_serializationContext(), w); } /** @@ -793,7 +793,7 @@ public JsonGenerator createGenerator(Writer w) throws JacksonException { */ public JsonGenerator createGenerator(File f, JsonEncoding enc) throws JacksonException { _assertNotNull("f", f); - return _streamFactory.createGenerator(_serializerProvider(), f, enc); + return _streamFactory.createGenerator(_serializationContext(), f, enc); } /** @@ -806,7 +806,7 @@ public JsonGenerator createGenerator(File f, JsonEncoding enc) throws JacksonExc */ public JsonGenerator createGenerator(Path path, JsonEncoding enc) throws JacksonException { _assertNotNull("path", path); - return _streamFactory.createGenerator(_serializerProvider(), path, enc); + return _streamFactory.createGenerator(_serializationContext(), path, enc); } /** @@ -819,7 +819,7 @@ public JsonGenerator createGenerator(Path path, JsonEncoding enc) throws Jackson */ public JsonGenerator createGenerator(DataOutput out) throws JacksonException { _assertNotNull("out", out); - return _streamFactory.createGenerator(_serializerProvider(), out); + return _streamFactory.createGenerator(_serializationContext(), out); } /* @@ -934,7 +934,7 @@ public void writeTree(JsonGenerator g, TreeNode rootNode) throws JacksonExceptio { _assertNotNull("g", g); SerializationConfig config = serializationConfig(); - _serializerProvider(config).serializeValue(g, rootNode); + _serializationContext(config).serializeValue(g, rootNode); if (config.isEnabled(SerializationFeature.FLUSH_AFTER_WRITE_VALUE)) { g.flush(); } @@ -1235,7 +1235,7 @@ public void writeValue(JsonGenerator g, Object value) throws JacksonException if (config.isEnabled(SerializationFeature.CLOSE_CLOSEABLE) && (value instanceof Closeable)) { _writeCloseableValue(g, value, config); } else { - _serializerProvider(config).serializeValue(g, value); + _serializationContext(config).serializeValue(g, value); if (config.isEnabled(SerializationFeature.FLUSH_AFTER_WRITE_VALUE)) { g.flush(); } @@ -1358,7 +1358,7 @@ public T valueToTree(Object fromValue) { // 02-Mar-2021, tatu: [databind#2411] Rewrite "valueToTree()" impl; old // impl left for reference - return _serializerProvider().valueToTree(fromValue); + return _serializationContext().valueToTree(fromValue); } /* @@ -1764,7 +1764,7 @@ public T readValue(DataInput src, TypeReference valueTypeRef) throws Jack public void writeValue(File file, Object value) throws JacksonException { _assertNotNull("file", file); - SerializationContextExt prov = _serializerProvider(); + SerializationContextExt prov = _serializationContext(); _configAndWriteValue(prov, _streamFactory.createGenerator(prov, file, JsonEncoding.UTF8), value); } @@ -1778,7 +1778,7 @@ public void writeValue(File file, Object value) throws JacksonException public void writeValue(Path path, Object value) throws JacksonException { _assertNotNull("path", path); - SerializationContextExt prov = _serializerProvider(); + SerializationContextExt prov = _serializationContext(); _configAndWriteValue(prov, _streamFactory.createGenerator(prov, path, JsonEncoding.UTF8), value); } @@ -1797,7 +1797,7 @@ public void writeValue(Path path, Object value) throws JacksonException public void writeValue(OutputStream out, Object value) throws JacksonException { _assertNotNull("out", out); - SerializationContextExt prov = _serializerProvider(); + SerializationContextExt prov = _serializationContext(); _configAndWriteValue(prov, _streamFactory.createGenerator(prov, out, JsonEncoding.UTF8), value); } @@ -1805,7 +1805,7 @@ public void writeValue(OutputStream out, Object value) throws JacksonException public void writeValue(DataOutput out, Object value) throws JacksonException { _assertNotNull("out", out); - SerializationContextExt prov = _serializerProvider(); + SerializationContextExt prov = _serializationContext(); _configAndWriteValue(prov, _streamFactory.createGenerator(prov, out), value); } @@ -1823,7 +1823,7 @@ public void writeValue(DataOutput out, Object value) throws JacksonException public void writeValue(Writer w, Object value) throws JacksonException { _assertNotNull("w", w); - SerializationContextExt prov = _serializerProvider(); + SerializationContextExt prov = _serializationContext(); _configAndWriteValue(prov, _streamFactory.createGenerator(prov, w), value); } @@ -1839,7 +1839,7 @@ public String writeValueAsString(Object value) throws JacksonException final BufferRecycler br = _streamFactory._getBufferRecycler(); // alas, we have to pull the recycler directly here... try (SegmentedStringWriter sw = new SegmentedStringWriter(br)) { - SerializationContextExt prov = _serializerProvider(); + SerializationContextExt prov = _serializationContext(); _configAndWriteValue(prov, _streamFactory.createGenerator(prov, sw), value); return sw.getAndClear(); } finally { @@ -1859,7 +1859,7 @@ public byte[] writeValueAsBytes(Object value) throws JacksonException { final BufferRecycler br = _streamFactory._getBufferRecycler(); try (ByteArrayBuilder bb = new ByteArrayBuilder(br)) { - final SerializationContextExt ctxt = _serializerProvider(); + final SerializationContextExt ctxt = _serializationContext(); _configAndWriteValue(ctxt, _streamFactory.createGenerator(ctxt, bb, JsonEncoding.UTF8), value); return bb.getClearAndRelease(); @@ -1919,7 +1919,7 @@ protected final void _writeCloseableValue(JsonGenerator g, Object value, Seriali { Closeable toClose = (Closeable) value; try { - _serializerProvider(cfg).serializeValue(g, value); + _serializationContext(cfg).serializeValue(g, value); if (cfg.isEnabled(SerializationFeature.FLUSH_AFTER_WRITE_VALUE)) { g.flush(); } @@ -2361,7 +2361,7 @@ protected Object _convert(Object fromValue, JavaType toValueType) // first: disable wrapping when writing final SerializationConfig config = serializationConfig() .without(SerializationFeature.WRAP_ROOT_VALUE); - final SerializationContextExt ctxt = _serializerProvider(config); + final SerializationContextExt ctxt = _serializationContext(config); TokenBuffer buf = ctxt.bufferForValueConversion(); // Would like to let buffer decide, but it won't have deser config to check so... if (isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)) { @@ -2431,7 +2431,7 @@ public T updateValue(T valueToUpdate, Object overrides) } SerializationConfig config = serializationConfig() .without(SerializationFeature.WRAP_ROOT_VALUE); - SerializationContextExt ctxt = _serializerProvider(config); + SerializationContextExt ctxt = _serializationContext(config); TokenBuffer buf = ctxt.bufferForValueConversion(); // Would like to let buffer decide, but it won't have deser config to check so... if (isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)) { @@ -2487,7 +2487,7 @@ public void acceptJsonFormatVisitor(JavaType type, JsonFormatVisitorWrapper visi { _assertNotNull("type", type); _assertNotNull("visitor", visitor); - _serializerProvider().acceptJsonFormatVisitor(type, visitor); + _serializationContext().acceptJsonFormatVisitor(type, visitor); } /* @@ -2498,16 +2498,16 @@ public void acceptJsonFormatVisitor(JavaType type, JsonFormatVisitorWrapper visi /** * Overridable helper method used for constructing - * {@link SerializerProvider} to use for serialization. + * {@link SerializationContext} to use for serialization. */ - protected SerializationContextExt _serializerProvider(SerializationConfig config) { + protected SerializationContextExt _serializationContext(SerializationConfig config) { // 03-Oct-2017, tatu: Should be ok to pass "empty" generator settings... return _serializationContexts.createContext(config, GeneratorSettings.empty()); } // NOTE: only public to allow for testing - public SerializationContextExt _serializerProvider() { + public SerializationContextExt _serializationContext() { // 03-Oct-2017, tatu: Should be ok to pass "empty" generator settings... return _serializationContexts.createContext(serializationConfig(), GeneratorSettings.empty()); diff --git a/src/main/java/tools/jackson/databind/ObjectWriter.java b/src/main/java/tools/jackson/databind/ObjectWriter.java index 937956687d..916fb28572 100644 --- a/src/main/java/tools/jackson/databind/ObjectWriter.java +++ b/src/main/java/tools/jackson/databind/ObjectWriter.java @@ -51,9 +51,9 @@ public class ObjectWriter protected final SerializationConfig _config; /** - * Factory used for constructing per-call {@link SerializerProvider}s. + * Factory used for constructing per-call {@link SerializationContext}s. *

- * Note: while serializers are only exposed {@link SerializerProvider}, + * Note: while serializers are only exposed {@link SerializationContext}, * mappers and readers need to access additional API defined by * {@link SerializationContextExt} */ @@ -567,7 +567,7 @@ public ObjectWriter withRootValueSeparator(SerializableString sep) { */ public JsonGenerator createGenerator(OutputStream target) { _assertNotNull("target", target); - return _generatorFactory.createGenerator(_serializerProvider(), target); + return _generatorFactory.createGenerator(_serializationContext(), target); } /** @@ -580,7 +580,7 @@ public JsonGenerator createGenerator(OutputStream target) { */ public JsonGenerator createGenerator(OutputStream target, JsonEncoding enc) { _assertNotNull("target", target); - return _generatorFactory.createGenerator(_serializerProvider(), target, enc); + return _generatorFactory.createGenerator(_serializationContext(), target, enc); } /** @@ -593,7 +593,7 @@ public JsonGenerator createGenerator(OutputStream target, JsonEncoding enc) { */ public JsonGenerator createGenerator(Writer target) { _assertNotNull("target", target); - return _generatorFactory.createGenerator(_serializerProvider(), target); + return _generatorFactory.createGenerator(_serializationContext(), target); } /** @@ -606,7 +606,7 @@ public JsonGenerator createGenerator(Writer target) { */ public JsonGenerator createGenerator(File target, JsonEncoding enc) { _assertNotNull("target", target); - return _generatorFactory.createGenerator(_serializerProvider(), target, enc); + return _generatorFactory.createGenerator(_serializationContext(), target, enc); } /** @@ -619,7 +619,7 @@ public JsonGenerator createGenerator(File target, JsonEncoding enc) { */ public JsonGenerator createGenerator(Path target, JsonEncoding enc) { _assertNotNull("target", target); - return _generatorFactory.createGenerator(_serializerProvider(), target, enc); + return _generatorFactory.createGenerator(_serializationContext(), target, enc); } /** @@ -632,7 +632,7 @@ public JsonGenerator createGenerator(Path target, JsonEncoding enc) { */ public JsonGenerator createGenerator(DataOutput target) { _assertNotNull("target", target); - return _generatorFactory.createGenerator(_serializerProvider(), target); + return _generatorFactory.createGenerator(_serializationContext(), target); } /* @@ -670,7 +670,7 @@ public SequenceWriter writeValues(File target) throws JacksonException { _assertNotNull("target", target); - SerializationContextExt ctxt = _serializerProvider(); + SerializationContextExt ctxt = _serializationContext(); return _newSequenceWriter(ctxt, false, _generatorFactory.createGenerator(ctxt, target, JsonEncoding.UTF8), true); } @@ -692,7 +692,7 @@ public SequenceWriter writeValues(Path target) throws JacksonException { _assertNotNull("target", target); - SerializationContextExt ctxt = _serializerProvider(); + SerializationContextExt ctxt = _serializationContext(); return _newSequenceWriter(ctxt, false, _generatorFactory.createGenerator(ctxt, target, JsonEncoding.UTF8), true); } @@ -714,7 +714,7 @@ public SequenceWriter writeValues(JsonGenerator g) throws JacksonException { _assertNotNull("target", g); - return _newSequenceWriter(_serializerProvider(), false, g, false); + return _newSequenceWriter(_serializationContext(), false, g, false); } /** @@ -730,7 +730,7 @@ public SequenceWriter writeValues(JsonGenerator g) */ public SequenceWriter writeValues(Writer target) throws JacksonException { _assertNotNull("target", target); - SerializationContextExt ctxt = _serializerProvider(); + SerializationContextExt ctxt = _serializationContext(); return _newSequenceWriter(ctxt, false, _generatorFactory.createGenerator(ctxt, target), true); } @@ -748,14 +748,14 @@ public SequenceWriter writeValues(Writer target) throws JacksonException { */ public SequenceWriter writeValues(OutputStream target) throws JacksonException { _assertNotNull("target", target); - SerializationContextExt ctxt = _serializerProvider(); + SerializationContextExt ctxt = _serializationContext(); return _newSequenceWriter(ctxt, false, _generatorFactory.createGenerator(ctxt, target, JsonEncoding.UTF8), true); } public SequenceWriter writeValues(DataOutput target) throws JacksonException { _assertNotNull("target", target); - SerializationContextExt ctxt = _serializerProvider(); + SerializationContextExt ctxt = _serializationContext(); return _newSequenceWriter(ctxt, false, _generatorFactory.createGenerator(ctxt, target), true); } @@ -777,7 +777,7 @@ public SequenceWriter writeValuesAsArray(File target) throws JacksonException { _assertNotNull("target", target); - SerializationContextExt ctxt = _serializerProvider(); + SerializationContextExt ctxt = _serializationContext(); return _newSequenceWriter(ctxt, true, _generatorFactory.createGenerator(ctxt, target, JsonEncoding.UTF8), true); } @@ -801,7 +801,7 @@ public SequenceWriter writeValuesAsArray(Path target) throws JacksonException { _assertNotNull("target", target); - SerializationContextExt ctxt = _serializerProvider(); + SerializationContextExt ctxt = _serializationContext(); return _newSequenceWriter(ctxt, true, _generatorFactory.createGenerator(ctxt, target, JsonEncoding.UTF8), true); } @@ -824,7 +824,7 @@ public SequenceWriter writeValuesAsArray(JsonGenerator g) throws JacksonException { _assertNotNull("g", g); - return _newSequenceWriter(_serializerProvider(), true, g, false); + return _newSequenceWriter(_serializationContext(), true, g, false); } /** @@ -842,7 +842,7 @@ public SequenceWriter writeValuesAsArray(JsonGenerator g) */ public SequenceWriter writeValuesAsArray(Writer target) throws JacksonException { _assertNotNull("target", target); - SerializationContextExt ctxt = _serializerProvider(); + SerializationContextExt ctxt = _serializationContext(); return _newSequenceWriter(ctxt, true, _generatorFactory.createGenerator(ctxt, target), true); } @@ -862,14 +862,14 @@ public SequenceWriter writeValuesAsArray(Writer target) throws JacksonException */ public SequenceWriter writeValuesAsArray(OutputStream target) throws JacksonException { _assertNotNull("target", target); - SerializationContextExt ctxt = _serializerProvider(); + SerializationContextExt ctxt = _serializationContext(); return _newSequenceWriter(ctxt, true, _generatorFactory.createGenerator(ctxt, target, JsonEncoding.UTF8), true); } public SequenceWriter writeValuesAsArray(DataOutput target) throws JacksonException { _assertNotNull("target", target); - SerializationContextExt ctxt = _serializerProvider(); + SerializationContextExt ctxt = _serializationContext(); return _newSequenceWriter(ctxt, true, _generatorFactory.createGenerator(ctxt, target), true); } @@ -954,7 +954,7 @@ public void writeValue(JsonGenerator g, Object value) { Closeable toClose = (Closeable) value; try { - _prefetch.serialize(g, value, _serializerProvider()); + _prefetch.serialize(g, value, _serializationContext()); if (_config.isEnabled(SerializationFeature.FLUSH_AFTER_WRITE_VALUE)) { g.flush(); } @@ -968,7 +968,7 @@ public void writeValue(JsonGenerator g, Object value) throw JacksonIOException.construct(e, g); } } else { - _prefetch.serialize(g, value, _serializerProvider()); + _prefetch.serialize(g, value, _serializationContext()); if (_config.isEnabled(SerializationFeature.FLUSH_AFTER_WRITE_VALUE)) { g.flush(); } @@ -989,7 +989,7 @@ public void writeValue(File target, Object value) throws JacksonException { _assertNotNull("target", target); - SerializationContextExt ctxt = _serializerProvider(); + SerializationContextExt ctxt = _serializationContext(); _configAndWriteValue(ctxt, _generatorFactory.createGenerator(ctxt, target, JsonEncoding.UTF8), value); } @@ -1004,7 +1004,7 @@ public void writeValue(Path target, Object value) throws JacksonException { _assertNotNull("target", target); - SerializationContextExt ctxt = _serializerProvider(); + SerializationContextExt ctxt = _serializationContext(); _configAndWriteValue(ctxt, _generatorFactory.createGenerator(ctxt, target, JsonEncoding.UTF8), value); } @@ -1023,7 +1023,7 @@ public void writeValue(Path target, Object value) public void writeValue(OutputStream target, Object value) throws JacksonException { _assertNotNull("target", target); - SerializationContextExt ctxt = _serializerProvider(); + SerializationContextExt ctxt = _serializationContext(); _configAndWriteValue(ctxt, _generatorFactory.createGenerator(ctxt, target, JsonEncoding.UTF8), value); } @@ -1041,7 +1041,7 @@ public void writeValue(OutputStream target, Object value) throws JacksonExceptio public void writeValue(Writer target, Object value) throws JacksonException { _assertNotNull("target", target); - SerializationContextExt ctxt = _serializerProvider(); + SerializationContextExt ctxt = _serializationContext(); _configAndWriteValue(ctxt, _generatorFactory.createGenerator(ctxt, target), value); } @@ -1049,7 +1049,7 @@ public void writeValue(Writer target, Object value) throws JacksonException public void writeValue(DataOutput target, Object value) throws JacksonException { _assertNotNull("target", target); - SerializationContextExt ctxt = _serializerProvider(); + SerializationContextExt ctxt = _serializationContext(); _configAndWriteValue(ctxt, _generatorFactory.createGenerator(ctxt, target), value); } @@ -1065,7 +1065,7 @@ public String writeValueAsString(Object value) throws JacksonException // alas, we have to pull the recycler directly here... final BufferRecycler br = _generatorFactory._getBufferRecycler(); try (SegmentedStringWriter sw = new SegmentedStringWriter(br)) { - final SerializationContextExt ctxt = _serializerProvider(); + final SerializationContextExt ctxt = _serializationContext(); _configAndWriteValue(ctxt, _generatorFactory.createGenerator(ctxt, sw), value); return sw.getAndClear(); @@ -1085,7 +1085,7 @@ public byte[] writeValueAsBytes(Object value) throws JacksonException { final BufferRecycler br = _generatorFactory._getBufferRecycler(); try (ByteArrayBuilder bb = new ByteArrayBuilder(br)) { - final SerializationContextExt ctxt = _serializerProvider(); + final SerializationContextExt ctxt = _serializationContext(); _configAndWriteValue(ctxt, _generatorFactory.createGenerator(ctxt, bb, JsonEncoding.UTF8), value); return bb.getClearAndRelease(); @@ -1123,7 +1123,7 @@ private final void _writeCloseable(JsonGenerator gen, Object value) { Closeable toClose = (Closeable) value; try { - _prefetch.serialize(gen, value, _serializerProvider()); + _prefetch.serialize(gen, value, _serializationContext()); Closeable tmpToClose = toClose; toClose = null; tmpToClose.close(); @@ -1170,7 +1170,7 @@ private final void _writeCloseable(JsonGenerator gen, Object value) public T valueToTree(Object fromValue) throws JacksonException { - return _serializerProvider().valueToTree(fromValue); + return _serializationContext().valueToTree(fromValue); } /* @@ -1193,7 +1193,7 @@ public void acceptJsonFormatVisitor(JavaType type, JsonFormatVisitorWrapper visi { _assertNotNull("type", type); _assertNotNull("visitor", visitor); - _serializerProvider().acceptJsonFormatVisitor(type, visitor); + _serializationContext().acceptJsonFormatVisitor(type, visitor); } public void acceptJsonFormatVisitor(Class type, JsonFormatVisitorWrapper visitor) @@ -1211,9 +1211,9 @@ public void acceptJsonFormatVisitor(Class type, JsonFormatVisitorWrapper visi /** * Overridable helper method used for constructing - * {@link SerializerProvider} to use for serialization. + * {@link SerializationContext} to use for serialization. */ - protected final SerializationContextExt _serializerProvider() { + protected final SerializationContextExt _serializationContext() { return _serializationContexts.createContext(_config, _generatorSettings); } @@ -1303,13 +1303,13 @@ public Prefetch forRootType(ObjectWriter parent, JavaType newType) { // But one more trick: `java.lang.Object` has no serialized, but may // have `TypeSerializer` to use if (newType.isJavaLangObject()) { - SerializationContextExt ctxt = parent._serializerProvider(); + SerializationContextExt ctxt = parent._serializationContext(); TypeSerializer typeSer = ctxt.findTypeSerializer(newType); return new Prefetch(null, null, typeSer); } if (parent.isEnabled(SerializationFeature.EAGER_SERIALIZER_FETCH)) { - SerializationContextExt ctxt = parent._serializerProvider(); + SerializationContextExt ctxt = parent._serializationContext(); // 17-Dec-2014, tatu: Need to be bit careful here; TypeSerializers are NOT cached, // so although it'd seem like a good idea to look for those first, and avoid // serializer for polymorphic types, it is actually more efficient to do the diff --git a/src/main/java/tools/jackson/databind/SerializationConfig.java b/src/main/java/tools/jackson/databind/SerializationConfig.java index 744ac7cf80..2a3a3f6007 100644 --- a/src/main/java/tools/jackson/databind/SerializationConfig.java +++ b/src/main/java/tools/jackson/databind/SerializationConfig.java @@ -17,7 +17,7 @@ * Object that contains baseline configuration for serialization * process. An instance is owned by {@link ObjectMapper}, which * passes an immutable instance for serialization process to - * {@link SerializerProvider} and {@link SerializerFactory} + * {@link SerializationContext} and {@link SerializerFactory} * (either directly, or through {@link ObjectWriter}. *

* Note that instances are considered immutable and as such no copies diff --git a/src/main/java/tools/jackson/databind/SerializerProvider.java b/src/main/java/tools/jackson/databind/SerializationContext.java similarity index 99% rename from src/main/java/tools/jackson/databind/SerializerProvider.java rename to src/main/java/tools/jackson/databind/SerializationContext.java index 86eba1698f..047f857138 100644 --- a/src/main/java/tools/jackson/databind/SerializerProvider.java +++ b/src/main/java/tools/jackson/databind/SerializationContext.java @@ -45,7 +45,7 @@ * details are delegated to {@link SerializerFactory} instance. *

*/ -public abstract class SerializerProvider +public abstract class SerializationContext extends DatabindContext implements // NOTE: not JDK serializable with 3.x (factory that creates these is) ObjectWriteContext // 3.0, for use by jackson-core @@ -172,7 +172,7 @@ public abstract class SerializerProvider /********************************************************************** */ - protected SerializerProvider(TokenStreamFactory streamFactory, + protected SerializationContext(TokenStreamFactory streamFactory, SerializationConfig config, GeneratorSettings generatorConfig, SerializerFactory f, SerializerCache cache) { @@ -203,7 +203,7 @@ protected SerializerProvider(TokenStreamFactory streamFactory, _knownSerializers = _serializerCache.getReadOnlyLookupMap(); } - protected SerializerProvider(SerializerProvider src, SerializerCache serializerCache) + protected SerializationContext(SerializationContext src, SerializerCache serializerCache) { _streamFactory = src._streamFactory; _serializerFactory = src._serializerFactory; @@ -449,7 +449,7 @@ public Object getAttribute(Object key) { } @Override - public SerializerProvider setAttribute(Object key, Object value) + public SerializationContext setAttribute(Object key, Object value) { _attributes = _attributes.withPerCallAttribute(key, value); return this; @@ -1088,7 +1088,7 @@ public abstract Object includeFilterInstance(BeanPropertyDefinition forProperty, * Method called for primary property serializers (ones * directly created to serialize values of a POJO property), * to handle details of contextualization, calling - * {@link ValueSerializer#createContextual(SerializerProvider, BeanProperty)} with given property context. + * {@link ValueSerializer#createContextual(SerializationContext, BeanProperty)} with given property context. * * @param property Property for which the given primary serializer is used; never null. */ @@ -1108,7 +1108,7 @@ public ValueSerializer handlePrimaryContextualization(ValueSerializer * but instead created as a dependant serializer -- such as value serializers * for structured types, or serializers for root values) * to handle details of contextualization, calling - * {@link ValueSerializer#createContextual(SerializerProvider, BeanProperty)} with given property context. + * {@link ValueSerializer#createContextual(SerializationContext, BeanProperty)} with given property context. * Given that these serializers are not directly related to given property * (or, in case of root value property, to any property), annotations * accessible may or may not be relevant. diff --git a/src/main/java/tools/jackson/databind/ValueSerializer.java b/src/main/java/tools/jackson/databind/ValueSerializer.java index a69571c3a1..d8da94532b 100644 --- a/src/main/java/tools/jackson/databind/ValueSerializer.java +++ b/src/main/java/tools/jackson/databind/ValueSerializer.java @@ -45,7 +45,7 @@ *

* NOTE: various serialize methods are never (to be) called * with null values -- caller must handle null values, usually - * by calling {@link SerializerProvider#findNullValueSerializer} to obtain + * by calling {@link SerializationContext#findNullValueSerializer} to obtain * serializer to use. * This also means that custom serializers cannot be directly used to change * the output to produce when serializing null values. @@ -63,7 +63,7 @@ public abstract class ValueSerializer */ /** - * Method called after {@link SerializerProvider} has registered + * Method called after {@link SerializationContext} has registered * the serializer, but before it has returned it to the caller. * Called object can then resolve its dependencies to other types, * including self-references (direct or indirect). @@ -74,7 +74,7 @@ public abstract class ValueSerializer * @param provider Provider that has constructed serializer this method * is called on. */ - public void resolve(SerializerProvider provider) { + public void resolve(SerializationContext provider) { // Default implementation does nothing } @@ -101,7 +101,7 @@ public void resolve(SerializerProvider provider) { * @return Serializer to use for serializing values of specified property; * may be this instance or a new instance. */ - public ValueSerializer createContextual(SerializerProvider prov, + public ValueSerializer createContextual(SerializationContext prov, BeanProperty property) { // default implementation returns instance unmodified return this; @@ -219,7 +219,7 @@ public ValueSerializer withFormatOverrides(SerializationConfig config, * @param serializers Provider that can be used to get serializers for * serializing Objects value contains, if any. */ - public abstract void serialize(T value, JsonGenerator gen, SerializerProvider serializers) + public abstract void serialize(T value, JsonGenerator gen, SerializationContext serializers) throws JacksonException; /** @@ -249,7 +249,7 @@ public abstract void serialize(T value, JsonGenerator gen, SerializerProvider se * serializing Objects value contains, if any. * @param typeSer Type serializer to use for including type information */ - public void serializeWithType(T value, JsonGenerator gen, SerializerProvider serializers, + public void serializeWithType(T value, JsonGenerator gen, SerializationContext serializers, TypeSerializer typeSer) throws JacksonException { @@ -334,7 +334,7 @@ public Iterator properties() { *

* Default implementation will consider only null values to be empty. */ - public boolean isEmpty(SerializerProvider provider, T value) { + public boolean isEmpty(SerializationContext provider, T value) { return (value == null); } diff --git a/src/main/java/tools/jackson/databind/cfg/MapperBuilder.java b/src/main/java/tools/jackson/databind/cfg/MapperBuilder.java index 86264f4b2b..06d812fd04 100644 --- a/src/main/java/tools/jackson/databind/cfg/MapperBuilder.java +++ b/src/main/java/tools/jackson/databind/cfg/MapperBuilder.java @@ -145,7 +145,7 @@ public abstract class MapperBuilder baseType, *

* This method is usually only called by framework itself, since there * are convenience methods available via - * {@link DeserializationContext} and {@link SerializerProvider} that + * {@link DeserializationContext} and {@link SerializationContext} that * take care of cloning and thread-safe reuse. */ public final DateFormat getDateFormat() { return _base.getDateFormat(); } diff --git a/src/main/java/tools/jackson/databind/cfg/SerializationContexts.java b/src/main/java/tools/jackson/databind/cfg/SerializationContexts.java index 26a965f126..280171076b 100644 --- a/src/main/java/tools/jackson/databind/cfg/SerializationContexts.java +++ b/src/main/java/tools/jackson/databind/cfg/SerializationContexts.java @@ -9,13 +9,13 @@ /** * Factory/builder class that replaces Jackson 2.x concept of "blueprint" instance - * of {@link tools.jackson.databind.SerializerProvider}. It will be constructed and configured during + * of {@link tools.jackson.databind.SerializationContext}. It will be constructed and configured during * {@link ObjectMapper} building phase, and will be called once per {@code writeValue} - * call to construct actual stateful {@link tools.jackson.databind.SerializerProvider} to use during + * call to construct actual stateful {@link tools.jackson.databind.SerializationContext} to use during * serialization. *

* Note that since this object has to be serializable (to allow JDK serialization of - * mapper instances), {@link tools.jackson.databind.SerializerProvider} need not be serializable any more. + * mapper instances), {@link tools.jackson.databind.SerializationContext} need not be serializable any more. * * @since 3.0 */ diff --git a/src/main/java/tools/jackson/databind/deser/SettableBeanProperty.java b/src/main/java/tools/jackson/databind/deser/SettableBeanProperty.java index fc8371401d..0973bbd3fd 100644 --- a/src/main/java/tools/jackson/databind/deser/SettableBeanProperty.java +++ b/src/main/java/tools/jackson/databind/deser/SettableBeanProperty.java @@ -387,7 +387,7 @@ public A getContextAnnotation(Class acls) { @Override public void depositSchemaProperty(JsonObjectFormatVisitor objectVisitor, - SerializerProvider provider) + SerializationContext provider) { if (isRequired()) { objectVisitor.property(this); diff --git a/src/main/java/tools/jackson/databind/deser/impl/ObjectIdReader.java b/src/main/java/tools/jackson/databind/deser/impl/ObjectIdReader.java index fdeda88ab2..5cbd85abbc 100644 --- a/src/main/java/tools/jackson/databind/deser/impl/ObjectIdReader.java +++ b/src/main/java/tools/jackson/databind/deser/impl/ObjectIdReader.java @@ -22,7 +22,7 @@ public class ObjectIdReader /** * Blueprint generator instance: actual instance will be - * fetched from {@link SerializerProvider} using this as + * fetched from {@link SerializationContext} using this as * the key. */ public final ObjectIdGenerator generator; diff --git a/src/main/java/tools/jackson/databind/ext/DOMSerializer.java b/src/main/java/tools/jackson/databind/ext/DOMSerializer.java index 4672fb2dc2..90349063b9 100644 --- a/src/main/java/tools/jackson/databind/ext/DOMSerializer.java +++ b/src/main/java/tools/jackson/databind/ext/DOMSerializer.java @@ -10,7 +10,7 @@ import tools.jackson.core.*; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper; import tools.jackson.databind.ser.std.StdSerializer; @@ -32,7 +32,7 @@ public DOMSerializer() { } @Override - public void serialize(Node value, JsonGenerator g, SerializerProvider provider) + public void serialize(Node value, JsonGenerator g, SerializationContext provider) throws JacksonException { try { diff --git a/src/main/java/tools/jackson/databind/ext/XMLGregorianCalendarSerializer.java b/src/main/java/tools/jackson/databind/ext/XMLGregorianCalendarSerializer.java index ac8427f2d4..c960db4bfa 100644 --- a/src/main/java/tools/jackson/databind/ext/XMLGregorianCalendarSerializer.java +++ b/src/main/java/tools/jackson/databind/ext/XMLGregorianCalendarSerializer.java @@ -10,7 +10,7 @@ import tools.jackson.core.type.WritableTypeId; import tools.jackson.databind.BeanProperty; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.ValueSerializer; import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper; import tools.jackson.databind.jsontype.TypeSerializer; @@ -40,19 +40,19 @@ public ValueSerializer getDelegatee() { } @Override - public boolean isEmpty(SerializerProvider provider, XMLGregorianCalendar value) { + public boolean isEmpty(SerializationContext provider, XMLGregorianCalendar value) { return _delegate.isEmpty(provider, _convert(value)); } @Override - public void serialize(XMLGregorianCalendar value, JsonGenerator gen, SerializerProvider provider) + public void serialize(XMLGregorianCalendar value, JsonGenerator gen, SerializationContext provider) throws JacksonException { _delegate.serialize(_convert(value), gen, provider); } @Override - public void serializeWithType(XMLGregorianCalendar value, JsonGenerator g, SerializerProvider ctxt, + public void serializeWithType(XMLGregorianCalendar value, JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { // 16-Aug-2021, tatu: as per [databind#3217] we cannot simply delegate @@ -75,7 +75,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t } @Override - public ValueSerializer createContextual(SerializerProvider ctxt, BeanProperty property) + public ValueSerializer createContextual(SerializationContext ctxt, BeanProperty property) { ValueSerializer ser = ctxt.handlePrimaryContextualization(_delegate, property); if (ser != _delegate) { diff --git a/src/main/java/tools/jackson/databind/ext/jdk8/DoubleStreamSerializer.java b/src/main/java/tools/jackson/databind/ext/jdk8/DoubleStreamSerializer.java index eb167d40e5..29fedaf255 100644 --- a/src/main/java/tools/jackson/databind/ext/jdk8/DoubleStreamSerializer.java +++ b/src/main/java/tools/jackson/databind/ext/jdk8/DoubleStreamSerializer.java @@ -4,7 +4,7 @@ import tools.jackson.core.JacksonException; import tools.jackson.core.JsonGenerator; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.ser.std.StdSerializer; /** @@ -26,7 +26,7 @@ private DoubleStreamSerializer() { } @Override - public void serialize(DoubleStream stream, JsonGenerator g, SerializerProvider ctxt) + public void serialize(DoubleStream stream, JsonGenerator g, SerializationContext ctxt) throws JacksonException { try (final DoubleStream ds = stream) { diff --git a/src/main/java/tools/jackson/databind/ext/jdk8/IntStreamSerializer.java b/src/main/java/tools/jackson/databind/ext/jdk8/IntStreamSerializer.java index af7e50c198..c317ed92a8 100644 --- a/src/main/java/tools/jackson/databind/ext/jdk8/IntStreamSerializer.java +++ b/src/main/java/tools/jackson/databind/ext/jdk8/IntStreamSerializer.java @@ -4,7 +4,7 @@ import tools.jackson.core.JacksonException; import tools.jackson.core.JsonGenerator; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.ser.std.StdSerializer; /** @@ -28,7 +28,7 @@ private IntStreamSerializer() { } @Override - public void serialize(IntStream stream, JsonGenerator g, SerializerProvider ctxt) + public void serialize(IntStream stream, JsonGenerator g, SerializationContext ctxt) throws JacksonException { try (IntStream is = stream) { diff --git a/src/main/java/tools/jackson/databind/ext/jdk8/Jdk8StreamSerializer.java b/src/main/java/tools/jackson/databind/ext/jdk8/Jdk8StreamSerializer.java index e37204439f..27eec39fbd 100644 --- a/src/main/java/tools/jackson/databind/ext/jdk8/Jdk8StreamSerializer.java +++ b/src/main/java/tools/jackson/databind/ext/jdk8/Jdk8StreamSerializer.java @@ -47,7 +47,7 @@ public Jdk8StreamSerializer(JavaType streamType, JavaType elemType, ValueSeriali } @Override - public ValueSerializer createContextual(SerializerProvider provider, BeanProperty property) + public ValueSerializer createContextual(SerializationContext provider, BeanProperty property) { if (!elemType.hasRawClass(Object.class) && (provider.isEnabled(MapperFeature.USE_STATIC_TYPING) || elemType.isFinal())) { @@ -60,7 +60,7 @@ public ValueSerializer createContextual(SerializerProvider provider, BeanProp } @Override - public void serialize(Stream stream, JsonGenerator g, SerializerProvider ctxt) + public void serialize(Stream stream, JsonGenerator g, SerializationContext ctxt) throws JacksonException { try (Stream s = stream) { diff --git a/src/main/java/tools/jackson/databind/ext/jdk8/LongStreamSerializer.java b/src/main/java/tools/jackson/databind/ext/jdk8/LongStreamSerializer.java index c07587f6da..510d1b478b 100644 --- a/src/main/java/tools/jackson/databind/ext/jdk8/LongStreamSerializer.java +++ b/src/main/java/tools/jackson/databind/ext/jdk8/LongStreamSerializer.java @@ -4,7 +4,7 @@ import tools.jackson.core.JacksonException; import tools.jackson.core.JsonGenerator; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.ser.std.StdSerializer; /** @@ -25,7 +25,7 @@ private LongStreamSerializer() { } @Override - public void serialize(LongStream stream, JsonGenerator g, SerializerProvider ctxt) + public void serialize(LongStream stream, JsonGenerator g, SerializationContext ctxt) throws JacksonException { try (LongStream ls = stream) { diff --git a/src/main/java/tools/jackson/databind/ext/jdk8/OptionalDoubleSerializer.java b/src/main/java/tools/jackson/databind/ext/jdk8/OptionalDoubleSerializer.java index 8906c4c01d..d711d24ff0 100644 --- a/src/main/java/tools/jackson/databind/ext/jdk8/OptionalDoubleSerializer.java +++ b/src/main/java/tools/jackson/databind/ext/jdk8/OptionalDoubleSerializer.java @@ -6,7 +6,7 @@ import tools.jackson.core.JsonGenerator; import tools.jackson.core.JsonParser; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper; import tools.jackson.databind.jsonFormatVisitors.JsonNumberFormatVisitor; import tools.jackson.databind.ser.std.StdScalarSerializer; @@ -20,7 +20,7 @@ public OptionalDoubleSerializer() { } @Override - public boolean isEmpty(SerializerProvider provider, OptionalDouble value) { + public boolean isEmpty(SerializationContext provider, OptionalDouble value) { return (value == null) || !value.isPresent(); } @@ -35,7 +35,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, } @Override - public void serialize(OptionalDouble value, JsonGenerator gen, SerializerProvider provider) + public void serialize(OptionalDouble value, JsonGenerator gen, SerializationContext provider) throws JacksonException { if (value.isPresent()) { diff --git a/src/main/java/tools/jackson/databind/ext/jdk8/OptionalIntSerializer.java b/src/main/java/tools/jackson/databind/ext/jdk8/OptionalIntSerializer.java index 2e3666e8b3..a00e1a5001 100644 --- a/src/main/java/tools/jackson/databind/ext/jdk8/OptionalIntSerializer.java +++ b/src/main/java/tools/jackson/databind/ext/jdk8/OptionalIntSerializer.java @@ -6,7 +6,7 @@ import tools.jackson.core.JsonGenerator; import tools.jackson.core.JsonParser; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper; import tools.jackson.databind.jsonFormatVisitors.JsonIntegerFormatVisitor; import tools.jackson.databind.ser.std.StdScalarSerializer; @@ -18,7 +18,7 @@ public OptionalIntSerializer() { } @Override - public boolean isEmpty(SerializerProvider provider, OptionalInt value) { + public boolean isEmpty(SerializationContext provider, OptionalInt value) { return (value == null) || !value.isPresent(); } @@ -34,7 +34,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, } @Override - public void serialize(OptionalInt value, JsonGenerator gen, SerializerProvider provider) + public void serialize(OptionalInt value, JsonGenerator gen, SerializationContext provider) throws JacksonException { if (value.isPresent()) { diff --git a/src/main/java/tools/jackson/databind/ext/jdk8/OptionalLongSerializer.java b/src/main/java/tools/jackson/databind/ext/jdk8/OptionalLongSerializer.java index eebfa47c83..db80d23ddc 100644 --- a/src/main/java/tools/jackson/databind/ext/jdk8/OptionalLongSerializer.java +++ b/src/main/java/tools/jackson/databind/ext/jdk8/OptionalLongSerializer.java @@ -6,7 +6,7 @@ import tools.jackson.core.JsonGenerator; import tools.jackson.core.JsonParser; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper; import tools.jackson.databind.jsonFormatVisitors.JsonIntegerFormatVisitor; import tools.jackson.databind.ser.std.StdScalarSerializer; @@ -20,7 +20,7 @@ public OptionalLongSerializer() { } @Override - public boolean isEmpty(SerializerProvider provider, OptionalLong value) { + public boolean isEmpty(SerializationContext provider, OptionalLong value) { return (value == null) || !value.isPresent(); } @@ -36,7 +36,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, } @Override - public void serialize(OptionalLong value, JsonGenerator jgen, SerializerProvider provider) + public void serialize(OptionalLong value, JsonGenerator jgen, SerializationContext provider) throws JacksonException { if (value.isPresent()) { diff --git a/src/main/java/tools/jackson/databind/ext/sql/JavaSqlBlobSerializer.java b/src/main/java/tools/jackson/databind/ext/sql/JavaSqlBlobSerializer.java index e3d5a93bf0..db39394369 100644 --- a/src/main/java/tools/jackson/databind/ext/sql/JavaSqlBlobSerializer.java +++ b/src/main/java/tools/jackson/databind/ext/sql/JavaSqlBlobSerializer.java @@ -32,20 +32,20 @@ public JavaSqlBlobSerializer() { } @Override - public boolean isEmpty(SerializerProvider provider, Blob value) { + public boolean isEmpty(SerializationContext provider, Blob value) { // Could see if "length == 0" but that might be expensive operation return (value == null); } @Override - public void serialize(Blob value, JsonGenerator gen, SerializerProvider ctxt) + public void serialize(Blob value, JsonGenerator gen, SerializationContext ctxt) throws JacksonException { _writeValue(value, gen, ctxt); } // Copied from {@code tools.jackson.databind.ser.std.ByteArraySerializer} @Override - public void serializeWithType(Blob value, JsonGenerator gen, SerializerProvider ctxt, + public void serializeWithType(Blob value, JsonGenerator gen, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { @@ -56,7 +56,7 @@ public void serializeWithType(Blob value, JsonGenerator gen, SerializerProvider typeSer.writeTypeSuffix(gen, ctxt, typeIdDef); } - protected void _writeValue(Blob value, JsonGenerator gen, SerializerProvider ctxt) + protected void _writeValue(Blob value, JsonGenerator gen, SerializationContext ctxt) throws JacksonException { InputStream in = null; diff --git a/src/main/java/tools/jackson/databind/ext/sql/JavaSqlDateSerializer.java b/src/main/java/tools/jackson/databind/ext/sql/JavaSqlDateSerializer.java index 806c6c13c9..7fcede569d 100644 --- a/src/main/java/tools/jackson/databind/ext/sql/JavaSqlDateSerializer.java +++ b/src/main/java/tools/jackson/databind/ext/sql/JavaSqlDateSerializer.java @@ -39,7 +39,7 @@ protected long _timestamp(java.sql.Date value) { } @Override - public void serialize(java.sql.Date value, JsonGenerator g, SerializerProvider provider) + public void serialize(java.sql.Date value, JsonGenerator g, SerializationContext provider) throws JacksonException { if (_asTimestamp(provider)) { diff --git a/src/main/java/tools/jackson/databind/ext/sql/JavaSqlTimeSerializer.java b/src/main/java/tools/jackson/databind/ext/sql/JavaSqlTimeSerializer.java index 93a3e4a008..dceb9ec8a0 100644 --- a/src/main/java/tools/jackson/databind/ext/sql/JavaSqlTimeSerializer.java +++ b/src/main/java/tools/jackson/databind/ext/sql/JavaSqlTimeSerializer.java @@ -19,7 +19,7 @@ public class JavaSqlTimeSerializer public JavaSqlTimeSerializer() { super(java.sql.Time.class); } @Override - public void serialize(java.sql.Time value, JsonGenerator g, SerializerProvider provider) + public void serialize(java.sql.Time value, JsonGenerator g, SerializationContext provider) throws JacksonException { g.writeString(value.toString()); diff --git a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor.java b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor.java index 24b3502ac1..6c6bb24d0f 100644 --- a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor.java +++ b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor.java @@ -1,9 +1,9 @@ package tools.jackson.databind.jsonFormatVisitors; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; -public interface JsonArrayFormatVisitor extends JsonFormatVisitorWithSerializerProvider +public interface JsonArrayFormatVisitor extends JsonFormatVisitorWithSerializationContext { /** * Visit method called for structured types, as well as possibly @@ -28,16 +28,16 @@ public interface JsonArrayFormatVisitor extends JsonFormatVisitorWithSerializerP * of the interface, even if new methods are getting added. */ public static class Base implements JsonArrayFormatVisitor { - protected SerializerProvider _provider; + protected SerializationContext _provider; public Base() { } - public Base(SerializerProvider p) { _provider = p; } + public Base(SerializationContext p) { _provider = p; } @Override - public SerializerProvider getProvider() { return _provider; } + public SerializationContext getProvider() { return _provider; } @Override - public void setProvider(SerializerProvider p) { _provider = p; } + public void setProvider(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 new file mode 100644 index 0000000000..7b8d7c8324 --- /dev/null +++ b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWithSerializationContext.java @@ -0,0 +1,14 @@ +/** + * + */ +package tools.jackson.databind.jsonFormatVisitors; + +import tools.jackson.databind.SerializationContext; + +/** + * @author jphelan + */ +public interface JsonFormatVisitorWithSerializationContext { + public SerializationContext getProvider(); + public abstract void setProvider(SerializationContext provider); +} diff --git a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWithSerializerProvider.java b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWithSerializerProvider.java deleted file mode 100644 index 675d1f0329..0000000000 --- a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWithSerializerProvider.java +++ /dev/null @@ -1,14 +0,0 @@ -/** - * - */ -package tools.jackson.databind.jsonFormatVisitors; - -import tools.jackson.databind.SerializerProvider; - -/** - * @author jphelan - */ -public interface JsonFormatVisitorWithSerializerProvider { - public SerializerProvider getProvider(); - public abstract void setProvider(SerializerProvider provider); -} diff --git a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper.java b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper.java index 6b53c14948..eea78bacae 100644 --- a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper.java +++ b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper.java @@ -1,7 +1,7 @@ package tools.jackson.databind.jsonFormatVisitors; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; /** * Interface for visitor callbacks, when type in question can be any of @@ -10,7 +10,7 @@ * In most cases it will make more sense to extend {@link JsonFormatVisitorWrapper.Base} * instead of directly implementing this interface. */ -public interface JsonFormatVisitorWrapper extends JsonFormatVisitorWithSerializerProvider +public interface JsonFormatVisitorWrapper extends JsonFormatVisitorWithSerializationContext { /** * @param type Declared type of visited property (or List element) in Java @@ -62,28 +62,28 @@ public interface JsonFormatVisitorWrapper extends JsonFormatVisitorWithSerialize /** * Empty "no-op" implementation of {@link JsonFormatVisitorWrapper}, suitable for - * sub-classing. Does implement {@link #setProvider(SerializerProvider)} and + * sub-classing. Does implement {@link #setProvider(SerializationContext)} and * {@link #getProvider()} as expected; other methods simply return null * and do nothing. * * @since 2.5 */ public static class Base implements JsonFormatVisitorWrapper { - protected SerializerProvider _provider; + protected SerializationContext _provider; public Base() { } - public Base(SerializerProvider p) { + public Base(SerializationContext p) { _provider = p; } @Override - public SerializerProvider getProvider() { + public SerializationContext getProvider() { return _provider; } @Override - public void setProvider(SerializerProvider p) { + public void setProvider(SerializationContext p) { _provider = p; } diff --git a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonMapFormatVisitor.java b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonMapFormatVisitor.java index d08e967e03..e6bf04a5be 100644 --- a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonMapFormatVisitor.java +++ b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonMapFormatVisitor.java @@ -1,9 +1,9 @@ package tools.jackson.databind.jsonFormatVisitors; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; -public interface JsonMapFormatVisitor extends JsonFormatVisitorWithSerializerProvider +public interface JsonMapFormatVisitor extends JsonFormatVisitorWithSerializationContext { /** * Visit method called to indicate type of keys of the Map type @@ -25,16 +25,16 @@ public interface JsonMapFormatVisitor extends JsonFormatVisitorWithSerializerPro public static class Base implements JsonMapFormatVisitor { - protected SerializerProvider _provider; + protected SerializationContext _provider; public Base() { } - public Base(SerializerProvider p) { _provider = p; } + public Base(SerializationContext p) { _provider = p; } @Override - public SerializerProvider getProvider() { return _provider; } + public SerializationContext getProvider() { return _provider; } @Override - public void setProvider(SerializerProvider p) { _provider = p; } + public void setProvider(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 19916c7de1..b8df35d9ef 100644 --- a/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonObjectFormatVisitor.java +++ b/src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonObjectFormatVisitor.java @@ -2,14 +2,14 @@ import tools.jackson.databind.BeanProperty; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; /** * Visitor called when properties of a type that maps to JSON Object * are being visited: this usually means POJOs, but sometimes other * types use it too (like {@link java.util.EnumMap}). */ -public interface JsonObjectFormatVisitor extends JsonFormatVisitorWithSerializerProvider +public interface JsonObjectFormatVisitor extends JsonFormatVisitorWithSerializationContext { /** * Callback method called when a POJO property is being traversed. @@ -35,16 +35,16 @@ public void optionalProperty(String name, JsonFormatVisitable handler, public static class Base implements JsonObjectFormatVisitor { - protected SerializerProvider _provider; + protected SerializationContext _provider; public Base() { } - public Base(SerializerProvider p) { _provider = p; } + public Base(SerializationContext p) { _provider = p; } @Override - public SerializerProvider getProvider() { return _provider; } + public SerializationContext getProvider() { return _provider; } @Override - public void setProvider(SerializerProvider p) { _provider = p; } + public void setProvider(SerializationContext p) { _provider = p; } @Override public void property(BeanProperty prop) { } diff --git a/src/main/java/tools/jackson/databind/jsontype/TypeResolverBuilder.java b/src/main/java/tools/jackson/databind/jsontype/TypeResolverBuilder.java index a8dfbcd230..cfdaf6839f 100644 --- a/src/main/java/tools/jackson/databind/jsontype/TypeResolverBuilder.java +++ b/src/main/java/tools/jackson/databind/jsontype/TypeResolverBuilder.java @@ -62,7 +62,7 @@ public interface TypeResolverBuilder> * @param baseType Base type that constructed resolver will * handle; super type of all types it will be used for. */ - public TypeSerializer buildTypeSerializer(SerializerProvider ctxt, + public TypeSerializer buildTypeSerializer(SerializationContext ctxt, JavaType baseType, Collection subtypes); /** diff --git a/src/main/java/tools/jackson/databind/jsontype/TypeResolverProvider.java b/src/main/java/tools/jackson/databind/jsontype/TypeResolverProvider.java index a48a6f1b3e..169deaa47b 100644 --- a/src/main/java/tools/jackson/databind/jsontype/TypeResolverProvider.java +++ b/src/main/java/tools/jackson/databind/jsontype/TypeResolverProvider.java @@ -47,7 +47,7 @@ public class TypeResolverProvider * * @return Type resolver builder for given type, if one found; null if none */ - public TypeSerializer findTypeSerializer(SerializerProvider ctxt, + public TypeSerializer findTypeSerializer(SerializationContext ctxt, JavaType baseType, AnnotatedClass classInfo) { final SerializationConfig config = ctxt.getConfig(); @@ -100,7 +100,7 @@ public TypeDeserializer findTypeDeserializer(DeserializationContext ctxt, /********************************************************************** */ - public TypeSerializer findPropertyTypeSerializer(SerializerProvider ctxt, + public TypeSerializer findPropertyTypeSerializer(SerializationContext ctxt, AnnotatedMember accessor, JavaType baseType) { TypeResolverBuilder b = null; @@ -146,7 +146,7 @@ public TypeDeserializer findPropertyTypeDeserializer(DeserializationContext ctxt return b.buildTypeDeserializer(ctxt, baseType, subtypes); } - public TypeSerializer findPropertyContentTypeSerializer(SerializerProvider ctxt, + public TypeSerializer findPropertyContentTypeSerializer(SerializationContext ctxt, AnnotatedMember accessor, JavaType containerType) { final JavaType contentType = containerType.getContentType(); diff --git a/src/main/java/tools/jackson/databind/jsontype/TypeSerializer.java b/src/main/java/tools/jackson/databind/jsontype/TypeSerializer.java index 12d329dac4..7974b55962 100644 --- a/src/main/java/tools/jackson/databind/jsontype/TypeSerializer.java +++ b/src/main/java/tools/jackson/databind/jsontype/TypeSerializer.java @@ -6,7 +6,7 @@ import tools.jackson.core.type.WritableTypeId; import tools.jackson.core.util.VersionUtil; import tools.jackson.databind.BeanProperty; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; /** * Interface for serializing type information regarding instances of specified @@ -33,7 +33,7 @@ public abstract class TypeSerializer *

* NOTE: since 3.0 has received context object as first argument. */ - public abstract TypeSerializer forProperty(SerializerProvider ctxt, + public abstract TypeSerializer forProperty(SerializationContext ctxt, BeanProperty prop); /* @@ -124,7 +124,7 @@ public WritableTypeId typeId(Object value, Class typeForId, * @param typeId Details of what type id is to be written, how. */ public abstract WritableTypeId writeTypePrefix(JsonGenerator g, - SerializerProvider ctxt, WritableTypeId typeId) throws JacksonException; + SerializationContext ctxt, WritableTypeId typeId) throws JacksonException; /** * Method called to write the "closing" part of type information for given @@ -136,5 +136,5 @@ public abstract WritableTypeId writeTypePrefix(JsonGenerator g, * @param typeId Details of what type id is to be written, how. */ public abstract WritableTypeId writeTypeSuffix(JsonGenerator g, - SerializerProvider ctxt, WritableTypeId typeId) throws JacksonException; + SerializationContext ctxt, WritableTypeId typeId) throws JacksonException; } diff --git a/src/main/java/tools/jackson/databind/jsontype/impl/AsArrayTypeSerializer.java b/src/main/java/tools/jackson/databind/jsontype/impl/AsArrayTypeSerializer.java index f93a52b88e..fecb064c45 100644 --- a/src/main/java/tools/jackson/databind/jsontype/impl/AsArrayTypeSerializer.java +++ b/src/main/java/tools/jackson/databind/jsontype/impl/AsArrayTypeSerializer.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo.As; import tools.jackson.databind.BeanProperty; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsontype.TypeIdResolver; /** @@ -17,7 +17,7 @@ public AsArrayTypeSerializer(TypeIdResolver idRes, BeanProperty property) { } @Override - public AsArrayTypeSerializer forProperty(SerializerProvider ctxt, + public AsArrayTypeSerializer forProperty(SerializationContext ctxt, BeanProperty prop) { return (_property == prop) ? this : new AsArrayTypeSerializer(_idResolver, prop); } diff --git a/src/main/java/tools/jackson/databind/jsontype/impl/AsDeductionTypeSerializer.java b/src/main/java/tools/jackson/databind/jsontype/impl/AsDeductionTypeSerializer.java index a3af7ab9c9..840e4b260b 100644 --- a/src/main/java/tools/jackson/databind/jsontype/impl/AsDeductionTypeSerializer.java +++ b/src/main/java/tools/jackson/databind/jsontype/impl/AsDeductionTypeSerializer.java @@ -7,7 +7,7 @@ import tools.jackson.core.JsonToken; import tools.jackson.core.type.WritableTypeId; import tools.jackson.databind.BeanProperty; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsontype.TypeSerializer; public class AsDeductionTypeSerializer extends TypeSerializerBase @@ -23,7 +23,7 @@ public static AsDeductionTypeSerializer instance() { } @Override - public TypeSerializer forProperty(SerializerProvider ctxt, BeanProperty prop) { + public TypeSerializer forProperty(SerializationContext ctxt, BeanProperty prop) { return this; } @@ -32,7 +32,7 @@ public TypeSerializer forProperty(SerializerProvider ctxt, BeanProperty prop) { public As getTypeInclusion() { return As.EXISTING_PROPERTY; } @Override - public WritableTypeId writeTypePrefix(JsonGenerator g, SerializerProvider ctxt, + public WritableTypeId writeTypePrefix(JsonGenerator g, SerializationContext ctxt, WritableTypeId idMetadata) throws JacksonException { // NOTE: We can NOT simply skip writing since we may have to @@ -58,7 +58,7 @@ public WritableTypeId writeTypePrefix(JsonGenerator g, SerializerProvider ctxt, } @Override - public WritableTypeId writeTypeSuffix(JsonGenerator g, SerializerProvider ctxt, + public WritableTypeId writeTypeSuffix(JsonGenerator g, SerializationContext ctxt, WritableTypeId idMetadata) throws JacksonException { return (idMetadata == null) ? null diff --git a/src/main/java/tools/jackson/databind/jsontype/impl/AsExistingPropertyTypeSerializer.java b/src/main/java/tools/jackson/databind/jsontype/impl/AsExistingPropertyTypeSerializer.java index ca8678774d..98e95716b3 100644 --- a/src/main/java/tools/jackson/databind/jsontype/impl/AsExistingPropertyTypeSerializer.java +++ b/src/main/java/tools/jackson/databind/jsontype/impl/AsExistingPropertyTypeSerializer.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo.As; import tools.jackson.databind.BeanProperty; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsontype.TypeIdResolver; /** @@ -24,7 +24,7 @@ public AsExistingPropertyTypeSerializer(TypeIdResolver idRes, } @Override - public AsExistingPropertyTypeSerializer forProperty(SerializerProvider ctxt, + public AsExistingPropertyTypeSerializer forProperty(SerializationContext ctxt, BeanProperty prop) { return (_property == prop) ? this : new AsExistingPropertyTypeSerializer(_idResolver, prop, _typePropertyName); diff --git a/src/main/java/tools/jackson/databind/jsontype/impl/AsExternalTypeSerializer.java b/src/main/java/tools/jackson/databind/jsontype/impl/AsExternalTypeSerializer.java index ef60e2518e..0c53fb1d40 100644 --- a/src/main/java/tools/jackson/databind/jsontype/impl/AsExternalTypeSerializer.java +++ b/src/main/java/tools/jackson/databind/jsontype/impl/AsExternalTypeSerializer.java @@ -4,7 +4,7 @@ import tools.jackson.core.*; import tools.jackson.databind.BeanProperty; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsontype.TypeIdResolver; /** @@ -31,7 +31,7 @@ public AsExternalTypeSerializer(TypeIdResolver idRes, BeanProperty property, Str } @Override - public AsExternalTypeSerializer forProperty(SerializerProvider ctxt, + public AsExternalTypeSerializer forProperty(SerializationContext ctxt, BeanProperty prop) { return (_property == prop) ? this : new AsExternalTypeSerializer(_idResolver, prop, _typePropertyName); } diff --git a/src/main/java/tools/jackson/databind/jsontype/impl/AsPropertyTypeSerializer.java b/src/main/java/tools/jackson/databind/jsontype/impl/AsPropertyTypeSerializer.java index a507f6d013..07714773b4 100644 --- a/src/main/java/tools/jackson/databind/jsontype/impl/AsPropertyTypeSerializer.java +++ b/src/main/java/tools/jackson/databind/jsontype/impl/AsPropertyTypeSerializer.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo.As; import tools.jackson.databind.BeanProperty; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsontype.TypeIdResolver; /** @@ -25,7 +25,7 @@ public AsPropertyTypeSerializer(TypeIdResolver idRes, BeanProperty property, Str } @Override - public AsPropertyTypeSerializer forProperty(SerializerProvider ctxt, + public AsPropertyTypeSerializer forProperty(SerializationContext ctxt, BeanProperty prop) { return (_property == prop) ? this : new AsPropertyTypeSerializer(_idResolver, prop, _typePropertyName); diff --git a/src/main/java/tools/jackson/databind/jsontype/impl/AsWrapperTypeSerializer.java b/src/main/java/tools/jackson/databind/jsontype/impl/AsWrapperTypeSerializer.java index feebd08bbf..17d658af91 100644 --- a/src/main/java/tools/jackson/databind/jsontype/impl/AsWrapperTypeSerializer.java +++ b/src/main/java/tools/jackson/databind/jsontype/impl/AsWrapperTypeSerializer.java @@ -4,7 +4,7 @@ import tools.jackson.core.*; import tools.jackson.databind.BeanProperty; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsontype.TypeIdResolver; import tools.jackson.databind.util.ClassUtil; @@ -23,7 +23,7 @@ public AsWrapperTypeSerializer(TypeIdResolver idRes, BeanProperty property) { } @Override - public AsWrapperTypeSerializer forProperty(SerializerProvider ctxt, BeanProperty prop) + public AsWrapperTypeSerializer forProperty(SerializationContext ctxt, BeanProperty prop) { return (_property == prop) ? this : new AsWrapperTypeSerializer(_idResolver, prop); } diff --git a/src/main/java/tools/jackson/databind/jsontype/impl/DefaultTypeResolverBuilder.java b/src/main/java/tools/jackson/databind/jsontype/impl/DefaultTypeResolverBuilder.java index ff58c5a6e9..3f3624cc40 100644 --- a/src/main/java/tools/jackson/databind/jsontype/impl/DefaultTypeResolverBuilder.java +++ b/src/main/java/tools/jackson/databind/jsontype/impl/DefaultTypeResolverBuilder.java @@ -103,7 +103,7 @@ public TypeDeserializer buildTypeDeserializer(DeserializationContext ctxt, } @Override - public TypeSerializer buildTypeSerializer(SerializerProvider ctxt, + public TypeSerializer buildTypeSerializer(SerializationContext ctxt, JavaType baseType, Collection subtypes) { return useForType(baseType) ? super.buildTypeSerializer(ctxt, baseType, subtypes) : null; diff --git a/src/main/java/tools/jackson/databind/jsontype/impl/StdTypeResolverBuilder.java b/src/main/java/tools/jackson/databind/jsontype/impl/StdTypeResolverBuilder.java index c72e215b33..657076a8e1 100644 --- a/src/main/java/tools/jackson/databind/jsontype/impl/StdTypeResolverBuilder.java +++ b/src/main/java/tools/jackson/databind/jsontype/impl/StdTypeResolverBuilder.java @@ -92,7 +92,7 @@ public static StdTypeResolverBuilder noTypeInfoBuilder() { } @Override - public TypeSerializer buildTypeSerializer(SerializerProvider ctxt, + public TypeSerializer buildTypeSerializer(SerializationContext ctxt, JavaType baseType, Collection subtypes) { if (_idType == JsonTypeInfo.Id.NONE) { return null; } diff --git a/src/main/java/tools/jackson/databind/jsontype/impl/TypeSerializerBase.java b/src/main/java/tools/jackson/databind/jsontype/impl/TypeSerializerBase.java index 26edcf1d98..a6ce5cb80e 100644 --- a/src/main/java/tools/jackson/databind/jsontype/impl/TypeSerializerBase.java +++ b/src/main/java/tools/jackson/databind/jsontype/impl/TypeSerializerBase.java @@ -8,7 +8,7 @@ import tools.jackson.core.type.WritableTypeId; import tools.jackson.databind.BeanProperty; import tools.jackson.databind.DatabindContext; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsontype.TypeIdResolver; import tools.jackson.databind.jsontype.TypeSerializer; @@ -40,7 +40,7 @@ protected TypeSerializerBase(TypeIdResolver idRes, BeanProperty property) public TypeIdResolver getTypeIdResolver() { return _idResolver; } @Override - public WritableTypeId writeTypePrefix(JsonGenerator g, SerializerProvider ctxt, + public WritableTypeId writeTypePrefix(JsonGenerator g, SerializationContext ctxt, WritableTypeId idMetadata) throws JacksonException { _generateTypeId(ctxt, idMetadata); @@ -54,7 +54,7 @@ public WritableTypeId writeTypePrefix(JsonGenerator g, SerializerProvider ctxt, } @Override - public WritableTypeId writeTypeSuffix(JsonGenerator g, SerializerProvider ctxt, + public WritableTypeId writeTypeSuffix(JsonGenerator g, SerializationContext ctxt, WritableTypeId idMetadata) throws JacksonException { // 16-Jan-2022, tatu: As per [databind#3373], skip for null: diff --git a/src/main/java/tools/jackson/databind/node/ArrayNode.java b/src/main/java/tools/jackson/databind/node/ArrayNode.java index 0d906816a5..eb017a30da 100644 --- a/src/main/java/tools/jackson/databind/node/ArrayNode.java +++ b/src/main/java/tools/jackson/databind/node/ArrayNode.java @@ -8,7 +8,7 @@ import tools.jackson.core.tree.ArrayTreeNode; import tools.jackson.core.type.WritableTypeId; import tools.jackson.databind.JsonNode; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.exc.JsonNodeException; import tools.jackson.databind.jsontype.TypeSerializer; import tools.jackson.databind.util.RawValue; @@ -187,7 +187,7 @@ protected void _withXxxSetArrayElement(int index, JsonNode value) { */ @Override - public boolean isEmpty(SerializerProvider serializers) { + public boolean isEmpty(SerializationContext serializers) { return _children.isEmpty(); } @@ -288,7 +288,7 @@ public boolean equals(Comparator comparator, JsonNode o) */ @Override - public void serialize(JsonGenerator g, SerializerProvider provider) + public void serialize(JsonGenerator g, SerializationContext provider) throws JacksonException { final List c = _children; @@ -301,7 +301,7 @@ public void serialize(JsonGenerator g, SerializerProvider provider) } @Override - public void serializeWithType(JsonGenerator g, SerializerProvider ctxt, TypeSerializer typeSer) + public void serializeWithType(JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { WritableTypeId typeIdDef = typeSer.writeTypePrefix(g, ctxt, diff --git a/src/main/java/tools/jackson/databind/node/BaseJsonNode.java b/src/main/java/tools/jackson/databind/node/BaseJsonNode.java index 44b9ba76e7..f947d8542f 100644 --- a/src/main/java/tools/jackson/databind/node/BaseJsonNode.java +++ b/src/main/java/tools/jackson/databind/node/BaseJsonNode.java @@ -6,7 +6,7 @@ import tools.jackson.core.*; import tools.jackson.databind.JacksonSerializable; import tools.jackson.databind.JsonNode; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.exc.JsonNodeException; import tools.jackson.databind.jsontype.TypeSerializer; import tools.jackson.databind.util.ClassUtil; @@ -227,7 +227,7 @@ protected ArrayNode _withArray(JsonPointer origPtr, * Method called to serialize node instances using given generator. */ @Override - public abstract void serialize(JsonGenerator jgen, SerializerProvider ctxt) + public abstract void serialize(JsonGenerator jgen, SerializationContext ctxt) throws JacksonException; /** @@ -235,7 +235,7 @@ public abstract void serialize(JsonGenerator jgen, SerializerProvider ctxt) * since they may be mixed with other types. */ @Override - public abstract void serializeWithType(JsonGenerator jgen, SerializerProvider ctxt, + public abstract void serializeWithType(JsonGenerator jgen, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException; diff --git a/src/main/java/tools/jackson/databind/node/BigIntegerNode.java b/src/main/java/tools/jackson/databind/node/BigIntegerNode.java index 82ac1b2dbc..1114020e97 100644 --- a/src/main/java/tools/jackson/databind/node/BigIntegerNode.java +++ b/src/main/java/tools/jackson/databind/node/BigIntegerNode.java @@ -5,7 +5,7 @@ import java.util.Objects; import tools.jackson.core.*; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; /** * Numeric node that contains simple 64-bit integer values. @@ -103,7 +103,7 @@ public boolean asBoolean(boolean defaultValue) { } @Override - public final void serialize(JsonGenerator g, SerializerProvider provider) + public final void serialize(JsonGenerator g, SerializationContext provider) throws JacksonException { g.writeNumber(_value); diff --git a/src/main/java/tools/jackson/databind/node/BinaryNode.java b/src/main/java/tools/jackson/databind/node/BinaryNode.java index 935bf9020c..457820e293 100644 --- a/src/main/java/tools/jackson/databind/node/BinaryNode.java +++ b/src/main/java/tools/jackson/databind/node/BinaryNode.java @@ -4,7 +4,7 @@ import java.util.Objects; import tools.jackson.core.*; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; /** * Value node that contains Base64 encoded binary value, which will be @@ -89,7 +89,7 @@ public String asText() { } @Override - public final void serialize(JsonGenerator g, SerializerProvider provider) + public final void serialize(JsonGenerator g, SerializationContext provider) throws JacksonException { g.writeBinary(provider.getConfig().getBase64Variant(), diff --git a/src/main/java/tools/jackson/databind/node/BooleanNode.java b/src/main/java/tools/jackson/databind/node/BooleanNode.java index 858e2a0fff..34fff1d223 100644 --- a/src/main/java/tools/jackson/databind/node/BooleanNode.java +++ b/src/main/java/tools/jackson/databind/node/BooleanNode.java @@ -1,7 +1,7 @@ package tools.jackson.databind.node; import tools.jackson.core.*; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; /** * This concrete value class is used to contain boolean (true / false) @@ -87,7 +87,7 @@ public double asDouble(double defaultValue) { } @Override - public final void serialize(JsonGenerator g, SerializerProvider provider) + public final void serialize(JsonGenerator g, SerializationContext provider) throws JacksonException { g.writeBoolean(_value); } diff --git a/src/main/java/tools/jackson/databind/node/DecimalNode.java b/src/main/java/tools/jackson/databind/node/DecimalNode.java index 9ae0dd3eae..fd0fa057db 100644 --- a/src/main/java/tools/jackson/databind/node/DecimalNode.java +++ b/src/main/java/tools/jackson/databind/node/DecimalNode.java @@ -108,7 +108,7 @@ public String asText() { } @Override - public final void serialize(JsonGenerator g, SerializerProvider provider) + public final void serialize(JsonGenerator g, SerializationContext provider) throws JacksonException { g.writeNumber(_value); diff --git a/src/main/java/tools/jackson/databind/node/DoubleNode.java b/src/main/java/tools/jackson/databind/node/DoubleNode.java index 78e11f462c..5180989645 100644 --- a/src/main/java/tools/jackson/databind/node/DoubleNode.java +++ b/src/main/java/tools/jackson/databind/node/DoubleNode.java @@ -5,7 +5,7 @@ import tools.jackson.core.*; import tools.jackson.core.io.NumberOutput; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; /** * Numeric node that contains 64-bit ("double precision") @@ -103,7 +103,7 @@ public boolean isNaN() { } @Override - public final void serialize(JsonGenerator g, SerializerProvider provider) + public final void serialize(JsonGenerator g, SerializationContext provider) throws JacksonException { g.writeNumber(_value); } diff --git a/src/main/java/tools/jackson/databind/node/FloatNode.java b/src/main/java/tools/jackson/databind/node/FloatNode.java index 996ad859b2..445d6490d9 100644 --- a/src/main/java/tools/jackson/databind/node/FloatNode.java +++ b/src/main/java/tools/jackson/databind/node/FloatNode.java @@ -5,7 +5,7 @@ import tools.jackson.core.*; import tools.jackson.core.io.NumberOutput; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; /** * {@code JsonNode} implementation for efficiently containing 32-bit @@ -103,7 +103,7 @@ public boolean isNaN() { } @Override - public final void serialize(JsonGenerator g, SerializerProvider provider) + public final void serialize(JsonGenerator g, SerializationContext provider) throws JacksonException { g.writeNumber(_value); } diff --git a/src/main/java/tools/jackson/databind/node/IntNode.java b/src/main/java/tools/jackson/databind/node/IntNode.java index 6284f927e6..f9685b9cc1 100644 --- a/src/main/java/tools/jackson/databind/node/IntNode.java +++ b/src/main/java/tools/jackson/databind/node/IntNode.java @@ -4,7 +4,7 @@ import java.math.BigInteger; import tools.jackson.core.*; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; /** * Numeric node that contains simple 32-bit integer values. @@ -110,7 +110,7 @@ public boolean asBoolean(boolean defaultValue) { } @Override - public final void serialize(JsonGenerator g, SerializerProvider provider) + public final void serialize(JsonGenerator g, SerializationContext provider) throws JacksonException { g.writeNumber(_value); diff --git a/src/main/java/tools/jackson/databind/node/InternalNodeSerializer.java b/src/main/java/tools/jackson/databind/node/InternalNodeSerializer.java index 836ec34274..0997569e7a 100644 --- a/src/main/java/tools/jackson/databind/node/InternalNodeSerializer.java +++ b/src/main/java/tools/jackson/databind/node/InternalNodeSerializer.java @@ -43,21 +43,21 @@ protected static class WrapperForSerializer protected final BaseJsonNode _root; // Non-final as passed when `serialize()` is called - protected SerializerProvider _context; + protected SerializationContext _context; public WrapperForSerializer(BaseJsonNode root) { _root = root; } @Override - public void serialize(JsonGenerator g, SerializerProvider ctxt) throws JacksonException + public void serialize(JsonGenerator g, SerializationContext ctxt) throws JacksonException { _context = ctxt; _serializeNonRecursive(g, _root); } @Override - public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, + public void serializeWithType(JsonGenerator gen, SerializationContext serializers, TypeSerializer typeSer) throws JacksonException { // Should not really be called given usage, so diff --git a/src/main/java/tools/jackson/databind/node/LongNode.java b/src/main/java/tools/jackson/databind/node/LongNode.java index 4b49469bd2..35c196aae9 100644 --- a/src/main/java/tools/jackson/databind/node/LongNode.java +++ b/src/main/java/tools/jackson/databind/node/LongNode.java @@ -4,7 +4,7 @@ import java.math.BigInteger; import tools.jackson.core.*; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; /** * Numeric node that contains simple 64-bit integer values. @@ -86,7 +86,7 @@ public boolean asBoolean(boolean defaultValue) { } @Override - public final void serialize(JsonGenerator jg, SerializerProvider provider) + public final void serialize(JsonGenerator jg, SerializationContext provider) throws JacksonException { jg.writeNumber(_value); diff --git a/src/main/java/tools/jackson/databind/node/MissingNode.java b/src/main/java/tools/jackson/databind/node/MissingNode.java index 214530fcc5..cc239c409d 100644 --- a/src/main/java/tools/jackson/databind/node/MissingNode.java +++ b/src/main/java/tools/jackson/databind/node/MissingNode.java @@ -4,7 +4,7 @@ import tools.jackson.core.*; import tools.jackson.databind.JsonNode; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsontype.TypeSerializer; /** @@ -66,7 +66,7 @@ public final boolean isMissingNode() { */ @Override - public final void serialize(JsonGenerator g, SerializerProvider provider) + public final void serialize(JsonGenerator g, SerializationContext provider) throws JacksonException { /* Nothing to output... should we signal an error tho? @@ -79,7 +79,7 @@ public final void serialize(JsonGenerator g, SerializerProvider provider) } @Override - public void serializeWithType(JsonGenerator g, SerializerProvider provider, + public void serializeWithType(JsonGenerator g, SerializationContext provider, TypeSerializer typeSer) throws JacksonException { diff --git a/src/main/java/tools/jackson/databind/node/NullNode.java b/src/main/java/tools/jackson/databind/node/NullNode.java index 8345025c21..3faef18678 100644 --- a/src/main/java/tools/jackson/databind/node/NullNode.java +++ b/src/main/java/tools/jackson/databind/node/NullNode.java @@ -2,7 +2,7 @@ import tools.jackson.core.*; import tools.jackson.databind.JsonNode; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; /** * This singleton value class is used to contain explicit JSON null @@ -54,7 +54,7 @@ public JsonNode requireNonNull() { */ @Override - public final void serialize(JsonGenerator g, SerializerProvider provider) + public final void serialize(JsonGenerator g, SerializationContext provider) throws JacksonException { provider.defaultSerializeNullValue(g); diff --git a/src/main/java/tools/jackson/databind/node/ObjectNode.java b/src/main/java/tools/jackson/databind/node/ObjectNode.java index d903a56790..b5febe5b97 100644 --- a/src/main/java/tools/jackson/databind/node/ObjectNode.java +++ b/src/main/java/tools/jackson/databind/node/ObjectNode.java @@ -199,7 +199,7 @@ protected ArrayNode _withArrayAddTailProperty(JsonPointer tail, boolean preferIn */ @Override - public boolean isEmpty(SerializerProvider serializers) { + public boolean isEmpty(SerializationContext serializers) { return _children.isEmpty(); } @@ -416,7 +416,7 @@ public List findParents(String propertyName, List foundSoFar */ @SuppressWarnings("deprecation") @Override - public void serialize(JsonGenerator g, SerializerProvider ctxt) + public void serialize(JsonGenerator g, SerializationContext ctxt) throws JacksonException { final int len = _children.size(); @@ -446,7 +446,7 @@ public void serialize(JsonGenerator g, SerializerProvider ctxt) @SuppressWarnings("deprecation") @Override - public void serializeWithType(JsonGenerator g, SerializerProvider ctxt, + public void serializeWithType(JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { @@ -475,7 +475,7 @@ public void serializeWithType(JsonGenerator g, SerializerProvider ctxt, * Helper method shared and called by {@link #serialize} and {@link #serializeWithType} * in cases where actual filtering is needed based on configuration. */ - protected void serializeFilteredContents(final JsonGenerator g, final SerializerProvider ctxt, + protected void serializeFilteredContents(final JsonGenerator g, final SerializationContext ctxt, final boolean trimEmptyArray, final boolean skipNulls) throws JacksonException { @@ -506,7 +506,7 @@ protected void serializeFilteredContents(final JsonGenerator g, final Serializer * * @since 2.16 */ - protected Map _contentsToSerialize(SerializerProvider ctxt) { + protected Map _contentsToSerialize(SerializationContext ctxt) { if (ctxt.isEnabled(JsonNodeFeature.WRITE_PROPERTIES_SORTED)) { if (!_children.isEmpty() // 02-Jun-2024, tatu: Avoid unnecessary copy for custom impls diff --git a/src/main/java/tools/jackson/databind/node/POJONode.java b/src/main/java/tools/jackson/databind/node/POJONode.java index f051f7cf39..d7e9943d7e 100644 --- a/src/main/java/tools/jackson/databind/node/POJONode.java +++ b/src/main/java/tools/jackson/databind/node/POJONode.java @@ -4,7 +4,7 @@ import tools.jackson.core.*; import tools.jackson.databind.JacksonSerializable; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; /** * Value node that contains a wrapped POJO, to be serialized as @@ -107,7 +107,7 @@ public double asDouble(double defaultValue) */ @Override - public final void serialize(JsonGenerator gen, SerializerProvider ctxt) throws JacksonException + public final void serialize(JsonGenerator gen, SerializationContext ctxt) throws JacksonException { if (_value == null) { ctxt.defaultSerializeNullValue(gen); diff --git a/src/main/java/tools/jackson/databind/node/ShortNode.java b/src/main/java/tools/jackson/databind/node/ShortNode.java index a2d1fc83a7..5fe60381c3 100644 --- a/src/main/java/tools/jackson/databind/node/ShortNode.java +++ b/src/main/java/tools/jackson/databind/node/ShortNode.java @@ -4,7 +4,7 @@ import java.math.BigInteger; import tools.jackson.core.*; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; /** * Numeric node that contains simple 16-bit integer values. @@ -84,7 +84,7 @@ public boolean asBoolean(boolean defaultValue) { } @Override - public final void serialize(JsonGenerator g, SerializerProvider provider) + public final void serialize(JsonGenerator g, SerializationContext provider) throws JacksonException { g.writeNumber(_value); diff --git a/src/main/java/tools/jackson/databind/node/TextNode.java b/src/main/java/tools/jackson/databind/node/TextNode.java index 65bcda35b9..3a9771f4d6 100644 --- a/src/main/java/tools/jackson/databind/node/TextNode.java +++ b/src/main/java/tools/jackson/databind/node/TextNode.java @@ -5,7 +5,7 @@ import tools.jackson.core.*; import tools.jackson.core.io.NumberInput; import tools.jackson.core.util.ByteArrayBuilder; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.exc.InvalidFormatException; /** @@ -147,7 +147,7 @@ public double asDouble(double defaultValue) { */ @Override - public final void serialize(JsonGenerator g, SerializerProvider provider) + public final void serialize(JsonGenerator g, SerializationContext provider) throws JacksonException { g.writeString(_value); diff --git a/src/main/java/tools/jackson/databind/node/TreeBuildingGenerator.java b/src/main/java/tools/jackson/databind/node/TreeBuildingGenerator.java index 5287b1403f..ce2ff019ea 100644 --- a/src/main/java/tools/jackson/databind/node/TreeBuildingGenerator.java +++ b/src/main/java/tools/jackson/databind/node/TreeBuildingGenerator.java @@ -70,7 +70,7 @@ public class TreeBuildingGenerator _tokenWriteContext = _rootWriteContext; } - public static TreeBuildingGenerator forSerialization(SerializerProvider ctxt, + public static TreeBuildingGenerator forSerialization(SerializationContext ctxt, JsonNodeFactory nodeFactory) { return new TreeBuildingGenerator(ctxt, nodeFactory); } diff --git a/src/main/java/tools/jackson/databind/node/ValueNode.java b/src/main/java/tools/jackson/databind/node/ValueNode.java index 342c3b4d1f..31ad94421a 100644 --- a/src/main/java/tools/jackson/databind/node/ValueNode.java +++ b/src/main/java/tools/jackson/databind/node/ValueNode.java @@ -5,7 +5,7 @@ import tools.jackson.core.*; import tools.jackson.core.type.WritableTypeId; import tools.jackson.databind.JsonNode; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsontype.TypeSerializer; /** @@ -40,7 +40,7 @@ protected JsonNode _at(JsonPointer ptr) { @Override public abstract JsonToken asToken(); @Override - public void serializeWithType(JsonGenerator g, SerializerProvider ctxt, + public void serializeWithType(JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { diff --git a/src/main/java/tools/jackson/databind/ser/AnyGetterWriter.java b/src/main/java/tools/jackson/databind/ser/AnyGetterWriter.java index 2f3a241dda..64f994b0da 100644 --- a/src/main/java/tools/jackson/databind/ser/AnyGetterWriter.java +++ b/src/main/java/tools/jackson/databind/ser/AnyGetterWriter.java @@ -44,7 +44,7 @@ public void fixAccess(SerializationConfig config) { // Note: NOT part of ResolvableSerializer... @SuppressWarnings("unchecked") - public void resolve(SerializerProvider provider) + public void resolve(SerializationContext provider) { // 05-Sep-2013, tatu: I _think_ this can be considered a primary property... ValueSerializer ser = provider.handlePrimaryContextualization(_serializer, _property); @@ -54,7 +54,7 @@ public void resolve(SerializerProvider provider) } } - public void getAndSerialize(Object bean, JsonGenerator gen, SerializerProvider provider) + public void getAndSerialize(Object bean, JsonGenerator gen, SerializationContext provider) throws Exception { Object value = _accessor.getValue(bean); @@ -74,7 +74,7 @@ public void getAndSerialize(Object bean, JsonGenerator gen, SerializerProvider p _serializer.serialize(value, gen, provider); } - public void getAndFilter(Object bean, JsonGenerator gen, SerializerProvider provider, + public void getAndFilter(Object bean, JsonGenerator gen, SerializationContext provider, PropertyFilter filter) throws Exception { diff --git a/src/main/java/tools/jackson/databind/ser/BasicSerializerFactory.java b/src/main/java/tools/jackson/databind/ser/BasicSerializerFactory.java index 1288fd839e..d22f21579a 100644 --- a/src/main/java/tools/jackson/databind/ser/BasicSerializerFactory.java +++ b/src/main/java/tools/jackson/databind/ser/BasicSerializerFactory.java @@ -178,11 +178,11 @@ public final SerializerFactory withNullKeySerializer(ValueSerializer nks) { */ // Implemented by sub-classes -// public abstract ValueSerializer createSerializer(SerializerProvider ctxt, ....) +// public abstract ValueSerializer createSerializer(SerializationContext ctxt, ....) @Override @SuppressWarnings("unchecked") - public ValueSerializer createKeySerializer(SerializerProvider ctxt, JavaType keyType) + public ValueSerializer createKeySerializer(SerializationContext ctxt, JavaType keyType) { BeanDescription beanDesc = ctxt.introspectBeanDescription(keyType); final SerializationConfig config = ctxt.getConfig(); @@ -267,7 +267,7 @@ protected Iterable customSerializers() { * * @return Type serializer to use for property value contents, if one is needed; null if not. */ - public TypeSerializer findPropertyContentTypeSerializer(SerializerProvider ctxt, + public TypeSerializer findPropertyContentTypeSerializer(SerializationContext ctxt, JavaType containerType, AnnotatedMember accessor) { return ctxt.getConfig().getTypeResolverProvider() @@ -311,7 +311,7 @@ protected final ValueSerializer findSerializerByLookup(JavaType type, * * */ - protected final ValueSerializer findSerializerByAnnotations(SerializerProvider ctxt, + protected final ValueSerializer findSerializerByAnnotations(SerializationContext ctxt, JavaType type, BeanDescription beanDesc) { Class raw = type.getRawClass(); @@ -343,7 +343,7 @@ protected final ValueSerializer findSerializerByAnnotations(SerializerProvide * This does not include "secondary" interfaces, but * mostly concrete or abstract base classes. */ - protected final ValueSerializer findSerializerByPrimaryType(SerializerProvider ctxt, + protected final ValueSerializer findSerializerByPrimaryType(SerializationContext ctxt, JavaType type, BeanDescription beanDesc, JsonFormat.Value formatOverrides, boolean staticTyping) { @@ -443,7 +443,7 @@ protected final ValueSerializer findSerializerByPrimaryType(SerializerProvide * bean classes may implement {@link Iterable}, but their main * function is usually something else. The reason for */ - protected final ValueSerializer findSerializerByAddonType(SerializerProvider ctxt, + protected final ValueSerializer findSerializerByAddonType(SerializationContext ctxt, JavaType javaType, BeanDescription beanDesc, JsonFormat.Value formatOverrides, boolean staticTyping) { @@ -472,7 +472,7 @@ protected final ValueSerializer findSerializerByAddonType(SerializerProvider * Returns null if no such annotation found. */ @SuppressWarnings("unchecked") - protected ValueSerializer findSerializerFromAnnotation(SerializerProvider ctxt, + protected ValueSerializer findSerializerFromAnnotation(SerializationContext ctxt, Annotated a) { Object serDef = ctxt.getAnnotationIntrospector().findSerializer(ctxt.getConfig(), a); @@ -490,7 +490,7 @@ protected ValueSerializer findSerializerFromAnnotation(SerializerProvide * be used; and if so, to construct and return suitable serializer for it. * If not, will simply return given serializer as is. */ - protected ValueSerializer findConvertingSerializer(SerializerProvider ctxt, + protected ValueSerializer findConvertingSerializer(SerializationContext ctxt, Annotated a, ValueSerializer ser) { Converter conv = findConverter(ctxt, a); @@ -501,7 +501,7 @@ protected ValueSerializer findConvertingSerializer(SerializerProvider ctxt, return new StdDelegatingSerializer(conv, delegateType, ser, null); } - protected Converter findConverter(SerializerProvider ctxt, + protected Converter findConverter(SerializationContext ctxt, Annotated a) { Object convDef = ctxt.getAnnotationIntrospector().findSerializationConverter(ctxt.getConfig(), a); @@ -517,7 +517,7 @@ protected Converter findConverter(SerializerProvider ctxt, /********************************************************************** */ - protected ValueSerializer buildContainerSerializer(SerializerProvider ctxt, + protected ValueSerializer buildContainerSerializer(SerializationContext ctxt, JavaType type, BeanDescription beanDesc, JsonFormat.Value formatOverrides, boolean staticTyping) { @@ -617,7 +617,7 @@ protected ValueSerializer buildContainerSerializer(SerializerProvider ctxt, * Helper method that handles configuration details when constructing serializers for * {@link java.util.List} types that support efficient by-index access */ - protected ValueSerializer buildCollectionSerializer(SerializerProvider ctxt, + protected ValueSerializer buildCollectionSerializer(SerializationContext ctxt, CollectionType type, BeanDescription beanDesc, JsonFormat.Value formatOverrides, boolean staticTyping, TypeSerializer elementTypeSerializer, ValueSerializer elementValueSerializer) @@ -723,7 +723,7 @@ public ValueSerializer buildEnumSetSerializer(JavaType enumType) { * Helper method that handles configuration details when constructing serializers for * {@link java.util.Map} types. */ - protected ValueSerializer buildMapSerializer(SerializerProvider ctxt, + protected ValueSerializer buildMapSerializer(SerializationContext ctxt, MapType type, BeanDescription beanDesc, JsonFormat.Value formatOverrides, boolean staticTyping, ValueSerializer keySerializer, TypeSerializer elementTypeSerializer, ValueSerializer elementValueSerializer) @@ -784,7 +784,7 @@ protected ValueSerializer buildMapSerializer(SerializerProvider ctxt, * Helper method that does figures out content inclusion value to use, if any, * and construct re-configured {@link MapSerializer} appropriately. */ - protected MapSerializer _checkMapContentInclusion(SerializerProvider ctxt, + protected MapSerializer _checkMapContentInclusion(SerializationContext ctxt, BeanDescription beanDesc, MapSerializer mapSer) { final JavaType contentType = mapSer.getContentType(); @@ -834,7 +834,7 @@ protected MapSerializer _checkMapContentInclusion(SerializerProvider ctxt, return mapSer.withContentInclusion(valueToSuppress, suppressNulls); } - protected ValueSerializer buildMapEntrySerializer(SerializerProvider ctxt, + protected ValueSerializer buildMapEntrySerializer(SerializationContext ctxt, JavaType type, BeanDescription beanDesc, JsonFormat.Value effectiveFormat, boolean staticTyping, JavaType keyType, JavaType valueType) @@ -901,7 +901,7 @@ protected ValueSerializer buildMapEntrySerializer(SerializerProvider ctxt, * @param contentType Declared full content type of container * @param configType Raw base type under which `configOverride`, if any, needs to be defined */ - protected JsonInclude.Value _findInclusionWithContent(SerializerProvider ctxt, + protected JsonInclude.Value _findInclusionWithContent(SerializationContext ctxt, BeanDescription beanDesc, JavaType contentType, Class configType) { @@ -943,7 +943,7 @@ protected JsonInclude.Value _findInclusionWithContent(SerializerProvider ctxt, * Helper method that handles configuration details when constructing serializers for * Object[] (and subtypes, except for String). */ - protected ValueSerializer buildArraySerializer(SerializerProvider ctxt, + protected ValueSerializer buildArraySerializer(SerializationContext ctxt, ArrayType type, BeanDescription beanDesc, JsonFormat.Value formatOverrides, boolean staticTyping, TypeSerializer elementTypeSerializer, ValueSerializer elementValueSerializer) @@ -994,7 +994,7 @@ protected ValueSerializer buildArraySerializer(SerializerProvider ctxt, /********************************************************************** */ - public ValueSerializer findReferenceSerializer(SerializerProvider ctxt, + public ValueSerializer findReferenceSerializer(SerializationContext ctxt, ReferenceType refType, BeanDescription beanDesc, JsonFormat.Value format, boolean staticTyping) { @@ -1035,7 +1035,7 @@ public ValueSerializer findReferenceSerializer(SerializerProvider ctxt, return null; } - protected ValueSerializer _buildReferenceSerializer(SerializerProvider ctxt, Class baseType, + protected ValueSerializer _buildReferenceSerializer(SerializationContext ctxt, Class baseType, ReferenceType refType, BeanDescription beanDesc, boolean staticTyping, TypeSerializer contentTypeSerializer, ValueSerializer contentSerializer) { @@ -1100,7 +1100,7 @@ protected ValueSerializer _buildReferenceSerializer(SerializerProvider ctxt, /********************************************************************** */ - protected ValueSerializer buildIteratorSerializer(SerializerProvider ctxt, + protected ValueSerializer buildIteratorSerializer(SerializationContext ctxt, JavaType type, BeanDescription beanDesc, JsonFormat.Value formatOverrides, boolean staticTyping, JavaType valueType) @@ -1109,7 +1109,7 @@ protected ValueSerializer buildIteratorSerializer(SerializerProvider ctxt, ctxt.findTypeSerializer(valueType)); } - protected ValueSerializer buildIterableSerializer(SerializerProvider ctxt, + protected ValueSerializer buildIterableSerializer(SerializationContext ctxt, JavaType type, BeanDescription beanDesc, JsonFormat.Value effectiveFormat, boolean staticTyping, JavaType valueType) @@ -1118,7 +1118,7 @@ protected ValueSerializer buildIterableSerializer(SerializerProvider ctxt, ctxt.findTypeSerializer(valueType)); } - protected ValueSerializer buildEnumSerializer(SerializerProvider ctxt, + protected ValueSerializer buildEnumSerializer(SerializationContext ctxt, JavaType type, BeanDescription beanDesc, JsonFormat.Value effectiveFormat) { // As per [databind#24], may want to use alternate shape, serialize as JSON Object. @@ -1203,7 +1203,7 @@ protected JsonFormat.Value _calculateEffectiveFormat(BeanDescription beanDesc, * class that indicates key serializer to use. * If so, will try to instantiate key serializer and return it; otherwise returns null. */ - protected ValueSerializer _findKeySerializer(SerializerProvider ctxt, + protected ValueSerializer _findKeySerializer(SerializationContext ctxt, Annotated a) { AnnotationIntrospector intr = ctxt.getAnnotationIntrospector(); @@ -1216,7 +1216,7 @@ protected ValueSerializer _findKeySerializer(SerializerProvider ctxt, * class that indicates content ("value") serializer to use. * If so, will try to instantiate value serializer and return it; otherwise returns null. */ - protected ValueSerializer _findContentSerializer(SerializerProvider ctxt, + protected ValueSerializer _findContentSerializer(SerializationContext ctxt, Annotated a) { AnnotationIntrospector intr = ctxt.getAnnotationIntrospector(); diff --git a/src/main/java/tools/jackson/databind/ser/BeanPropertyWriter.java b/src/main/java/tools/jackson/databind/ser/BeanPropertyWriter.java index 7a3884d1bd..bdf67dd591 100644 --- a/src/main/java/tools/jackson/databind/ser/BeanPropertyWriter.java +++ b/src/main/java/tools/jackson/databind/ser/BeanPropertyWriter.java @@ -606,7 +606,7 @@ public Class[] getViews() { * serializer. */ @Override - public void serializeAsProperty(Object bean, JsonGenerator g, SerializerProvider ctxt) + public void serializeAsProperty(Object bean, JsonGenerator g, SerializationContext ctxt) throws Exception { // inlined 'get()' @@ -667,7 +667,7 @@ public void serializeAsProperty(Object bean, JsonGenerator g, SerializerProvider * omission. */ @Override - public void serializeAsOmittedProperty(Object bean, JsonGenerator g, SerializerProvider ctxt) + public void serializeAsOmittedProperty(Object bean, JsonGenerator g, SerializationContext ctxt) throws Exception { if (!g.canOmitProperties()) { @@ -681,7 +681,7 @@ public void serializeAsOmittedProperty(Object bean, JsonGenerator g, SerializerP * the difference is that no property names are written. */ @Override - public void serializeAsElement(Object bean, JsonGenerator g, SerializerProvider ctxt) + public void serializeAsElement(Object bean, JsonGenerator g, SerializationContext ctxt) throws Exception { // inlined 'get()' @@ -740,7 +740,7 @@ public void serializeAsElement(Object bean, JsonGenerator g, SerializerProvider */ @Override public void serializeAsOmittedElement(Object bean, JsonGenerator g, - SerializerProvider prov) + SerializationContext prov) throws Exception { if (_nullSerializer != null) { @@ -759,7 +759,7 @@ public void serializeAsOmittedElement(Object bean, JsonGenerator g, // Also part of BeanProperty implementation @Override public void depositSchemaProperty(JsonObjectFormatVisitor v, - SerializerProvider provider) + SerializationContext provider) { if (v != null) { if (isRequired()) { @@ -777,7 +777,7 @@ public void depositSchemaProperty(JsonObjectFormatVisitor v, */ protected ValueSerializer _findAndAddDynamic(PropertySerializerMap map, - Class rawType, SerializerProvider provider) + Class rawType, SerializationContext provider) { JavaType t; if (_nonTrivialBaseType != null) { @@ -822,7 +822,7 @@ public final Object get(Object bean) throws Exception { * is no way handle it */ protected boolean _handleSelfReference(Object bean, JsonGenerator g, - SerializerProvider ctxt, ValueSerializer ser) + SerializationContext ctxt, ValueSerializer ser) throws JacksonException { if (!ser.usesObjectId()) { diff --git a/src/main/java/tools/jackson/databind/ser/BeanSerializer.java b/src/main/java/tools/jackson/databind/ser/BeanSerializer.java index 6331375b7e..b567096826 100644 --- a/src/main/java/tools/jackson/databind/ser/BeanSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/BeanSerializer.java @@ -147,7 +147,7 @@ protected BeanSerializerBase asArraySerializer() * {@link BeanPropertyWriter} instances. */ @Override - public void serialize(Object bean, JsonGenerator gen, SerializerProvider provider) + public void serialize(Object bean, JsonGenerator gen, SerializationContext provider) throws JacksonException { if (_objectIdWriter != null) { diff --git a/src/main/java/tools/jackson/databind/ser/BeanSerializerFactory.java b/src/main/java/tools/jackson/databind/ser/BeanSerializerFactory.java index 81a71e009d..480f072da7 100644 --- a/src/main/java/tools/jackson/databind/ser/BeanSerializerFactory.java +++ b/src/main/java/tools/jackson/databind/ser/BeanSerializerFactory.java @@ -126,7 +126,7 @@ public SerializerFactory withConfig(SerializerFactoryConfig config) */ @Override @SuppressWarnings("unchecked") - public ValueSerializer createSerializer(SerializerProvider ctxt, JavaType origType, + public ValueSerializer createSerializer(SerializationContext ctxt, JavaType origType, BeanDescription beanDesc, JsonFormat.Value formatOverrides) { // Very first thing, let's check if there is explicit serializer annotation: @@ -178,7 +178,7 @@ public ValueSerializer createSerializer(SerializerProvider ctxt, JavaTyp return (ValueSerializer) _createSerializer2(ctxt, beanDesc, type, formatOverrides, staticTyping); } - protected ValueSerializer _createSerializer2(SerializerProvider ctxt, + protected ValueSerializer _createSerializer2(SerializationContext ctxt, BeanDescription beanDesc, JavaType type, JsonFormat.Value formatOverrides, boolean staticTyping) { @@ -267,7 +267,7 @@ protected ValueSerializer _createSerializer2(SerializerProvider ctxt, * or, if none matched, return {@code null}. */ @SuppressWarnings("unchecked") - protected ValueSerializer constructBeanOrAddOnSerializer(SerializerProvider ctxt, + protected ValueSerializer constructBeanOrAddOnSerializer(SerializationContext ctxt, JavaType type, BeanDescription beanDesc, JsonFormat.Value format, boolean staticTyping) { // 13-Oct-2010, tatu: quick sanity check: never try to create bean serializer for plain Object @@ -397,7 +397,7 @@ protected ValueSerializer constructBeanOrAddOnSerializer(SerializerProvi return (ValueSerializer) ser; } - protected ObjectIdWriter constructObjectIdHandler(SerializerProvider ctxt, + protected ObjectIdWriter constructObjectIdHandler(SerializationContext ctxt, BeanDescription beanDesc, List props) { ObjectIdInfo objectIdInfo = beanDesc.getObjectIdInfo(); @@ -490,7 +490,7 @@ protected boolean isPotentialBeanType(Class type) * Method used to collect all actual serializable properties. * Can be overridden to implement custom detection schemes. */ - protected List findBeanProperties(SerializerProvider ctxt, + protected List findBeanProperties(SerializationContext ctxt, BeanDescription beanDesc, BeanSerializerBuilder builder) { List properties = beanDesc.findProperties(); @@ -652,7 +652,7 @@ protected void processViews(SerializationConfig config, BeanSerializerBuilder bu * annotation but can be supplied by module-provided introspectors too. * Starting with 2.8 there are also "Config overrides" to consider. */ - protected void removeIgnorableTypes(SerializerProvider ctxt, BeanDescription beanDesc, + protected void removeIgnorableTypes(SerializationContext ctxt, BeanDescription beanDesc, List properties) { AnnotationIntrospector intr = ctxt.getAnnotationIntrospector(); @@ -705,7 +705,7 @@ protected void removeSetterlessGetters(SerializationConfig config, BeanDescripti * Helper method called to ensure that we do not have "duplicate" type ids. * Added to resolve [databind#222] */ - protected List removeOverlappingTypeIds(SerializerProvider ctxt, + protected List removeOverlappingTypeIds(SerializationContext ctxt, BeanDescription beanDesc, BeanSerializerBuilder builder, List props) { @@ -738,7 +738,7 @@ protected List removeOverlappingTypeIds(SerializerProvider c * Secondary helper method for constructing {@link BeanPropertyWriter} for * given member (field or method). */ - protected BeanPropertyWriter _constructWriter(SerializerProvider ctxt, + protected BeanPropertyWriter _constructWriter(SerializationContext ctxt, BeanPropertyDefinition propDef, PropertyBuilder pb, boolean staticTyping, AnnotatedMember accessor) { @@ -769,7 +769,7 @@ protected BeanPropertyWriter _constructWriter(SerializerProvider ctxt, typeSer, contentTypeSer, accessor, staticTyping); } - protected ValueSerializer _findUnsupportedTypeSerializer(SerializerProvider ctxt, + protected ValueSerializer _findUnsupportedTypeSerializer(SerializationContext ctxt, JavaType type, BeanDescription beanDesc) { // 05-May-2020, tatu: Should we check for possible Shape override to "POJO"? @@ -790,7 +790,7 @@ protected ValueSerializer _findUnsupportedTypeSerializer(SerializerProvider c * * @since 2.13 */ - protected boolean _isUnserializableJacksonType(SerializerProvider ctxt, + protected boolean _isUnserializableJacksonType(SerializationContext ctxt, JavaType type) { final Class raw = type.getRawClass(); diff --git a/src/main/java/tools/jackson/databind/ser/FilterProvider.java b/src/main/java/tools/jackson/databind/ser/FilterProvider.java index 3bd9b2f845..b2e4da688f 100644 --- a/src/main/java/tools/jackson/databind/ser/FilterProvider.java +++ b/src/main/java/tools/jackson/databind/ser/FilterProvider.java @@ -1,7 +1,7 @@ package tools.jackson.databind.ser; import tools.jackson.core.util.Snapshottable; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; /** * Interface for objects that provides instances of {@link PropertyFilter} @@ -25,6 +25,6 @@ public abstract class FilterProvider * * @return Filter to use, if any. */ - public abstract PropertyFilter findPropertyFilter(SerializerProvider ctxt, + public abstract PropertyFilter findPropertyFilter(SerializationContext ctxt, Object filterId, Object valueToFilter); } diff --git a/src/main/java/tools/jackson/databind/ser/PropertyBuilder.java b/src/main/java/tools/jackson/databind/ser/PropertyBuilder.java index 5827892cfa..06fffdaee8 100644 --- a/src/main/java/tools/jackson/databind/ser/PropertyBuilder.java +++ b/src/main/java/tools/jackson/databind/ser/PropertyBuilder.java @@ -86,7 +86,7 @@ public Annotations getClassAnnotations() { * to use for contained values (only used for properties that are * of container type) */ - protected BeanPropertyWriter buildWriter(SerializerProvider ctxt, + protected BeanPropertyWriter buildWriter(SerializationContext ctxt, BeanPropertyDefinition propDef, JavaType declaredType, ValueSerializer ser, TypeSerializer typeSer, TypeSerializer contentTypeSer, AnnotatedMember am, boolean defaultUseStaticTyping) diff --git a/src/main/java/tools/jackson/databind/ser/PropertyFilter.java b/src/main/java/tools/jackson/databind/ser/PropertyFilter.java index bd1084d7a9..c2b3458023 100644 --- a/src/main/java/tools/jackson/databind/ser/PropertyFilter.java +++ b/src/main/java/tools/jackson/databind/ser/PropertyFilter.java @@ -2,7 +2,7 @@ import tools.jackson.core.JsonGenerator; import tools.jackson.core.util.Snapshottable; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsonFormatVisitors.JsonObjectFormatVisitor; /** @@ -38,7 +38,7 @@ public interface PropertyFilter * processing * @param writer Object called to do actual serialization of the field, if not filtered out */ - public void serializeAsProperty(Object pojo, JsonGenerator g, SerializerProvider ctxt, + public void serializeAsProperty(Object pojo, JsonGenerator g, SerializationContext ctxt, PropertyWriter writer) throws Exception; @@ -62,7 +62,7 @@ public void serializeAsProperty(Object pojo, JsonGenerator g, SerializerProvider * processing * @param writer Object called to do actual serialization of the field, if not filtered out */ - public void serializeAsElement(Object elementValue, JsonGenerator g, SerializerProvider ctxt, + public void serializeAsElement(Object elementValue, JsonGenerator g, SerializationContext ctxt, PropertyWriter writer) throws Exception; @@ -84,5 +84,5 @@ public void serializeAsElement(Object elementValue, JsonGenerator g, SerializerP * @param ctxt Serialization context */ public void depositSchemaProperty(PropertyWriter writer, JsonObjectFormatVisitor v, - SerializerProvider ctxt); + SerializationContext ctxt); } diff --git a/src/main/java/tools/jackson/databind/ser/PropertyWriter.java b/src/main/java/tools/jackson/databind/ser/PropertyWriter.java index 23249e27c5..d4213bb905 100644 --- a/src/main/java/tools/jackson/databind/ser/PropertyWriter.java +++ b/src/main/java/tools/jackson/databind/ser/PropertyWriter.java @@ -99,7 +99,7 @@ public A findAnnotation(Class acls) { * The main serialization method called by filter when property is to be written * as an Object property. */ - public abstract void serializeAsProperty(Object value, JsonGenerator g, SerializerProvider provider) + public abstract void serializeAsProperty(Object value, JsonGenerator g, SerializationContext provider) throws Exception; /** @@ -108,7 +108,7 @@ public abstract void serializeAsProperty(Object value, JsonGenerator g, Serializ * filtered, but the underlying data format requires a placeholder of some kind. * This is usually the case for tabular (positional) data formats such as CSV. */ - public abstract void serializeAsOmittedProperty(Object value, JsonGenerator g, SerializerProvider provider) + public abstract void serializeAsOmittedProperty(Object value, JsonGenerator g, SerializationContext provider) throws Exception; /* @@ -127,7 +127,7 @@ public abstract void serializeAsOmittedProperty(Object value, JsonGenerator g, S * data format; so it is typically NOT called for fully tabular formats such as CSV, * where logical output is still as form of POJOs. */ - public abstract void serializeAsElement(Object value, JsonGenerator g, SerializerProvider provider) + public abstract void serializeAsElement(Object value, JsonGenerator g, SerializationContext provider) throws Exception; /** @@ -135,7 +135,7 @@ public abstract void serializeAsElement(Object value, JsonGenerator g, Serialize * but then value is to be omitted. This requires output of a placeholder value * of some sort; often similar to {@link #serializeAsOmittedProperty}. */ - public abstract void serializeAsOmittedElement(Object value, JsonGenerator g, SerializerProvider provider) + public abstract void serializeAsOmittedElement(Object value, JsonGenerator g, SerializationContext provider) throws Exception; /* @@ -150,5 +150,5 @@ public abstract void serializeAsOmittedElement(Object value, JsonGenerator g, Se */ @Override public abstract void depositSchemaProperty(JsonObjectFormatVisitor objectVisitor, - SerializerProvider provider); + SerializationContext provider); } diff --git a/src/main/java/tools/jackson/databind/ser/SerializationContextExt.java b/src/main/java/tools/jackson/databind/ser/SerializationContextExt.java index e38ecb3174..c4bbbb8bee 100644 --- a/src/main/java/tools/jackson/databind/ser/SerializationContextExt.java +++ b/src/main/java/tools/jackson/databind/ser/SerializationContextExt.java @@ -20,16 +20,16 @@ import tools.jackson.databind.util.TokenBuffer; /** - * Extension over {@link SerializerProvider} that adds methods needed by + * Extension over {@link SerializationContext} that adds methods needed by * {@link ObjectMapper} (and {@link ObjectWriter}) but that are not to be exposed * as general context during serialization. *

- * Also note that all custom {@link SerializerProvider} + * Also note that all custom {@link SerializationContext} * implementations must sub-class this class: {@link ObjectMapper} * requires this type, not basic provider type. */ public class SerializationContextExt - extends SerializerProvider + extends SerializationContext { /* /********************************************************************** diff --git a/src/main/java/tools/jackson/databind/ser/SerializerCache.java b/src/main/java/tools/jackson/databind/ser/SerializerCache.java index 6b2aa99aea..5c068756d4 100644 --- a/src/main/java/tools/jackson/databind/ser/SerializerCache.java +++ b/src/main/java/tools/jackson/databind/ser/SerializerCache.java @@ -168,7 +168,7 @@ public void addTypedSerializer(Class cls, ValueSerializer ser) } public void addAndResolveNonTypedSerializer(Class type, ValueSerializer ser, - SerializerProvider provider) + SerializationContext provider) { synchronized (this) { if (_sharedMap.put(new TypeKey(type, false), ser) == null) { @@ -184,7 +184,7 @@ public void addAndResolveNonTypedSerializer(Class type, ValueSerializer ser, - SerializerProvider provider) + SerializationContext provider) { synchronized (this) { if (_sharedMap.put(new TypeKey(type, false), ser) == null) { @@ -205,7 +205,7 @@ public void addAndResolveNonTypedSerializer(JavaType type, ValueSerializer rawType, JavaType fullType, ValueSerializer ser, - SerializerProvider provider) + SerializationContext provider) { synchronized (this) { Object ob1 = _sharedMap.put(new TypeKey(rawType, false), ser); @@ -218,7 +218,7 @@ public void addAndResolveNonTypedSerializer(Class rawType, JavaType fullType, } /** - * Method called by StdSerializerProvider#flushCachedSerializers() to + * Method called by StdSerializationContext#flushCachedSerializers() to * clear all cached serializers */ public synchronized void flush() { diff --git a/src/main/java/tools/jackson/databind/ser/SerializerFactory.java b/src/main/java/tools/jackson/databind/ser/SerializerFactory.java index 511a4ae152..f986c943d1 100644 --- a/src/main/java/tools/jackson/databind/ser/SerializerFactory.java +++ b/src/main/java/tools/jackson/databind/ser/SerializerFactory.java @@ -5,7 +5,7 @@ import tools.jackson.databind.*; /** - * Abstract class that defines API used by {@link SerializerProvider} + * Abstract class that defines API used by {@link SerializationContext} * to obtain actual * {@link ValueSerializer} instances from multiple distinct factories. */ @@ -27,7 +27,7 @@ public abstract class SerializerFactory * * @since 3.0 (last argument added) */ - public abstract ValueSerializer createSerializer(SerializerProvider ctxt, + public abstract ValueSerializer createSerializer(SerializationContext ctxt, JavaType baseType, BeanDescription beanDesc, JsonFormat.Value formatOverride); /** @@ -40,7 +40,7 @@ public abstract ValueSerializer createSerializer(SerializerProvider ctxt * @return Serializer to use, if factory knows it; null if not (in which case default * serializer is to be used) */ - public abstract ValueSerializer createKeySerializer(SerializerProvider ctxt, + public abstract ValueSerializer createKeySerializer(SerializationContext ctxt, JavaType type); /** @@ -98,7 +98,7 @@ public abstract ValueSerializer createKeySerializer(SerializerProvider c * @deprecated Since 3.0 use variant that takes {@code JsonFormat.Value} argument */ @Deprecated // since 3.0 - public ValueSerializer createSerializer(SerializerProvider ctxt, JavaType baseType) + public ValueSerializer createSerializer(SerializationContext ctxt, JavaType baseType) { BeanDescription beanDesc = ctxt.introspectBeanDescription(baseType); return createSerializer(ctxt, baseType, beanDesc, null); diff --git a/src/main/java/tools/jackson/databind/ser/UnrolledBeanSerializer.java b/src/main/java/tools/jackson/databind/ser/UnrolledBeanSerializer.java index 6b3a81adb3..f67f7c6402 100644 --- a/src/main/java/tools/jackson/databind/ser/UnrolledBeanSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/UnrolledBeanSerializer.java @@ -150,7 +150,7 @@ protected BeanSerializerBase asArraySerializer() } @Override - public void resolve(SerializerProvider provider) + public void resolve(SerializationContext provider) { super.resolve(provider); _calcUnrolled(); @@ -163,7 +163,7 @@ public void resolve(SerializerProvider provider) */ @Override - public void serialize(Object bean, JsonGenerator gen, SerializerProvider provider) + public void serialize(Object bean, JsonGenerator gen, SerializationContext provider) throws JacksonException { // NOTE! We have ensured that "JSON Filter" and "Object Id" cases @@ -179,7 +179,7 @@ public void serialize(Object bean, JsonGenerator gen, SerializerProvider provide serializeNonFiltered(bean, gen, provider); } - protected void serializeNonFiltered(Object bean, JsonGenerator gen, SerializerProvider provider) + protected void serializeNonFiltered(Object bean, JsonGenerator gen, SerializationContext provider) throws JacksonException { gen.writeStartObject(bean); diff --git a/src/main/java/tools/jackson/databind/ser/VirtualBeanPropertyWriter.java b/src/main/java/tools/jackson/databind/ser/VirtualBeanPropertyWriter.java index 9ce7df91eb..52a36cce10 100644 --- a/src/main/java/tools/jackson/databind/ser/VirtualBeanPropertyWriter.java +++ b/src/main/java/tools/jackson/databind/ser/VirtualBeanPropertyWriter.java @@ -108,7 +108,7 @@ protected static Object _suppressableValue(JsonInclude.Value inclusion) { * may choose to not even use this method (by overriding {@link #serializeAsProperty}) * and define a bogus implementation. */ - protected abstract Object value(Object bean, JsonGenerator g, SerializerProvider prov) throws Exception; + protected abstract Object value(Object bean, JsonGenerator g, SerializationContext prov) throws Exception; /** * Contextualization method called on a newly constructed virtual bean property. @@ -133,7 +133,7 @@ public abstract VirtualBeanPropertyWriter withConfig(MapperConfig config, */ @Override - public void serializeAsProperty(Object bean, JsonGenerator g, SerializerProvider prov) + public void serializeAsProperty(Object bean, JsonGenerator g, SerializationContext prov) throws Exception { // NOTE: mostly copied from base class, but off-lined get() access @@ -179,10 +179,10 @@ public void serializeAsProperty(Object bean, JsonGenerator g, SerializerProvider } // This one's fine as-is from base class - //public void serializeAsOmittedProperty(Object bean, JsonGenerator g, SerializerProvider prov) throws Exception + //public void serializeAsOmittedProperty(Object bean, JsonGenerator g, SerializationContext prov) throws Exception @Override - public void serializeAsElement(Object bean, JsonGenerator g, SerializerProvider prov) + public void serializeAsElement(Object bean, JsonGenerator g, SerializationContext prov) throws Exception { // NOTE: mostly copied from base class, but off-lined get() access @@ -229,5 +229,5 @@ public void serializeAsElement(Object bean, JsonGenerator g, SerializerProvider } // This one's fine as-is from base class - //public void serializeAsOmittedElement(Object bean, JsonGenerator g, SerializerProvider prov) + //public void serializeAsOmittedElement(Object bean, JsonGenerator g, SerializationContext prov) } diff --git a/src/main/java/tools/jackson/databind/ser/WritableObjectId.java b/src/main/java/tools/jackson/databind/ser/WritableObjectId.java index 2814811284..7ecc2a3c66 100644 --- a/src/main/java/tools/jackson/databind/ser/WritableObjectId.java +++ b/src/main/java/tools/jackson/databind/ser/WritableObjectId.java @@ -5,7 +5,7 @@ import tools.jackson.core.JacksonException; import tools.jackson.core.JsonGenerator; import tools.jackson.core.SerializableString; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.ser.impl.ObjectIdWriter; /** @@ -32,7 +32,7 @@ public WritableObjectId(ObjectIdGenerator g) { * Method to call to write a reference to object that this id refers. Usually this * is done after an earlier call to {@link #writeAsDeclaration}. */ - public boolean writeAsReference(JsonGenerator g, SerializerProvider ctxt, ObjectIdWriter w) + public boolean writeAsReference(JsonGenerator g, SerializationContext ctxt, ObjectIdWriter w) throws JacksonException { if ((id != null) && (idWritten || w.alwaysAsId)) { @@ -62,7 +62,7 @@ public Object generateId(Object forPojo) { * method {@link JsonGenerator#writeObjectId(Object)} (if allowed), or, if not, * just writing it as an Object property with specified property name and id value. */ - public void writeAsDeclaration(JsonGenerator g, SerializerProvider ctxt, ObjectIdWriter w) + public void writeAsDeclaration(JsonGenerator g, SerializationContext ctxt, ObjectIdWriter w) throws JacksonException { idWritten = true; diff --git a/src/main/java/tools/jackson/databind/ser/bean/BeanAsArraySerializer.java b/src/main/java/tools/jackson/databind/ser/bean/BeanAsArraySerializer.java index 038b83f326..2c957f2ef7 100644 --- a/src/main/java/tools/jackson/databind/ser/bean/BeanAsArraySerializer.java +++ b/src/main/java/tools/jackson/databind/ser/bean/BeanAsArraySerializer.java @@ -141,7 +141,7 @@ protected BeanSerializerBase asArraySerializer() { // Re-defined from base class, due to differing prefixes @Override public void serializeWithType(Object bean, JsonGenerator gen, - SerializerProvider ctxt, TypeSerializer typeSer) + SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { // 10-Dec-2014, tatu: Not sure if this can be made to work reliably; @@ -168,7 +168,7 @@ public void serializeWithType(Object bean, JsonGenerator gen, * {@link BeanPropertyWriter} instances. */ @Override - public final void serialize(Object bean, JsonGenerator gen, SerializerProvider provider) + public final void serialize(Object bean, JsonGenerator gen, SerializationContext provider) throws JacksonException { final boolean filtered = (_filteredProps != null && provider.getActiveView() != null); @@ -194,12 +194,12 @@ && hasSingleElement(provider)) { /********************************************************************** */ - private boolean hasSingleElement(SerializerProvider provider) { + private boolean hasSingleElement(SerializationContext provider) { return _props.length == 1; } protected final void serializeNonFiltered(Object bean, JsonGenerator gen, - SerializerProvider provider) + SerializationContext provider) throws JacksonException { final BeanPropertyWriter[] props = _props; @@ -245,7 +245,7 @@ protected final void serializeNonFiltered(Object bean, JsonGenerator gen, } } - protected final void serializeFiltered(Object bean, JsonGenerator gen, SerializerProvider provider) + protected final void serializeFiltered(Object bean, JsonGenerator gen, SerializationContext provider) throws JacksonException { final BeanPropertyWriter[] props = _filteredProps; 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 368999df5d..88ebb3aa9c 100644 --- a/src/main/java/tools/jackson/databind/ser/bean/BeanSerializerBase.java +++ b/src/main/java/tools/jackson/databind/ser/bean/BeanSerializerBase.java @@ -278,7 +278,7 @@ private final static BeanPropertyWriter[] rename(BeanPropertyWriter[] props, * to be able to properly handle cyclic type references. */ @Override - public void resolve(SerializerProvider provider) + public void resolve(SerializationContext provider) { int filteredCount = (_filteredProps == null) ? 0 : _filteredProps.length; for (int i = 0, len = _props.length; i < len; ++i) { @@ -360,7 +360,7 @@ public void resolve(SerializerProvider provider) * to indicate use of a converter for property value (in case of container types, * it is container type itself, not key or content type). */ - protected ValueSerializer findConvertingSerializer(SerializerProvider provider, + protected ValueSerializer findConvertingSerializer(SerializationContext provider, BeanPropertyWriter prop) { final AnnotationIntrospector intr = provider.getAnnotationIntrospector(); @@ -383,7 +383,7 @@ protected ValueSerializer findConvertingSerializer(SerializerProvider pr @SuppressWarnings("incomplete-switch") @Override - public ValueSerializer createContextual(SerializerProvider ctxt, BeanProperty property) + public ValueSerializer createContextual(SerializationContext ctxt, BeanProperty property) { final AnnotationIntrospector intr = ctxt.getAnnotationIntrospector(); final AnnotatedMember accessor = _neitherNull(property, intr) @@ -454,7 +454,7 @@ public ValueSerializer createContextual(SerializerProvider ctxt, BeanProperty } } else { // Ugh: mostly copied from BeanDeserializerBase: but can't easily change it - // to be able to move to SerializerProvider (where it really belongs) + // to be able to move to SerializationContext (where it really belongs) // 2.1: allow modifications by "id ref" annotations as well: objectIdInfo = intr.findObjectReferenceInfo(config, accessor, objectIdInfo); @@ -617,13 +617,13 @@ public boolean usesObjectId() { // Main serialization method left unimplemented @Override - public abstract void serialize(Object bean, JsonGenerator gen, SerializerProvider provider) + public abstract void serialize(Object bean, JsonGenerator gen, SerializationContext provider) throws JacksonException; // Type-info-augmented case implemented as it does not usually differ between impls @Override public void serializeWithType(Object bean, - JsonGenerator gen, SerializerProvider ctxt, TypeSerializer typeSer) + JsonGenerator gen, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { if (_objectIdWriter != null) { @@ -643,7 +643,7 @@ public void serializeWithType(Object bean, } protected final void _serializeWithObjectId(Object bean, JsonGenerator g, - SerializerProvider provider, boolean startEndObject) + SerializationContext provider, boolean startEndObject) throws JacksonException { final ObjectIdWriter w = _objectIdWriter; @@ -672,7 +672,7 @@ protected final void _serializeWithObjectId(Object bean, JsonGenerator g, } } - protected final void _serializeWithObjectId(Object bean, JsonGenerator g, SerializerProvider provider, + protected final void _serializeWithObjectId(Object bean, JsonGenerator g, SerializationContext provider, TypeSerializer typeSer) throws JacksonException { @@ -693,7 +693,7 @@ protected final void _serializeWithObjectId(Object bean, JsonGenerator g, Serial } protected void _serializeObjectId(Object bean, - JsonGenerator g, SerializerProvider ctxt, + JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer, WritableObjectId objectId) throws JacksonException { @@ -737,7 +737,7 @@ protected final WritableTypeId _typeIdDef(TypeSerializer typeSer, * @since 3.0 */ protected void _serializePropertiesNoView(Object bean, JsonGenerator gen, - SerializerProvider provider, BeanPropertyWriter[] props) + SerializationContext provider, BeanPropertyWriter[] props) throws JacksonException { int i = 0; @@ -792,7 +792,7 @@ protected void _serializePropertiesNoView(Object bean, JsonGenerator gen, * @since 3.0 */ protected void _serializePropertiesMaybeView(Object bean, JsonGenerator g, - SerializerProvider provider, BeanPropertyWriter[] props) + SerializationContext provider, BeanPropertyWriter[] props) throws JacksonException { int i = 0; @@ -867,7 +867,7 @@ protected void _serializePropertiesMaybeView(Object bean, JsonGenerator g, * which properties are to be serialized (and possibly how) */ protected void _serializePropertiesFiltered(Object bean, JsonGenerator g, - SerializerProvider provider, Object filterId) + SerializationContext provider, Object filterId) throws JacksonException { final BeanPropertyWriter[] props; @@ -909,7 +909,7 @@ protected void _serializePropertiesFiltered(Object bean, JsonGenerator g, } } - protected void _serializeProperties(Object bean, JsonGenerator g, SerializerProvider provider) + protected void _serializeProperties(Object bean, JsonGenerator g, SerializationContext provider) throws JacksonException { // NOTE: only called from places where FilterId (JsonView) already checked. @@ -937,7 +937,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t if (objectVisitor == null) { return; } - final SerializerProvider provider = visitor.getProvider(); + final SerializationContext provider = visitor.getProvider(); if (_propertyFilterId != null) { PropertyFilter filter = findPropertyFilter(visitor.getProvider(), _propertyFilterId, null); diff --git a/src/main/java/tools/jackson/databind/ser/bean/UnrolledBeanAsArraySerializer.java b/src/main/java/tools/jackson/databind/ser/bean/UnrolledBeanAsArraySerializer.java index a580d9424f..8a7d93815d 100644 --- a/src/main/java/tools/jackson/databind/ser/bean/UnrolledBeanAsArraySerializer.java +++ b/src/main/java/tools/jackson/databind/ser/bean/UnrolledBeanAsArraySerializer.java @@ -140,7 +140,7 @@ protected BeanSerializerBase asArraySerializer() { } @Override - public void resolve(SerializerProvider provider) + public void resolve(SerializationContext provider) { super.resolve(provider); _calcUnrolled(); @@ -155,7 +155,7 @@ public void resolve(SerializerProvider provider) // Re-defined from base class, due to differing prefixes @Override public void serializeWithType(Object bean, JsonGenerator gen, - SerializerProvider ctxt, TypeSerializer typeSer) + SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { WritableTypeId typeIdDef = _typeIdDef(typeSer, bean, JsonToken.START_ARRAY); @@ -171,7 +171,7 @@ public void serializeWithType(Object bean, JsonGenerator gen, * {@link BeanPropertyWriter} instances. */ @Override - public final void serialize(Object bean, JsonGenerator gen, SerializerProvider provider) + public final void serialize(Object bean, JsonGenerator gen, SerializationContext provider) throws JacksonException { if (provider.isEnabled(SerializationFeature.WRITE_SINGLE_ELEM_ARRAYS_UNWRAPPED) @@ -195,12 +195,12 @@ && hasSingleElement(provider)) { /********************************************************************** */ - private boolean hasSingleElement(SerializerProvider provider) { + private boolean hasSingleElement(SerializationContext provider) { return _props.length == 1; } protected final void serializeNonFiltered(Object bean, JsonGenerator gen, - SerializerProvider provider) + SerializationContext provider) throws JacksonException { BeanPropertyWriter prop = null; diff --git a/src/main/java/tools/jackson/databind/ser/bean/UnwrappingBeanPropertyWriter.java b/src/main/java/tools/jackson/databind/ser/bean/UnwrappingBeanPropertyWriter.java index 1e973ac8f5..dbaf6c37b2 100644 --- a/src/main/java/tools/jackson/databind/ser/bean/UnwrappingBeanPropertyWriter.java +++ b/src/main/java/tools/jackson/databind/ser/bean/UnwrappingBeanPropertyWriter.java @@ -7,7 +7,7 @@ import tools.jackson.core.io.SerializedString; import tools.jackson.databind.JavaType; import tools.jackson.databind.JsonNode; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.ValueSerializer; import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper; import tools.jackson.databind.jsonFormatVisitors.JsonObjectFormatVisitor; @@ -82,7 +82,7 @@ public boolean isUnwrapping() { } @Override - public void serializeAsProperty(Object bean, JsonGenerator gen, SerializerProvider prov) + public void serializeAsProperty(Object bean, JsonGenerator gen, SerializationContext prov) throws Exception { final Object value = get(bean); @@ -153,7 +153,7 @@ public void assignSerializer(ValueSerializer ser) @Override public void depositSchemaProperty(final JsonObjectFormatVisitor visitor, - SerializerProvider provider) + SerializationContext provider) { ValueSerializer ser = provider .findPrimaryPropertySerializer(getType(), this) @@ -200,7 +200,7 @@ protected void _depositSchemaProperty(ObjectNode propertiesNode, JsonNode schema // need to override as we must get unwrapping instance... @Override protected ValueSerializer _findAndAddDynamic(PropertySerializerMap map, - Class type, SerializerProvider provider) + Class type, SerializationContext provider) { ValueSerializer serializer; if (_nonTrivialBaseType != null) { diff --git a/src/main/java/tools/jackson/databind/ser/bean/UnwrappingBeanSerializer.java b/src/main/java/tools/jackson/databind/ser/bean/UnwrappingBeanSerializer.java index 8d1589c200..366888f423 100644 --- a/src/main/java/tools/jackson/databind/ser/bean/UnwrappingBeanSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/bean/UnwrappingBeanSerializer.java @@ -121,7 +121,7 @@ protected BeanSerializerBase asArraySerializer() { * {@link BeanPropertyWriter} instances. */ @Override - public final void serialize(Object bean, JsonGenerator gen, SerializerProvider provider) throws JacksonException + public final void serialize(Object bean, JsonGenerator gen, SerializationContext provider) throws JacksonException { if (_objectIdWriter != null) { _serializeWithObjectId(bean, gen, provider, false); @@ -143,7 +143,7 @@ public final void serialize(Object bean, JsonGenerator gen, SerializerProvider p } @Override - public void serializeWithType(Object bean, JsonGenerator gen, SerializerProvider provider, + public void serializeWithType(Object bean, JsonGenerator gen, SerializationContext provider, TypeSerializer typeSer) throws JacksonException { if (provider.isEnabled(SerializationFeature.FAIL_ON_UNWRAPPED_TYPE_IDENTIFIERS)) { diff --git a/src/main/java/tools/jackson/databind/ser/impl/AttributePropertyWriter.java b/src/main/java/tools/jackson/databind/ser/impl/AttributePropertyWriter.java index 7f97b93b58..53adf6a04f 100644 --- a/src/main/java/tools/jackson/databind/ser/impl/AttributePropertyWriter.java +++ b/src/main/java/tools/jackson/databind/ser/impl/AttributePropertyWriter.java @@ -79,7 +79,7 @@ public VirtualBeanPropertyWriter withConfig(MapperConfig config, */ @Override - protected Object value(Object bean, JsonGenerator jgen, SerializerProvider prov) throws Exception { + protected Object value(Object bean, JsonGenerator jgen, SerializationContext prov) throws Exception { return prov.getAttribute(_attrName); } } diff --git a/src/main/java/tools/jackson/databind/ser/impl/FailingSerializer.java b/src/main/java/tools/jackson/databind/ser/impl/FailingSerializer.java index 46b963327d..784c17beae 100644 --- a/src/main/java/tools/jackson/databind/ser/impl/FailingSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/impl/FailingSerializer.java @@ -2,7 +2,7 @@ import tools.jackson.core.*; import tools.jackson.databind.DatabindException; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.ser.std.StdSerializer; /** @@ -23,7 +23,7 @@ public FailingSerializer(String msg) { } @Override - public void serialize(Object value, JsonGenerator g, SerializerProvider provider) + public void serialize(Object value, JsonGenerator g, SerializationContext provider) throws JacksonException { provider.reportMappingProblem(_msg); diff --git a/src/main/java/tools/jackson/databind/ser/impl/FilteredBeanPropertyWriter.java b/src/main/java/tools/jackson/databind/ser/impl/FilteredBeanPropertyWriter.java index d678011698..7595785f64 100644 --- a/src/main/java/tools/jackson/databind/ser/impl/FilteredBeanPropertyWriter.java +++ b/src/main/java/tools/jackson/databind/ser/impl/FilteredBeanPropertyWriter.java @@ -1,7 +1,7 @@ package tools.jackson.databind.ser.impl; import tools.jackson.core.JsonGenerator; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.ValueSerializer; import tools.jackson.databind.jsonFormatVisitors.JsonObjectFormatVisitor; import tools.jackson.databind.ser.BeanPropertyWriter; @@ -61,7 +61,7 @@ public void assignNullSerializer(ValueSerializer nullSer) { } @Override - public void serializeAsProperty(Object bean, JsonGenerator gen, SerializerProvider prov) + public void serializeAsProperty(Object bean, JsonGenerator gen, SerializationContext prov) throws Exception { Class activeView = prov.getActiveView(); @@ -73,7 +73,7 @@ public void serializeAsProperty(Object bean, JsonGenerator gen, SerializerProvid } @Override - public void serializeAsElement(Object bean, JsonGenerator gen, SerializerProvider prov) + public void serializeAsElement(Object bean, JsonGenerator gen, SerializationContext prov) throws Exception { Class activeView = prov.getActiveView(); @@ -86,7 +86,7 @@ public void serializeAsElement(Object bean, JsonGenerator gen, SerializerProvide @Override public void depositSchemaProperty(JsonObjectFormatVisitor v, - SerializerProvider provider) + SerializationContext provider) { Class activeView = provider.getActiveView(); if (activeView == null || _view.isAssignableFrom(activeView)) { @@ -127,7 +127,7 @@ public void assignNullSerializer(ValueSerializer nullSer) { } @Override - public void serializeAsProperty(Object bean, JsonGenerator gen, SerializerProvider prov) + public void serializeAsProperty(Object bean, JsonGenerator gen, SerializationContext prov) throws Exception { if (_inView(prov.getActiveView())) { @@ -138,7 +138,7 @@ public void serializeAsProperty(Object bean, JsonGenerator gen, SerializerProvid } @Override - public void serializeAsElement(Object bean, JsonGenerator gen, SerializerProvider prov) + public void serializeAsElement(Object bean, JsonGenerator gen, SerializationContext prov) throws Exception { if (_inView(prov.getActiveView())) { @@ -150,7 +150,7 @@ public void serializeAsElement(Object bean, JsonGenerator gen, SerializerProvide @Override public void depositSchemaProperty(JsonObjectFormatVisitor v, - SerializerProvider provider) + SerializationContext provider) { if (_inView(provider.getActiveView())) { super.depositSchemaProperty(v, provider); diff --git a/src/main/java/tools/jackson/databind/ser/impl/ObjectIdWriter.java b/src/main/java/tools/jackson/databind/ser/impl/ObjectIdWriter.java index f094e40471..a81ad66423 100644 --- a/src/main/java/tools/jackson/databind/ser/impl/ObjectIdWriter.java +++ b/src/main/java/tools/jackson/databind/ser/impl/ObjectIdWriter.java @@ -22,7 +22,7 @@ public final class ObjectIdWriter /** * Blueprint generator instance: actual instance will be - * fetched from {@link SerializerProvider} using this as + * fetched from {@link SerializationContext} using this as * the key. */ public final ObjectIdGenerator generator; diff --git a/src/main/java/tools/jackson/databind/ser/impl/PropertySerializerMap.java b/src/main/java/tools/jackson/databind/ser/impl/PropertySerializerMap.java index 14d55bf318..f684ebfa8a 100644 --- a/src/main/java/tools/jackson/databind/ser/impl/PropertySerializerMap.java +++ b/src/main/java/tools/jackson/databind/ser/impl/PropertySerializerMap.java @@ -5,7 +5,7 @@ import tools.jackson.databind.BeanProperty; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.ValueSerializer; /** @@ -52,7 +52,7 @@ protected PropertySerializerMap(PropertySerializerMap base) { * and construct new map instance if warranted, and return both. */ public final SerializerAndMapResult findAndAddPrimarySerializer(JavaType type, - SerializerProvider provider, BeanProperty property) + SerializationContext provider, BeanProperty property) { ValueSerializer serializer = provider.findPrimaryPropertySerializer(type, property); return new SerializerAndMapResult(serializer, newWith(type.getRawClass(), serializer)); @@ -65,21 +65,21 @@ public final SerializerAndMapResult findAndAddPrimarySerializer(JavaType type, * and construct new map instance if warranted, and return both. */ public final SerializerAndMapResult findAndAddSecondarySerializer(Class type, - SerializerProvider provider, BeanProperty property) + SerializationContext provider, BeanProperty property) { ValueSerializer serializer = provider.findContentValueSerializer(type, property); return new SerializerAndMapResult(serializer, newWith(type, serializer)); } public final SerializerAndMapResult findAndAddSecondarySerializer(JavaType type, - SerializerProvider provider, BeanProperty property) + SerializationContext provider, BeanProperty property) { ValueSerializer serializer = provider.findContentValueSerializer(type, property); return new SerializerAndMapResult(serializer, newWith(type.getRawClass(), serializer)); } public final SerializerAndMapResult findAndAddSecondarySerializer(Class type, - SerializerProvider provider, BeanProperty property, + SerializationContext provider, BeanProperty property, UnaryOperator> serTransformer) { ValueSerializer serializer = provider.findContentValueSerializer(type, property); @@ -88,7 +88,7 @@ public final SerializerAndMapResult findAndAddSecondarySerializer(Class type, } public final SerializerAndMapResult findAndAddSecondarySerializer(JavaType type, - SerializerProvider provider, BeanProperty property, + SerializationContext provider, BeanProperty property, UnaryOperator> serTransformer) { ValueSerializer serializer = provider.findContentValueSerializer(type, property); @@ -104,14 +104,14 @@ public final SerializerAndMapResult findAndAddSecondarySerializer(JavaType type, * and construct new map instance if warranted, and return both. */ public final SerializerAndMapResult findAndAddRootValueSerializer(Class type, - SerializerProvider provider) + SerializationContext provider) { ValueSerializer serializer = provider.findTypedValueSerializer(type, false); return new SerializerAndMapResult(serializer, newWith(type, serializer)); } public final SerializerAndMapResult findAndAddRootValueSerializer(JavaType type, - SerializerProvider provider) + SerializationContext provider) { ValueSerializer serializer = provider.findTypedValueSerializer(type, false); return new SerializerAndMapResult(serializer, newWith(type.getRawClass(), serializer)); @@ -124,7 +124,7 @@ public final SerializerAndMapResult findAndAddRootValueSerializer(JavaType type, * and construct new map instance if warranted, and return both. */ public final SerializerAndMapResult findAndAddKeySerializer(Class type, - SerializerProvider provider, BeanProperty property) + SerializationContext provider, BeanProperty property) { ValueSerializer serializer = provider.findKeySerializer(type, property); return new SerializerAndMapResult(serializer, newWith(type, serializer)); diff --git a/src/main/java/tools/jackson/databind/ser/impl/TypeWrappedSerializer.java b/src/main/java/tools/jackson/databind/ser/impl/TypeWrappedSerializer.java index a6d051be12..eda9859276 100644 --- a/src/main/java/tools/jackson/databind/ser/impl/TypeWrappedSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/impl/TypeWrappedSerializer.java @@ -25,12 +25,12 @@ public TypeWrappedSerializer(TypeSerializer typeSer, ValueSerializer ser) } @Override - public void serialize(Object value, JsonGenerator g, SerializerProvider provider) throws JacksonException { + public void serialize(Object value, JsonGenerator g, SerializationContext provider) throws JacksonException { _serializer.serializeWithType(value, g, provider, _typeSerializer); } @Override - public void serializeWithType(Object value, JsonGenerator g, SerializerProvider provider, + public void serializeWithType(Object value, JsonGenerator g, SerializationContext provider, TypeSerializer typeSer) throws JacksonException { // Is this an erroneous call? For now, let's assume it is not, and @@ -48,7 +48,7 @@ public void serializeWithType(Object value, JsonGenerator g, SerializerProvider */ @Override - public ValueSerializer createContextual(SerializerProvider provider, BeanProperty property) + public ValueSerializer createContextual(SerializationContext provider, BeanProperty property) { // 13-Mar-2017, tatu: Should we call `TypeSerializer.forProperty()`? ValueSerializer ser = _serializer; diff --git a/src/main/java/tools/jackson/databind/ser/impl/UnknownSerializer.java b/src/main/java/tools/jackson/databind/ser/impl/UnknownSerializer.java index 8a53b7fdaf..2a5d175bf6 100644 --- a/src/main/java/tools/jackson/databind/ser/impl/UnknownSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/impl/UnknownSerializer.java @@ -18,7 +18,7 @@ public UnknownSerializer(Class cls) { } @Override - public void serialize(Object value, JsonGenerator gen, SerializerProvider ctxt) throws JacksonException + public void serialize(Object value, JsonGenerator gen, SerializationContext ctxt) throws JacksonException { // 27-Nov-2009, tatu: As per [JACKSON-201] may or may not fail... if (ctxt.isEnabled(SerializationFeature.FAIL_ON_EMPTY_BEANS)) { @@ -28,7 +28,7 @@ public void serialize(Object value, JsonGenerator gen, SerializerProvider ctxt) } @Override - public final void serializeWithType(Object value, JsonGenerator gen, SerializerProvider ctxt, + public final void serializeWithType(Object value, JsonGenerator gen, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { if (ctxt.isEnabled(SerializationFeature.FAIL_ON_EMPTY_BEANS)) { @@ -38,11 +38,11 @@ public final void serializeWithType(Object value, JsonGenerator gen, SerializerP } @Override - public boolean isEmpty(SerializerProvider provider, Object value) { + public boolean isEmpty(SerializationContext provider, Object value) { return true; } - protected void failForEmpty(SerializerProvider prov, Object value) + protected void failForEmpty(SerializationContext prov, Object value) { final Class cl = value.getClass(); if (NativeImageUtil.needsReflectionConfiguration(cl)) { diff --git a/src/main/java/tools/jackson/databind/ser/impl/UnsupportedTypeSerializer.java b/src/main/java/tools/jackson/databind/ser/impl/UnsupportedTypeSerializer.java index 83aaecc9c2..f1e73fa500 100644 --- a/src/main/java/tools/jackson/databind/ser/impl/UnsupportedTypeSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/impl/UnsupportedTypeSerializer.java @@ -2,7 +2,7 @@ import tools.jackson.core.*; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.ser.std.StdSerializer; /** @@ -26,7 +26,7 @@ public UnsupportedTypeSerializer(JavaType t, String msg) { } @Override - public void serialize(Object value, JsonGenerator g, SerializerProvider ctxt) throws JacksonException { + public void serialize(Object value, JsonGenerator g, SerializationContext ctxt) throws JacksonException { ctxt.reportBadDefinition(_type, _message); } } diff --git a/src/main/java/tools/jackson/databind/ser/jackson/JacksonSerializableSerializer.java b/src/main/java/tools/jackson/databind/ser/jackson/JacksonSerializableSerializer.java index 642bfd2946..6494ede958 100644 --- a/src/main/java/tools/jackson/databind/ser/jackson/JacksonSerializableSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jackson/JacksonSerializableSerializer.java @@ -3,7 +3,7 @@ import tools.jackson.core.*; import tools.jackson.databind.JacksonSerializable; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.annotation.JacksonStdImpl; import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper; import tools.jackson.databind.jsontype.TypeSerializer; @@ -26,7 +26,7 @@ public class JacksonSerializableSerializer protected JacksonSerializableSerializer() { super(JacksonSerializable.class); } @Override - public boolean isEmpty(SerializerProvider serializers, JacksonSerializable value) { + public boolean isEmpty(SerializationContext serializers, JacksonSerializable value) { if (value instanceof JacksonSerializable.Base) { return ((JacksonSerializable.Base) value).isEmpty(serializers); } @@ -34,14 +34,14 @@ public boolean isEmpty(SerializerProvider serializers, JacksonSerializable value } @Override - public void serialize(JacksonSerializable value, JsonGenerator gen, SerializerProvider serializers) + public void serialize(JacksonSerializable value, JsonGenerator gen, SerializationContext serializers) throws JacksonException { value.serialize(gen, serializers); } @Override - public final void serializeWithType(JacksonSerializable value, JsonGenerator gen, SerializerProvider serializers, + public final void serializeWithType(JacksonSerializable value, JsonGenerator gen, SerializationContext serializers, TypeSerializer typeSer) throws JacksonException { value.serializeWithType(gen, serializers, typeSer); 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 f4c354e388..7106b7a184 100644 --- a/src/main/java/tools/jackson/databind/ser/jackson/JsonValueSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jackson/JsonValueSerializer.java @@ -128,7 +128,7 @@ public JsonValueSerializer withResolved(BeanProperty property, */ @Override // since 2.12 - public boolean isEmpty(SerializerProvider ctxt, Object bean) + public boolean isEmpty(SerializationContext ctxt, Object bean) { // 31-Oct-2020, tatu: Should perhaps catch access issue here... ? Object referenced = _accessor.getValue(bean); @@ -153,7 +153,7 @@ public boolean isEmpty(SerializerProvider ctxt, Object bean) * statically figure out what the result type must be. */ @Override - public ValueSerializer createContextual(SerializerProvider ctxt, + public ValueSerializer createContextual(SerializationContext ctxt, BeanProperty property) { TypeSerializer vts = _valueTypeSerializer; @@ -203,7 +203,7 @@ public ValueSerializer createContextual(SerializerProvider ctxt, @Override public void serialize(final Object bean, final JsonGenerator gen, - final SerializerProvider ctxt) + final SerializationContext ctxt) throws JacksonException { Object value; @@ -228,7 +228,7 @@ public void serialize(final Object bean, final JsonGenerator gen, } } - protected ValueSerializer _findSerializer(SerializerProvider ctxt, Object value) { + protected ValueSerializer _findSerializer(SerializationContext ctxt, Object value) { final UnaryOperator> serTransformer = valueSer -> _withIgnoreProperties(valueSer, _ignoredProperties); Class cc = value.getClass(); @@ -261,7 +261,7 @@ protected static ValueSerializer _withIgnoreProperties(ValueSerializer cls) { } @Override - public void serialize(T value, JsonGenerator g, SerializerProvider ctxt) throws JacksonException { + public void serialize(T value, JsonGenerator g, SerializationContext ctxt) throws JacksonException { g.writeRawValue(value.toString()); } @Override - public void serializeWithType(T value, JsonGenerator g, SerializerProvider ctxt, + public void serializeWithType(T value, JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { diff --git a/src/main/java/tools/jackson/databind/ser/jackson/TokenBufferSerializer.java b/src/main/java/tools/jackson/databind/ser/jackson/TokenBufferSerializer.java index dd3f4bb37c..938b7b06c4 100644 --- a/src/main/java/tools/jackson/databind/ser/jackson/TokenBufferSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jackson/TokenBufferSerializer.java @@ -3,7 +3,7 @@ import tools.jackson.core.*; import tools.jackson.core.type.WritableTypeId; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.annotation.JacksonStdImpl; import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper; import tools.jackson.databind.jsontype.TypeSerializer; @@ -23,7 +23,7 @@ public class TokenBufferSerializer public TokenBufferSerializer() { super(TokenBuffer.class); } @Override - public void serialize(TokenBuffer value, JsonGenerator jgen, SerializerProvider provider) + public void serialize(TokenBuffer value, JsonGenerator jgen, SerializationContext provider) throws JacksonException { value.serialize(jgen); @@ -40,7 +40,7 @@ public void serialize(TokenBuffer value, JsonGenerator jgen, SerializerProvider * than doing introspection on both serialization and deserialization. */ @Override - public final void serializeWithType(TokenBuffer value, JsonGenerator g, SerializerProvider ctxt, + public final void serializeWithType(TokenBuffer value, JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { diff --git a/src/main/java/tools/jackson/databind/ser/jdk/BooleanSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/BooleanSerializer.java index fc1c64d326..7f18b3ab92 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/BooleanSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/BooleanSerializer.java @@ -35,7 +35,7 @@ public BooleanSerializer(boolean forPrimitive) { } @Override - public ValueSerializer createContextual(SerializerProvider serializers, + public ValueSerializer createContextual(SerializationContext serializers, BeanProperty property) { // 16-Mar-2021, tatu: As per [databind#3080], was passing wrapper type @@ -55,13 +55,13 @@ public ValueSerializer createContextual(SerializerProvider serializers, } @Override - public void serialize(Object value, JsonGenerator g, SerializerProvider provider) + public void serialize(Object value, JsonGenerator g, SerializationContext provider) throws JacksonException { g.writeBoolean(Boolean.TRUE.equals(value)); } @Override - public final void serializeWithType(Object value, JsonGenerator g, SerializerProvider provider, + public final void serializeWithType(Object value, JsonGenerator g, SerializationContext provider, TypeSerializer typeSer) throws JacksonException { g.writeBoolean(Boolean.TRUE.equals(value)); @@ -91,7 +91,7 @@ public AsNumber(boolean forPrimitive) { } @Override - public ValueSerializer createContextual(SerializerProvider serializers, + public ValueSerializer createContextual(SerializationContext serializers, BeanProperty property) { JsonFormat.Value format = findFormatOverrides(serializers, @@ -106,14 +106,14 @@ public ValueSerializer createContextual(SerializerProvider serializers, } @Override - public void serialize(Object value, JsonGenerator g, SerializerProvider provider) + public void serialize(Object value, JsonGenerator g, SerializationContext provider) throws JacksonException { g.writeNumber((Boolean.FALSE.equals(value)) ? 0 : 1); } @Override - public final void serializeWithType(Object value, JsonGenerator g, SerializerProvider provider, + public final void serializeWithType(Object value, JsonGenerator g, SerializationContext provider, TypeSerializer typeSer) throws JacksonException { diff --git a/src/main/java/tools/jackson/databind/ser/jdk/ByteArraySerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/ByteArraySerializer.java index 65a0031094..42d4507ff8 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/ByteArraySerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/ByteArraySerializer.java @@ -5,7 +5,7 @@ import tools.jackson.core.JsonToken; import tools.jackson.core.type.WritableTypeId; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.annotation.JacksonStdImpl; import tools.jackson.databind.jsonFormatVisitors.JsonArrayFormatVisitor; import tools.jackson.databind.jsonFormatVisitors.JsonFormatTypes; @@ -31,12 +31,12 @@ public ByteArraySerializer() { } @Override - public boolean isEmpty(SerializerProvider prov, byte[] value) { + public boolean isEmpty(SerializationContext prov, byte[] value) { return value.length == 0; } @Override - public void serialize(byte[] value, JsonGenerator g, SerializerProvider provider) + public void serialize(byte[] value, JsonGenerator g, SerializationContext provider) throws JacksonException { g.writeBinary(provider.getConfig().getBase64Variant(), @@ -44,7 +44,7 @@ public void serialize(byte[] value, JsonGenerator g, SerializerProvider provider } @Override - public void serializeWithType(byte[] value, JsonGenerator g, SerializerProvider ctxt, + public void serializeWithType(byte[] value, JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { diff --git a/src/main/java/tools/jackson/databind/ser/jdk/ByteBufferSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/ByteBufferSerializer.java index d4dc2f4e4e..7bc722b654 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/ByteBufferSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/ByteBufferSerializer.java @@ -15,7 +15,7 @@ public class ByteBufferSerializer extends StdScalarSerializer public ByteBufferSerializer() { super(ByteBuffer.class); } @Override - public void serialize(ByteBuffer bbuf, JsonGenerator gen, SerializerProvider provider) + public void serialize(ByteBuffer bbuf, JsonGenerator gen, SerializationContext provider) throws JacksonException { // first, simple case when wrapping an array... diff --git a/src/main/java/tools/jackson/databind/ser/jdk/CollectionSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/CollectionSerializer.java index 6ea45c836e..17313b854d 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/CollectionSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/CollectionSerializer.java @@ -7,7 +7,7 @@ import tools.jackson.databind.BeanProperty; import tools.jackson.databind.JavaType; import tools.jackson.databind.SerializationFeature; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.ValueSerializer; import tools.jackson.databind.jsontype.TypeSerializer; import tools.jackson.databind.ser.impl.PropertySerializerMap; @@ -60,7 +60,7 @@ public CollectionSerializer withResolved(BeanProperty property, */ @Override - public boolean isEmpty(SerializerProvider prov, Collection value) { + public boolean isEmpty(SerializationContext prov, Collection value) { return value.isEmpty(); } @@ -76,7 +76,7 @@ public boolean hasSingleElement(Collection value) { */ @Override - public final void serialize(Collection value, JsonGenerator g, SerializerProvider provider) + public final void serialize(Collection value, JsonGenerator g, SerializationContext provider) throws JacksonException { final int len = value.size(); @@ -94,7 +94,7 @@ public final void serialize(Collection value, JsonGenerator g, SerializerProv } @Override - public void serializeContents(Collection value, JsonGenerator g, SerializerProvider ctxt) + public void serializeContents(Collection value, JsonGenerator g, SerializationContext ctxt) throws JacksonException { if (_elementSerializer != null) { @@ -138,7 +138,7 @@ public void serializeContents(Collection value, JsonGenerator g, SerializerPr } } - public void serializeContentsUsing(Collection value, JsonGenerator g, SerializerProvider provider, + public void serializeContentsUsing(Collection value, JsonGenerator g, SerializationContext provider, ValueSerializer ser) throws JacksonException { 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 095ac21bef..f73a016856 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/DateTimeSerializerBase.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/DateTimeSerializerBase.java @@ -55,7 +55,7 @@ protected DateTimeSerializerBase(Class type, public abstract DateTimeSerializerBase withFormat(Boolean timestamp, DateFormat customFormat); @Override - public ValueSerializer createContextual(SerializerProvider serializers, + public ValueSerializer createContextual(SerializationContext serializers, BeanProperty property) { // Note! Should not skip if `property` null since that'd skip check @@ -135,7 +135,7 @@ public ValueSerializer createContextual(SerializerProvider serializers, */ @Override - public boolean isEmpty(SerializerProvider serializers, T value) { + public boolean isEmpty(SerializationContext serializers, T value) { // 09-Mar-2017, tatu: as per [databind#1550] timestamp 0 is NOT "empty"; but // with versions up to 2.8.x this was the case. Fixed for 2.9. // return _timestamp(value) == 0L; @@ -157,7 +157,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t */ @Override - public abstract void serialize(T value, JsonGenerator gen, SerializerProvider serializers) + public abstract void serialize(T value, JsonGenerator gen, SerializationContext serializers) throws JacksonException; /* @@ -166,7 +166,7 @@ public abstract void serialize(T value, JsonGenerator gen, SerializerProvider se /********************************************************** */ - protected boolean _asTimestamp(SerializerProvider serializers) + protected boolean _asTimestamp(SerializationContext serializers) { if (_useTimestamp != null) { return _useTimestamp; @@ -176,7 +176,7 @@ protected boolean _asTimestamp(SerializerProvider serializers) return serializers.isEnabled(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); } // 12-Jun-2014, tatu: Is it legal not to have provider? Was NPE:ing earlier so leave a check - throw new IllegalArgumentException("Null SerializerProvider passed for "+handledType().getName()); + throw new IllegalArgumentException("Null SerializationContext passed for "+handledType().getName()); } return false; } @@ -192,7 +192,7 @@ protected void _acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaTy } } - protected void _serializeAsString(Date value, JsonGenerator g, SerializerProvider provider) + protected void _serializeAsString(Date value, JsonGenerator g, SerializationContext provider) throws JacksonException { if (_customFormat == null) { 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 f07d764d3b..a19c4c3738 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/EnumSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/EnumSerializer.java @@ -92,7 +92,7 @@ public static EnumSerializer construct(Class enumClass, SerializationConfig c * choice here, however. */ @Override - public ValueSerializer createContextual(SerializerProvider ctxt, + public ValueSerializer createContextual(SerializationContext ctxt, BeanProperty property) { JsonFormat.Value format = findFormatOverrides(ctxt, @@ -124,7 +124,7 @@ public ValueSerializer createContextual(SerializerProvider ctxt, */ @Override - public final void serialize(Enum en, JsonGenerator g, SerializerProvider ctxt) + public final void serialize(Enum en, JsonGenerator g, SerializationContext ctxt) throws JacksonException { if (_valuesByEnumNaming != null) { @@ -153,7 +153,7 @@ public final void serialize(Enum en, JsonGenerator g, SerializerProvider ctxt @Override public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint) { - SerializerProvider serializers = visitor.getProvider(); + SerializationContext serializers = visitor.getProvider(); if (_serializeAsIndex(serializers)) { visitIntFormat(visitor, typeHint, JsonParser.NumberType.INT); return; @@ -184,7 +184,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t /********************************************************************** */ - protected final boolean _serializeAsIndex(SerializerProvider ctxt) + protected final boolean _serializeAsIndex(SerializationContext ctxt) { if (_serializeAsIndex != null) { return _serializeAsIndex; diff --git a/src/main/java/tools/jackson/databind/ser/jdk/EnumSetSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/EnumSetSerializer.java index b1abb8c189..31bdd70a0b 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/EnumSetSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/EnumSetSerializer.java @@ -34,7 +34,7 @@ public EnumSetSerializer withResolved(BeanProperty property, } @Override - public boolean isEmpty(SerializerProvider prov, EnumSet> value) { + public boolean isEmpty(SerializationContext prov, EnumSet> value) { return value.isEmpty(); } @@ -45,7 +45,7 @@ public boolean hasSingleElement(EnumSet> value) { @Override public final void serialize(EnumSet> value, JsonGenerator gen, - SerializerProvider provider) throws JacksonException + SerializationContext provider) throws JacksonException { final int len = value.size(); if (len == 1) { @@ -63,7 +63,7 @@ public final void serialize(EnumSet> value, JsonGenerator gen, @Override public void serializeContents(EnumSet> value, JsonGenerator gen, - SerializerProvider ctxt) + SerializationContext ctxt) throws JacksonException { ValueSerializer enumSer = _elementSerializer; diff --git a/src/main/java/tools/jackson/databind/ser/jdk/IndexedListSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/IndexedListSerializer.java index b725e7037b..2326acba28 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/IndexedListSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/IndexedListSerializer.java @@ -52,7 +52,7 @@ public IndexedListSerializer withResolved(BeanProperty property, */ @Override - public boolean isEmpty(SerializerProvider prov, Object value) { + public boolean isEmpty(SerializationContext prov, Object value) { return ((List)value).isEmpty(); } @@ -62,7 +62,7 @@ public boolean hasSingleElement(Object value) { } @Override - public final void serialize(Object value0, JsonGenerator gen, SerializerProvider provider) + public final void serialize(Object value0, JsonGenerator gen, SerializationContext provider) throws JacksonException { final List value = (List) value0; @@ -81,7 +81,7 @@ public final void serialize(Object value0, JsonGenerator gen, SerializerProvider } @Override - public void serializeContents(Object value0, JsonGenerator g, SerializerProvider ctxt) + public void serializeContents(Object value0, JsonGenerator g, SerializationContext ctxt) throws JacksonException { final List value = (List) value0; @@ -123,7 +123,7 @@ public void serializeContents(Object value0, JsonGenerator g, SerializerProvider } } - public void serializeContentsUsing(List value, JsonGenerator jgen, SerializerProvider provider, + public void serializeContentsUsing(List value, JsonGenerator jgen, SerializationContext provider, ValueSerializer ser) throws JacksonException { @@ -149,7 +149,7 @@ public void serializeContentsUsing(List value, JsonGenerator jgen, Serializer } } - public void serializeTypedContents(List value, JsonGenerator g, SerializerProvider ctxt) + public void serializeTypedContents(List value, JsonGenerator g, SerializationContext ctxt) throws JacksonException { final int len = value.size(); diff --git a/src/main/java/tools/jackson/databind/ser/jdk/IndexedStringListSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/IndexedStringListSerializer.java index d79c489510..41f7ce62ae 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/IndexedStringListSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/IndexedStringListSerializer.java @@ -58,7 +58,7 @@ protected void acceptContentVisitor(JsonArrayFormatVisitor visitor) { @Override public void serialize(List value, JsonGenerator g, - SerializerProvider provider) throws JacksonException + SerializationContext provider) throws JacksonException { final int len = value.size(); if (len == 1) { @@ -75,7 +75,7 @@ public void serialize(List value, JsonGenerator g, } @Override - public void serializeWithType(List value, JsonGenerator g, SerializerProvider ctxt, + public void serializeWithType(List value, JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { @@ -87,7 +87,7 @@ public void serializeWithType(List value, JsonGenerator g, SerializerPro } private final void serializeContents(List value, JsonGenerator g, - SerializerProvider provider, int len) throws JacksonException + SerializationContext provider, int len) throws JacksonException { int i = 0; try { diff --git a/src/main/java/tools/jackson/databind/ser/jdk/InetAddressSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/InetAddressSerializer.java index fad0bbc639..becb419ee1 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/InetAddressSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/InetAddressSerializer.java @@ -7,7 +7,7 @@ import tools.jackson.core.*; import tools.jackson.core.type.WritableTypeId; import tools.jackson.databind.BeanProperty; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.ValueSerializer; import tools.jackson.databind.jsontype.TypeSerializer; import tools.jackson.databind.ser.std.StdScalarSerializer; @@ -36,7 +36,7 @@ public InetAddressSerializer(boolean asNumeric) { } @Override - public ValueSerializer createContextual(SerializerProvider ctxt, + public ValueSerializer createContextual(SerializationContext ctxt, BeanProperty property) { JsonFormat.Value format = findFormatOverrides(ctxt, property, handledType()); @@ -54,7 +54,7 @@ public ValueSerializer createContextual(SerializerProvider ctxt, } @Override - public void serialize(InetAddress value, JsonGenerator g, SerializerProvider provider) + public void serialize(InetAddress value, JsonGenerator g, SerializationContext provider) throws JacksonException { String str; @@ -78,7 +78,7 @@ public void serialize(InetAddress value, JsonGenerator g, SerializerProvider pro @Override public void serializeWithType(InetAddress value, JsonGenerator g, - SerializerProvider ctxt, TypeSerializer typeSer) throws JacksonException + SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { // Better ensure we don't use specific sub-classes... WritableTypeId typeIdDef = typeSer.writeTypePrefix(g, ctxt, diff --git a/src/main/java/tools/jackson/databind/ser/jdk/InetSocketAddressSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/InetSocketAddressSerializer.java index 7e04dce38d..3e53970a43 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/InetSocketAddressSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/InetSocketAddressSerializer.java @@ -6,7 +6,7 @@ import tools.jackson.core.JsonGenerator; import tools.jackson.core.JsonToken; import tools.jackson.core.type.WritableTypeId; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsontype.TypeSerializer; import tools.jackson.databind.ser.std.StdScalarSerializer; @@ -19,7 +19,7 @@ public class InetSocketAddressSerializer public InetSocketAddressSerializer() { super(InetSocketAddress.class); } @Override - public void serialize(InetSocketAddress value, JsonGenerator jgen, SerializerProvider provider) + public void serialize(InetSocketAddress value, JsonGenerator jgen, SerializationContext provider) throws JacksonException { InetAddress addr = value.getAddress(); @@ -41,7 +41,7 @@ public void serialize(InetSocketAddress value, JsonGenerator jgen, SerializerPro @Override public void serializeWithType(InetSocketAddress value, JsonGenerator g, - SerializerProvider ctxt, TypeSerializer typeSer) + SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { // Better ensure we don't use specific sub-classes... diff --git a/src/main/java/tools/jackson/databind/ser/jdk/IterableSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/IterableSerializer.java index 75396486dd..cafde9ee98 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/IterableSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/IterableSerializer.java @@ -43,7 +43,7 @@ public IterableSerializer withResolved(BeanProperty property, */ @Override - public boolean isEmpty(SerializerProvider prov, Iterable value) { + public boolean isEmpty(SerializationContext prov, Iterable value) { // Not really good way to implement this, but has to do for now: return !value.iterator().hasNext(); } @@ -65,7 +65,7 @@ public boolean hasSingleElement(Iterable value) { @Override public final void serialize(Iterable value, JsonGenerator g, - SerializerProvider ctxt) throws JacksonException + SerializationContext ctxt) throws JacksonException { if (((_unwrapSingle == null) && ctxt.isEnabled(SerializationFeature.WRITE_SINGLE_ELEM_ARRAYS_UNWRAPPED)) @@ -82,7 +82,7 @@ public final void serialize(Iterable value, JsonGenerator g, @Override public void serializeContents(Iterable value, JsonGenerator g, - SerializerProvider ctxt) throws JacksonException + SerializationContext ctxt) throws JacksonException { Iterator it = value.iterator(); if (it.hasNext()) { diff --git a/src/main/java/tools/jackson/databind/ser/jdk/IteratorSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/IteratorSerializer.java index 41f207d15d..1062ceb765 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/IteratorSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/IteratorSerializer.java @@ -43,7 +43,7 @@ public IteratorSerializer withResolved(BeanProperty property, */ @Override - public boolean isEmpty(SerializerProvider prov, Iterator value) { + public boolean isEmpty(SerializationContext prov, Iterator value) { return !value.hasNext(); } @@ -55,7 +55,7 @@ public boolean hasSingleElement(Iterator value) { @Override public final void serialize(Iterator value, JsonGenerator gen, - SerializerProvider provider) + SerializationContext provider) throws JacksonException { // 02-Dec-2016, tatu: As per comments above, can't determine single element so... @@ -76,7 +76,7 @@ public final void serialize(Iterator value, JsonGenerator gen, @Override public void serializeContents(Iterator value, JsonGenerator g, - SerializerProvider provider) + SerializationContext provider) throws JacksonException { if (!value.hasNext()) { @@ -101,7 +101,7 @@ public void serializeContents(Iterator value, JsonGenerator g, } protected void _serializeDynamicContents(Iterator value, JsonGenerator g, - SerializerProvider ctxt) + SerializationContext ctxt) throws JacksonException { final TypeSerializer typeSer = _valueTypeSerializer; diff --git a/src/main/java/tools/jackson/databind/ser/jdk/JDKArraySerializers.java b/src/main/java/tools/jackson/databind/ser/jdk/JDKArraySerializers.java index 62f30ebcdd..6742fdf0c7 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/JDKArraySerializers.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/JDKArraySerializers.java @@ -125,7 +125,7 @@ public ValueSerializer getContentSerializer() { } @Override - public boolean isEmpty(SerializerProvider prov, boolean[] value) { + public boolean isEmpty(SerializationContext prov, boolean[] value) { return value.length == 0; } @@ -135,7 +135,7 @@ public boolean hasSingleElement(boolean[] value) { } @Override - public final void serialize(boolean[] value, JsonGenerator g, SerializerProvider provider) throws JacksonException + public final void serialize(boolean[] value, JsonGenerator g, SerializationContext provider) throws JacksonException { final int len = value.length; if ((len == 1) && _shouldUnwrapSingle(provider)) { @@ -148,7 +148,7 @@ public final void serialize(boolean[] value, JsonGenerator g, SerializerProvider } @Override - public void serializeContents(boolean[] value, JsonGenerator g, SerializerProvider provider) + public void serializeContents(boolean[] value, JsonGenerator g, SerializationContext provider) throws JacksonException { for (int i = 0, len = value.length; i < len; ++i) { @@ -192,7 +192,7 @@ public ValueSerializer getContentSerializer() { } @Override - public boolean isEmpty(SerializerProvider prov, short[] value) { + public boolean isEmpty(SerializationContext prov, short[] value) { return value.length == 0; } @@ -202,7 +202,7 @@ public boolean hasSingleElement(short[] value) { } @Override - public final void serialize(short[] value, JsonGenerator g, SerializerProvider provider) throws JacksonException + public final void serialize(short[] value, JsonGenerator g, SerializationContext provider) throws JacksonException { final int len = value.length; if ((len == 1) && _shouldUnwrapSingle(provider)) { @@ -215,7 +215,7 @@ public final void serialize(short[] value, JsonGenerator g, SerializerProvider p } @Override - public void serializeContents(short[] value, JsonGenerator g, SerializerProvider provider) + public void serializeContents(short[] value, JsonGenerator g, SerializationContext provider) throws JacksonException { for (int i = 0, len = value.length; i < len; ++i) { @@ -243,12 +243,12 @@ public static class CharArraySerializer extends StdSerializer public CharArraySerializer() { super(char[].class); } @Override - public boolean isEmpty(SerializerProvider prov, char[] value) { + public boolean isEmpty(SerializationContext prov, char[] value) { return value.length == 0; } @Override - public void serialize(char[] value, JsonGenerator g, SerializerProvider provider) + public void serialize(char[] value, JsonGenerator g, SerializationContext provider) throws JacksonException { // [JACKSON-289] allows serializing as 'sparse' char array too: @@ -262,7 +262,7 @@ public void serialize(char[] value, JsonGenerator g, SerializerProvider provider } @Override - public void serializeWithType(char[] value, JsonGenerator g, SerializerProvider ctxt, + public void serializeWithType(char[] value, JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { @@ -335,7 +335,7 @@ public ValueSerializer getContentSerializer() { } @Override - public boolean isEmpty(SerializerProvider prov, int[] value) { + public boolean isEmpty(SerializationContext prov, int[] value) { return value.length == 0; } @@ -345,7 +345,7 @@ public boolean hasSingleElement(int[] value) { } @Override - public final void serialize(int[] value, JsonGenerator g, SerializerProvider provider) throws JacksonException + public final void serialize(int[] value, JsonGenerator g, SerializationContext provider) throws JacksonException { final int len = value.length; if ((len == 1) && _shouldUnwrapSingle(provider)) { @@ -357,7 +357,7 @@ public final void serialize(int[] value, JsonGenerator g, SerializerProvider pro } @Override - public void serializeContents(int[] value, JsonGenerator g, SerializerProvider provider) + public void serializeContents(int[] value, JsonGenerator g, SerializationContext provider) throws JacksonException { for (int i = 0, len = value.length; i < len; ++i) { @@ -401,7 +401,7 @@ public ValueSerializer getContentSerializer() { } @Override - public boolean isEmpty(SerializerProvider prov, long[] value) { + public boolean isEmpty(SerializationContext prov, long[] value) { return value.length == 0; } @@ -411,7 +411,7 @@ public boolean hasSingleElement(long[] value) { } @Override - public final void serialize(long[] value, JsonGenerator g, SerializerProvider provider) throws JacksonException + public final void serialize(long[] value, JsonGenerator g, SerializationContext provider) throws JacksonException { final int len = value.length; if ((len == 1) && _shouldUnwrapSingle(provider)) { @@ -423,7 +423,7 @@ public final void serialize(long[] value, JsonGenerator g, SerializerProvider pr } @Override - public void serializeContents(long[] value, JsonGenerator g, SerializerProvider provider) + public void serializeContents(long[] value, JsonGenerator g, SerializationContext provider) throws JacksonException { for (int i = 0, len = value.length; i < len; ++i) { @@ -469,7 +469,7 @@ public ValueSerializer getContentSerializer() { } @Override - public boolean isEmpty(SerializerProvider prov, float[] value) { + public boolean isEmpty(SerializationContext prov, float[] value) { return value.length == 0; } @@ -479,7 +479,7 @@ public boolean hasSingleElement(float[] value) { } @Override - public final void serialize(float[] value, JsonGenerator g, SerializerProvider provider) throws JacksonException + public final void serialize(float[] value, JsonGenerator g, SerializationContext provider) throws JacksonException { final int len = value.length; if ((len == 1) && _shouldUnwrapSingle(provider)) { @@ -492,7 +492,7 @@ public final void serialize(float[] value, JsonGenerator g, SerializerProvider p } @Override - public void serializeContents(float[] value, JsonGenerator g, SerializerProvider provider) + public void serializeContents(float[] value, JsonGenerator g, SerializationContext provider) throws JacksonException { for (int i = 0, len = value.length; i < len; ++i) { @@ -549,7 +549,7 @@ public ValueSerializer getContentSerializer() { } @Override - public boolean isEmpty(SerializerProvider prov, double[] value) { + public boolean isEmpty(SerializationContext prov, double[] value) { return value.length == 0; } @@ -559,7 +559,7 @@ public boolean hasSingleElement(double[] value) { } @Override - public final void serialize(double[] value, JsonGenerator g, SerializerProvider provider) throws JacksonException + public final void serialize(double[] value, JsonGenerator g, SerializationContext provider) throws JacksonException { final int len = value.length; if ((len == 1) && _shouldUnwrapSingle(provider)) { @@ -571,7 +571,7 @@ public final void serialize(double[] value, JsonGenerator g, SerializerProvider } @Override - public void serializeContents(double[] value, JsonGenerator g, SerializerProvider provider) throws JacksonException + public void serializeContents(double[] value, JsonGenerator g, SerializationContext provider) throws JacksonException { for (int i = 0, len = value.length; i < len; ++i) { g.writeNumber(value[i]); diff --git a/src/main/java/tools/jackson/databind/ser/jdk/JDKKeySerializers.java b/src/main/java/tools/jackson/databind/ser/jdk/JDKKeySerializers.java index d5d43ccd11..8e796bb3d1 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/JDKKeySerializers.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/JDKKeySerializers.java @@ -137,7 +137,7 @@ public Default(int typeId, Class type) { } @Override - public void serialize(Object value, JsonGenerator g, SerializerProvider provider) + public void serialize(Object value, JsonGenerator g, SerializationContext provider) throws JacksonException { switch (_typeId) { @@ -206,7 +206,7 @@ Object readResolve() { } @Override - public void serialize(Object value, JsonGenerator g, SerializerProvider provider) + public void serialize(Object value, JsonGenerator g, SerializationContext provider) throws JacksonException { Class cls = value.getClass(); @@ -224,7 +224,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t } protected ValueSerializer _findAndAddDynamic(PropertySerializerMap map, - Class type, SerializerProvider provider) + Class type, SerializationContext provider) { // 27-Jun-2017, tatu: [databind#1679] Need to avoid StackOverflowError... if (type == Object.class) { @@ -252,7 +252,7 @@ public static class StringKeySerializer extends StdSerializer public StringKeySerializer() { super(String.class); } @Override - public void serialize(Object value, JsonGenerator g, SerializerProvider provider) + public void serialize(Object value, JsonGenerator g, SerializationContext provider) throws JacksonException { g.writeName((String) value); @@ -296,7 +296,7 @@ public static EnumKeySerializer construct(Class enumType, } @Override - public void serialize(Object value, JsonGenerator g, SerializerProvider serializers) + public void serialize(Object value, JsonGenerator g, SerializationContext serializers) throws JacksonException { if (serializers.isEnabled(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)) { diff --git a/src/main/java/tools/jackson/databind/ser/jdk/JDKMiscSerializers.java b/src/main/java/tools/jackson/databind/ser/jdk/JDKMiscSerializers.java index 1d7f66d607..f06ef3c912 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/JDKMiscSerializers.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/JDKMiscSerializers.java @@ -65,7 +65,7 @@ public static class AtomicBooleanSerializer public AtomicBooleanSerializer() { super(AtomicBoolean.class, false); } @Override - public void serialize(AtomicBoolean value, JsonGenerator gen, SerializerProvider provider) throws JacksonException { + public void serialize(AtomicBoolean value, JsonGenerator gen, SerializationContext provider) throws JacksonException { gen.writeBoolean(value.get()); } @@ -81,7 +81,7 @@ public static class AtomicIntegerSerializer public AtomicIntegerSerializer() { super(AtomicInteger.class, false); } @Override - public void serialize(AtomicInteger value, JsonGenerator gen, SerializerProvider provider) throws JacksonException { + public void serialize(AtomicInteger value, JsonGenerator gen, SerializationContext provider) throws JacksonException { gen.writeNumber(value.get()); } @@ -98,7 +98,7 @@ public static class AtomicLongSerializer public AtomicLongSerializer() { super(AtomicLong.class, false); } @Override - public void serialize(AtomicLong value, JsonGenerator gen, SerializerProvider provider) throws JacksonException { + public void serialize(AtomicLong value, JsonGenerator gen, SerializationContext provider) throws JacksonException { gen.writeNumber(value.get()); } diff --git a/src/main/java/tools/jackson/databind/ser/jdk/JDKStringLikeSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/JDKStringLikeSerializer.java index d0090fbaf4..406afc9031 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/JDKStringLikeSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/JDKStringLikeSerializer.java @@ -67,12 +67,12 @@ public static final ValueSerializer find(Class raw) } @Override - public boolean isEmpty(SerializerProvider prov, Object value) { + public boolean isEmpty(SerializationContext prov, Object value) { return value.toString().isEmpty(); } @Override - public void serialize(Object value, JsonGenerator g, SerializerProvider provider) + public void serialize(Object value, JsonGenerator g, SerializationContext provider) throws JacksonException { String str; @@ -112,7 +112,7 @@ public void serialize(Object value, JsonGenerator g, SerializerProvider provider * change this behavior. */ @Override - public void serializeWithType(Object value, JsonGenerator g, SerializerProvider ctxt, + public void serializeWithType(Object value, JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { diff --git a/src/main/java/tools/jackson/databind/ser/jdk/JavaUtilCalendarSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/JavaUtilCalendarSerializer.java index 3fdf970f10..c24c499ea7 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/JavaUtilCalendarSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/JavaUtilCalendarSerializer.java @@ -4,7 +4,7 @@ import java.util.Calendar; import tools.jackson.core.*; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.annotation.JacksonStdImpl; /** @@ -37,7 +37,7 @@ protected long _timestamp(Calendar value) { } @Override - public void serialize(Calendar value, JsonGenerator g, SerializerProvider provider) + public void serialize(Calendar value, JsonGenerator g, SerializationContext provider) throws JacksonException { if (_asTimestamp(provider)) { diff --git a/src/main/java/tools/jackson/databind/ser/jdk/JavaUtilDateSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/JavaUtilDateSerializer.java index 2b8c83f80c..f15cf2c1ee 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/JavaUtilDateSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/JavaUtilDateSerializer.java @@ -42,7 +42,7 @@ protected long _timestamp(Date value) { } @Override - public void serialize(Date value, JsonGenerator g, SerializerProvider provider) + public void serialize(Date value, JsonGenerator g, SerializationContext provider) throws JacksonException { if (_asTimestamp(provider)) { diff --git a/src/main/java/tools/jackson/databind/ser/jdk/MapEntrySerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/MapEntrySerializer.java index dc6e0ec383..f945ad4da9 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/MapEntrySerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/MapEntrySerializer.java @@ -136,7 +136,7 @@ public MapEntrySerializer withContentInclusion(Object suppressableValue, } @Override - public ValueSerializer createContextual(SerializerProvider provider, + public ValueSerializer createContextual(SerializationContext provider, BeanProperty property) { ValueSerializer ser = null; @@ -247,7 +247,7 @@ public boolean hasSingleElement(Map.Entry value) { } @Override - public boolean isEmpty(SerializerProvider ctxt, Entry entry) + public boolean isEmpty(SerializationContext ctxt, Entry entry) { Object value = entry.getValue(); if (value == null) { @@ -279,7 +279,7 @@ public boolean isEmpty(SerializerProvider ctxt, Entry entry) */ @Override - public void serialize(Map.Entry value, JsonGenerator g, SerializerProvider ctxt) + public void serialize(Map.Entry value, JsonGenerator g, SerializationContext ctxt) throws JacksonException { g.writeStartObject(value); @@ -289,7 +289,7 @@ public void serialize(Map.Entry value, JsonGenerator g, SerializerProvider @Override public void serializeWithType(Map.Entry value, JsonGenerator g, - SerializerProvider ctxt, TypeSerializer typeSer) + SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { // [databind#631]: Assign current value, to be accessible by custom serializers @@ -301,7 +301,7 @@ public void serializeWithType(Map.Entry value, JsonGenerator g, } protected void serializeDynamic(Map.Entry value, JsonGenerator gen, - SerializerProvider ctxt) + SerializationContext ctxt) throws JacksonException { final TypeSerializer vts = _valueTypeSerializer; diff --git a/src/main/java/tools/jackson/databind/ser/jdk/MapProperty.java b/src/main/java/tools/jackson/databind/ser/jdk/MapProperty.java index 78278c46c7..4ba4d17531 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/MapProperty.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/MapProperty.java @@ -82,7 +82,7 @@ public A getContextAnnotation(Class acls) { @Override public void serializeAsProperty(Object map, JsonGenerator gen, - SerializerProvider provider) + SerializationContext provider) { _keySerializer.serialize(_key, gen, provider); if (_typeSerializer == null) { @@ -94,7 +94,7 @@ public void serializeAsProperty(Object map, JsonGenerator gen, @Override public void serializeAsOmittedProperty(Object map, JsonGenerator gen, - SerializerProvider provider) + SerializationContext provider) { if (!gen.canOmitProperties()) { gen.writeOmittedProperty(getName()); @@ -103,7 +103,7 @@ public void serializeAsOmittedProperty(Object map, JsonGenerator gen, @Override public void serializeAsElement(Object map, JsonGenerator gen, - SerializerProvider provider) + SerializationContext provider) { if (_typeSerializer == null) { _valueSerializer.serialize(_value, gen, provider); @@ -114,7 +114,7 @@ public void serializeAsElement(Object map, JsonGenerator gen, @Override public void serializeAsOmittedElement(Object value, JsonGenerator gen, - SerializerProvider provider) + SerializationContext provider) { gen.writeNull(); } @@ -127,7 +127,7 @@ public void serializeAsOmittedElement(Object value, JsonGenerator gen, @Override public void depositSchemaProperty(JsonObjectFormatVisitor objectVisitor, - SerializerProvider provider) + SerializationContext provider) { _property.depositSchemaProperty(objectVisitor, provider); } 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 0eb39bb04d..406e4b9885 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/MapSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/MapSerializer.java @@ -321,7 +321,7 @@ protected void _ensureOverride(String method) { */ @Override - public ValueSerializer createContextual(SerializerProvider ctxt, + public ValueSerializer createContextual(SerializationContext ctxt, BeanProperty property) { ValueSerializer ser = null; @@ -467,7 +467,7 @@ public ValueSerializer getContentSerializer() { } @Override - public boolean isEmpty(SerializerProvider prov, Map value) + public boolean isEmpty(SerializationContext prov, Map value) { if (value.isEmpty()) { return true; @@ -549,7 +549,7 @@ public ValueSerializer getKeySerializer() { */ @Override - public void serialize(Map value, JsonGenerator gen, SerializerProvider provider) + public void serialize(Map value, JsonGenerator gen, SerializationContext provider) throws JacksonException { gen.writeStartObject(value); @@ -558,7 +558,7 @@ public void serialize(Map value, JsonGenerator gen, SerializerProvider prov } @Override - public void serializeWithType(Map value, JsonGenerator gen, SerializerProvider ctxt, + public void serializeWithType(Map value, JsonGenerator gen, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { @@ -582,7 +582,7 @@ public void serializeWithType(Map value, JsonGenerator gen, SerializerProvi *

* NOTE: Public only since it also is called by {@code AnyGetterWriter}. */ - public void serializeWithoutTypeInfo(Map value, JsonGenerator gen, SerializerProvider ctxt) + public void serializeWithoutTypeInfo(Map value, JsonGenerator gen, SerializationContext ctxt) throws JacksonException { if (!value.isEmpty()) { @@ -617,7 +617,7 @@ public void serializeWithoutTypeInfo(Map value, JsonGenerator gen, Seriali * NOTE: {@code public} only because it is called by code from {@code Guava} * {@code TableSerializer} */ - public void serializeEntries(Map value, JsonGenerator gen, SerializerProvider provider) + public void serializeEntries(Map value, JsonGenerator gen, SerializationContext provider) throws JacksonException { // If value type needs polymorphic type handling, some more work needed: @@ -664,7 +664,7 @@ public void serializeEntries(Map value, JsonGenerator gen, SerializerProvid * NOTE: {@code public} because other similar methods are (no current known * external usage). */ - public void serializeOptionalFields(Map value, JsonGenerator gen, SerializerProvider provider, + public void serializeOptionalFields(Map value, JsonGenerator gen, SerializationContext provider, Object suppressableValue) throws JacksonException { @@ -730,7 +730,7 @@ public void serializeOptionalFields(Map value, JsonGenerator gen, Serialize * NOTE: {@code public} because other similar methods are (no current known * external usage). */ - public void serializeEntriesUsing(Map value, JsonGenerator gen, SerializerProvider provider, + public void serializeEntriesUsing(Map value, JsonGenerator gen, SerializationContext provider, ValueSerializer ser) throws JacksonException { @@ -772,7 +772,7 @@ public void serializeEntriesUsing(Map value, JsonGenerator gen, SerializerP * NOTE: {@code public} because other similar methods are (no current known * external usage). */ - public void serializeFilteredEntries(Map value, JsonGenerator gen, SerializerProvider provider, + public void serializeFilteredEntries(Map value, JsonGenerator gen, SerializationContext provider, PropertyFilter filter, Object suppressableValue) throws JacksonException @@ -834,7 +834,7 @@ public void serializeFilteredEntries(Map value, JsonGenerator gen, Serializ * NOTE: {@code public} because other similar methods are (no current known * external usage). */ - public void serializeTypedEntries(Map value, JsonGenerator gen, SerializerProvider provider, + public void serializeTypedEntries(Map value, JsonGenerator gen, SerializationContext provider, Object suppressableValue) throws JacksonException { @@ -894,7 +894,7 @@ public void serializeTypedEntries(Map value, JsonGenerator gen, SerializerP * * @param bean Enclosing POJO that has any-getter used to obtain "any properties" */ - public void serializeFilteredAnyProperties(SerializerProvider provider, JsonGenerator gen, + public void serializeFilteredAnyProperties(SerializationContext provider, JsonGenerator gen, Object bean, Map value, PropertyFilter filter, Object suppressableValue) throws JacksonException @@ -978,7 +978,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t */ protected Map _orderEntries(Map input, JsonGenerator gen, - SerializerProvider provider) throws JacksonException + SerializationContext provider) throws JacksonException { // minor optimization: may already be sorted? if (input instanceof SortedMap) { @@ -1036,7 +1036,7 @@ protected boolean _hasNullKey(Map input) { return (input instanceof HashMap) && input.containsKey(null); } - protected void _writeNullKeyedEntry(JsonGenerator g, SerializerProvider ctxt, + protected void _writeNullKeyedEntry(JsonGenerator g, SerializationContext ctxt, Object value) throws JacksonException { ValueSerializer keySerializer = ctxt.findNullKeySerializer(_keyType, _property); @@ -1069,7 +1069,7 @@ protected void _writeNullKeyedEntry(JsonGenerator g, SerializerProvider ctxt, } } - private final ValueSerializer _findSerializer(SerializerProvider ctxt, + private final ValueSerializer _findSerializer(SerializationContext ctxt, Object value) { final Class cc = value.getClass(); diff --git a/src/main/java/tools/jackson/databind/ser/jdk/NumberSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/NumberSerializer.java index d7f38790ad..7b3b6e0712 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/NumberSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/NumberSerializer.java @@ -47,7 +47,7 @@ public NumberSerializer(Class rawType) { } @Override - public ValueSerializer createContextual(SerializerProvider prov, + public ValueSerializer createContextual(SerializationContext prov, BeanProperty property) { JsonFormat.Value format = findFormatOverrides(prov, property, handledType()); @@ -66,7 +66,7 @@ public ValueSerializer createContextual(SerializerProvider prov, } @Override - public void serialize(Number value, JsonGenerator g, SerializerProvider provider) throws JacksonException + public void serialize(Number value, JsonGenerator g, SerializationContext provider) throws JacksonException { // should mostly come in as one of these two: if (value instanceof BigDecimal) { @@ -122,14 +122,14 @@ public BigDecimalAsStringSerializer() { } @Override - public boolean isEmpty(SerializerProvider prov, Object value) { + public boolean isEmpty(SerializationContext prov, Object value) { // As per [databind#2513], should not delegate; also, never empty (numbers do // have "default value" to filter by, just not "empty" return false; } @Override - public void serialize(Object value, JsonGenerator gen, SerializerProvider provider) + public void serialize(Object value, JsonGenerator gen, SerializationContext provider) throws JacksonException { final String text; diff --git a/src/main/java/tools/jackson/databind/ser/jdk/NumberSerializers.java b/src/main/java/tools/jackson/databind/ser/jdk/NumberSerializers.java index c2865f6d2f..70c437920a 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/NumberSerializers.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/NumberSerializers.java @@ -84,7 +84,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, } @Override - public ValueSerializer createContextual(SerializerProvider prov, + public ValueSerializer createContextual(SerializationContext prov, BeanProperty property) { JsonFormat.Value format = findFormatOverrides(prov, property, handledType()); @@ -118,7 +118,7 @@ public ShortSerializer() { @Override public void serialize(Object value, JsonGenerator gen, - SerializerProvider provider) throws JacksonException { + SerializationContext provider) throws JacksonException { gen.writeNumber((Short) value); } } @@ -138,14 +138,14 @@ public IntegerSerializer(Class type) { @Override public void serialize(Object value, JsonGenerator gen, - SerializerProvider provider) throws JacksonException { + SerializationContext provider) throws JacksonException { gen.writeNumber((Integer) value); } // IMPORTANT: copied from `NonTypedScalarSerializerBase` @Override public void serializeWithType(Object value, JsonGenerator gen, - SerializerProvider provider, TypeSerializer typeSer) + SerializationContext provider, TypeSerializer typeSer) throws JacksonException { // no type info, just regular serialization serialize(value, gen, provider); @@ -167,7 +167,7 @@ public IntLikeSerializer() { @Override public void serialize(Object value, JsonGenerator gen, - SerializerProvider provider) throws JacksonException { + SerializationContext provider) throws JacksonException { gen.writeNumber(((Number) value).intValue()); } } @@ -180,7 +180,7 @@ public LongSerializer(Class cls) { @Override public void serialize(Object value, JsonGenerator gen, - SerializerProvider provider) throws JacksonException { + SerializationContext provider) throws JacksonException { gen.writeNumber((Long) value); } } @@ -195,7 +195,7 @@ public FloatSerializer() { @Override public void serialize(Object value, JsonGenerator gen, - SerializerProvider provider) throws JacksonException { + SerializationContext provider) throws JacksonException { gen.writeNumber((Float) value); } } @@ -215,7 +215,7 @@ public DoubleSerializer(Class cls) { @Override public void serialize(Object value, JsonGenerator gen, - SerializerProvider provider) throws JacksonException + SerializationContext provider) throws JacksonException { gen.writeNumber((Double) value); } @@ -223,7 +223,7 @@ public void serialize(Object value, JsonGenerator gen, // IMPORTANT: copied from `NonTypedScalarSerializerBase` @Override public void serializeWithType(Object value, JsonGenerator g, - SerializerProvider ctxt, TypeSerializer typeSer) + SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { // no type info, just regular serialization 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 302044d404..29807525de 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/ObjectArraySerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/ObjectArraySerializer.java @@ -106,7 +106,7 @@ public ObjectArraySerializer withResolved(BeanProperty prop, */ @Override - public ValueSerializer createContextual(SerializerProvider ctxt, + public ValueSerializer createContextual(SerializationContext ctxt, BeanProperty property) { TypeSerializer vts = _valueTypeSerializer; @@ -163,7 +163,7 @@ public ValueSerializer getContentSerializer() { } @Override - public boolean isEmpty(SerializerProvider prov, Object[] value) { + public boolean isEmpty(SerializationContext prov, Object[] value) { return value.length == 0; } @@ -179,7 +179,7 @@ public boolean hasSingleElement(Object[] value) { */ @Override - public final void serialize(Object[] value, JsonGenerator g, SerializerProvider ctxt) + public final void serialize(Object[] value, JsonGenerator g, SerializationContext ctxt) throws JacksonException { final int len = value.length; @@ -197,7 +197,7 @@ public final void serialize(Object[] value, JsonGenerator g, SerializerProvider } @Override - public void serializeContents(Object[] value, JsonGenerator g, SerializerProvider ctxt) + public void serializeContents(Object[] value, JsonGenerator g, SerializationContext ctxt) throws JacksonException { final int len = value.length; @@ -238,7 +238,7 @@ public void serializeContents(Object[] value, JsonGenerator g, SerializerProvide } } - public void serializeContentsUsing(Object[] value, JsonGenerator g, SerializerProvider provider, + public void serializeContentsUsing(Object[] value, JsonGenerator g, SerializationContext provider, ValueSerializer ser) throws JacksonException { final int len = value.length; @@ -264,7 +264,7 @@ public void serializeContentsUsing(Object[] value, JsonGenerator g, SerializerPr } } - public void serializeTypedContents(Object[] value, JsonGenerator g, SerializerProvider ctxt) + public void serializeTypedContents(Object[] value, JsonGenerator g, SerializationContext ctxt) throws JacksonException { final int len = value.length; diff --git a/src/main/java/tools/jackson/databind/ser/jdk/StaticListSerializerBase.java b/src/main/java/tools/jackson/databind/ser/jdk/StaticListSerializerBase.java index 00bbd597ae..e91b9fa0a9 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/StaticListSerializerBase.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/StaticListSerializerBase.java @@ -50,7 +50,7 @@ public abstract ValueSerializer _withResolved(BeanProperty prop, @SuppressWarnings("unchecked") @Override - public ValueSerializer createContextual(SerializerProvider serializers, + public ValueSerializer createContextual(SerializationContext serializers, BeanProperty property) { ValueSerializer ser = null; @@ -87,7 +87,7 @@ public ValueSerializer createContextual(SerializerProvider serializers, } @Override - public boolean isEmpty(SerializerProvider provider, T value) { + public boolean isEmpty(SerializationContext provider, T value) { return (value == null) || (value.isEmpty()); } @@ -112,5 +112,5 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t // just to make sure it gets implemented: @Override public abstract void serializeWithType(T value, JsonGenerator g, - SerializerProvider provider, TypeSerializer typeSer) throws JacksonException; + SerializationContext provider, TypeSerializer typeSer) throws JacksonException; } diff --git a/src/main/java/tools/jackson/databind/ser/jdk/StringArraySerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/StringArraySerializer.java index 701135fda0..ae084c07e9 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/StringArraySerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/StringArraySerializer.java @@ -75,7 +75,7 @@ public StdContainerSerializer _withValueTypeSerializer(TypeSerializer vts) { */ @Override - public ValueSerializer createContextual(SerializerProvider provider, + public ValueSerializer createContextual(SerializationContext provider, BeanProperty property) { // 29-Sep-2012, tatu: Actually, we need to do much more contextual @@ -132,7 +132,7 @@ public ValueSerializer getContentSerializer() { } @Override - public boolean isEmpty(SerializerProvider prov, String[] value) { + public boolean isEmpty(SerializationContext prov, String[] value) { return (value.length == 0); } @@ -148,7 +148,7 @@ public boolean hasSingleElement(String[] value) { */ @Override - public final void serialize(String[] value, JsonGenerator gen, SerializerProvider provider) + public final void serialize(String[] value, JsonGenerator gen, SerializationContext provider) throws JacksonException { final int len = value.length; @@ -166,7 +166,7 @@ public final void serialize(String[] value, JsonGenerator gen, SerializerProvide } @Override - public void serializeContents(String[] value, JsonGenerator gen, SerializerProvider provider) + public void serializeContents(String[] value, JsonGenerator gen, SerializationContext provider) throws JacksonException { final int len = value.length; @@ -187,7 +187,7 @@ public void serializeContents(String[] value, JsonGenerator gen, SerializerProvi } } - private void serializeContentsSlow(String[] value, JsonGenerator gen, SerializerProvider provider, ValueSerializer ser) + private void serializeContentsSlow(String[] value, JsonGenerator gen, SerializationContext provider, ValueSerializer ser) throws JacksonException { for (int i = 0, len = value.length; i < len; ++i) { diff --git a/src/main/java/tools/jackson/databind/ser/jdk/StringCollectionSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/StringCollectionSerializer.java index 0fee118578..c3747272d0 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/StringCollectionSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/StringCollectionSerializer.java @@ -62,7 +62,7 @@ protected void acceptContentVisitor(JsonArrayFormatVisitor visitor) { @Override public void serialize(Collection value, JsonGenerator g, - SerializerProvider provider) throws JacksonException + SerializationContext provider) throws JacksonException { final int len = value.size(); if (len == 1) { @@ -80,7 +80,7 @@ public void serialize(Collection value, JsonGenerator g, @Override public void serializeWithType(Collection value, JsonGenerator g, - SerializerProvider ctxt, TypeSerializer typeSer) + SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { WritableTypeId typeIdDef = typeSer.writeTypePrefix(g, ctxt, @@ -91,7 +91,7 @@ public void serializeWithType(Collection value, JsonGenerator g, } private final void serializeContents(Collection value, JsonGenerator g, - SerializerProvider provider) + SerializationContext provider) throws JacksonException { int i = 0; diff --git a/src/main/java/tools/jackson/databind/ser/jdk/StringSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/StringSerializer.java index 745dddc30b..b689b06f85 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/StringSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/StringSerializer.java @@ -2,7 +2,7 @@ import tools.jackson.core.*; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.annotation.JacksonStdImpl; import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper; import tools.jackson.databind.jsontype.TypeSerializer; @@ -23,20 +23,20 @@ public final class StringSerializer public StringSerializer() { super(String.class, false); } @Override - public boolean isEmpty(SerializerProvider prov, Object value) { + public boolean isEmpty(SerializationContext prov, Object value) { String str = (String) value; return str.isEmpty(); } @Override - public void serialize(Object value, JsonGenerator gen, SerializerProvider provider) + public void serialize(Object value, JsonGenerator gen, SerializationContext provider) throws JacksonException { gen.writeString((String) value); } @Override - public final void serializeWithType(Object value, JsonGenerator gen, SerializerProvider provider, + public final void serializeWithType(Object value, JsonGenerator gen, SerializationContext provider, TypeSerializer typeSer) throws JacksonException { diff --git a/src/main/java/tools/jackson/databind/ser/jdk/TimeZoneSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/TimeZoneSerializer.java index abd4cf0400..074e3a8374 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/TimeZoneSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/TimeZoneSerializer.java @@ -4,7 +4,7 @@ import tools.jackson.core.*; import tools.jackson.core.type.WritableTypeId; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsontype.TypeSerializer; import tools.jackson.databind.ser.std.StdScalarSerializer; @@ -13,14 +13,14 @@ public class TimeZoneSerializer extends StdScalarSerializer public TimeZoneSerializer() { super(TimeZone.class); } @Override - public void serialize(TimeZone value, JsonGenerator g, SerializerProvider provider) + public void serialize(TimeZone value, JsonGenerator g, SerializationContext provider) throws JacksonException { g.writeString(value.getID()); } @Override - public void serializeWithType(TimeZone value, JsonGenerator g, SerializerProvider ctxt, + public void serializeWithType(TimeZone value, JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { diff --git a/src/main/java/tools/jackson/databind/ser/jdk/UUIDSerializer.java b/src/main/java/tools/jackson/databind/ser/jdk/UUIDSerializer.java index 05f841c0e1..d319897eae 100644 --- a/src/main/java/tools/jackson/databind/ser/jdk/UUIDSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/jdk/UUIDSerializer.java @@ -40,7 +40,7 @@ protected UUIDSerializer(Boolean asBinary) { } @Override - public boolean isEmpty(SerializerProvider prov, UUID value) + public boolean isEmpty(SerializationContext prov, UUID value) { // Null UUID is empty, so... return value.getLeastSignificantBits() == 0L @@ -48,7 +48,7 @@ public boolean isEmpty(SerializerProvider prov, UUID value) } @Override - public ValueSerializer createContextual(SerializerProvider serializers, + public ValueSerializer createContextual(SerializationContext serializers, BeanProperty property) { JsonFormat.Value format = findFormatOverrides(serializers, @@ -71,7 +71,7 @@ public ValueSerializer createContextual(SerializerProvider serializers, } @Override - public void serialize(UUID value, JsonGenerator gen, SerializerProvider ctxt) + public void serialize(UUID value, JsonGenerator gen, SerializationContext ctxt) throws JacksonException { // First: perhaps we could serialize it as raw binary data? @@ -102,7 +102,7 @@ public void serialize(UUID value, JsonGenerator gen, SerializerProvider ctxt) gen.writeString(ch, 0, 36); } - protected boolean _writeAsBinary(SerializerProvider ctxt) + protected boolean _writeAsBinary(SerializationContext ctxt) { if (_asBinary != null) { return _asBinary; diff --git a/src/main/java/tools/jackson/databind/ser/std/ArraySerializerBase.java b/src/main/java/tools/jackson/databind/ser/std/ArraySerializerBase.java index 36e9dd4718..e1ae86941f 100644 --- a/src/main/java/tools/jackson/databind/ser/std/ArraySerializerBase.java +++ b/src/main/java/tools/jackson/databind/ser/std/ArraySerializerBase.java @@ -46,7 +46,7 @@ public abstract ValueSerializer _withResolved(BeanProperty prop, Boolean unwrapSingle); @Override - public ValueSerializer createContextual(SerializerProvider serializers, + public ValueSerializer createContextual(SerializationContext serializers, BeanProperty property) { Boolean unwrapSingle = null; @@ -65,7 +65,7 @@ public ValueSerializer createContextual(SerializerProvider serializers, } @Override - public final void serializeWithType(T value, JsonGenerator g, SerializerProvider ctxt, + public final void serializeWithType(T value, JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { @@ -77,10 +77,10 @@ public final void serializeWithType(T value, JsonGenerator g, SerializerProvider typeSer.writeTypeSuffix(g, ctxt, typeIdDef); } - protected abstract void serializeContents(T value, JsonGenerator jgen, SerializerProvider provider) + protected abstract void serializeContents(T value, JsonGenerator jgen, SerializationContext provider) throws JacksonException; - protected final boolean _shouldUnwrapSingle(SerializerProvider provider) { + protected final boolean _shouldUnwrapSingle(SerializationContext provider) { if (_unwrapSingle == null) { return provider.isEnabled(SerializationFeature.WRITE_SINGLE_ELEM_ARRAYS_UNWRAPPED); } 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 413a030c4a..659cb006de 100644 --- a/src/main/java/tools/jackson/databind/ser/std/AsArraySerializerBase.java +++ b/src/main/java/tools/jackson/databind/ser/std/AsArraySerializerBase.java @@ -120,7 +120,7 @@ public abstract AsArraySerializerBase withResolved(BeanProperty property, * known statically. */ @Override - public ValueSerializer createContextual(SerializerProvider ctxt, + public ValueSerializer createContextual(SerializationContext ctxt, BeanProperty property) { TypeSerializer typeSer = _valueTypeSerializer; @@ -195,7 +195,7 @@ public ValueSerializer getContentSerializer() { // variant that passes size of array to output, which is helpful with some data formats /* @Override - public void serialize(T value, JsonGenerator gen, SerializerProvider ctxt) throws JacksonException + public void serialize(T value, JsonGenerator gen, SerializationContext ctxt) throws JacksonException { if (provider.isEnabled(SerializationFeature.WRITE_SINGLE_ELEM_ARRAYS_UNWRAPPED) && hasSingleElement(value)) { @@ -209,7 +209,7 @@ && hasSingleElement(value)) { */ @Override - public void serializeWithType(T value, JsonGenerator g, SerializerProvider ctxt, + public void serializeWithType(T value, JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { @@ -221,7 +221,7 @@ public void serializeWithType(T value, JsonGenerator g, SerializerProvider ctxt, typeSer.writeTypeSuffix(g, ctxt, typeIdDef); } - protected abstract void serializeContents(T value, JsonGenerator gen, SerializerProvider provider) + protected abstract void serializeContents(T value, JsonGenerator gen, SerializationContext provider) throws JacksonException; @Override diff --git a/src/main/java/tools/jackson/databind/ser/std/NullSerializer.java b/src/main/java/tools/jackson/databind/ser/std/NullSerializer.java index 08ece7da6a..da2b3fa5cf 100644 --- a/src/main/java/tools/jackson/databind/ser/std/NullSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/std/NullSerializer.java @@ -22,7 +22,7 @@ public class NullSerializer private NullSerializer() { super(Object.class); } @Override - public void serialize(Object value, JsonGenerator gen, SerializerProvider provider) + public void serialize(Object value, JsonGenerator gen, SerializationContext provider) throws JacksonException { gen.writeNull(); @@ -35,7 +35,7 @@ public void serialize(Object value, JsonGenerator gen, SerializerProvider provid * by JSON filter; caller cannot know what kind of serializer it gets handed. */ @Override - public void serializeWithType(Object value, JsonGenerator gen, SerializerProvider serializers, + public void serializeWithType(Object value, JsonGenerator gen, SerializationContext serializers, TypeSerializer typeSer) throws JacksonException { 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 8d4f1e7a1c..3d2609ae9c 100644 --- a/src/main/java/tools/jackson/databind/ser/std/ReferenceTypeSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/std/ReferenceTypeSerializer.java @@ -149,7 +149,7 @@ public abstract ReferenceTypeSerializer withContentInclusion(Object suppressa */ @Override - public ValueSerializer createContextual(SerializerProvider ctxt, + public ValueSerializer createContextual(SerializationContext ctxt, BeanProperty property) { TypeSerializer typeSer = _valueTypeSerializer; @@ -237,7 +237,7 @@ public ValueSerializer createContextual(SerializerProvider ctxt, return refSer; } - protected boolean _useStatic(SerializerProvider serializers, BeanProperty property, + protected boolean _useStatic(SerializationContext serializers, BeanProperty property, JavaType referredType) { // First: no serializer for `Object.class`, must be dynamic @@ -278,7 +278,7 @@ protected boolean _useStatic(SerializerProvider serializers, BeanProperty proper */ @Override - public boolean isEmpty(SerializerProvider provider, T value) throws JacksonException + public boolean isEmpty(SerializationContext provider, T value) throws JacksonException { // First, absent value (note: null check is just sanity check here) if (!_isValuePresent(value)) { @@ -317,7 +317,7 @@ public JavaType getReferredType() { */ @Override - public void serialize(T ref, JsonGenerator g, SerializerProvider provider) + public void serialize(T ref, JsonGenerator g, SerializationContext provider) throws JacksonException { Object value = _getReferencedIfPresent(ref); @@ -339,7 +339,7 @@ public void serialize(T ref, JsonGenerator g, SerializerProvider provider) } @Override - public void serializeWithType(T ref, JsonGenerator g, SerializerProvider provider, + public void serializeWithType(T ref, JsonGenerator g, SerializationContext provider, TypeSerializer typeSer) throws JacksonException { @@ -397,7 +397,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t * Helper method that encapsulates logic of retrieving and caching required * serializer. */ - private final ValueSerializer _findCachedSerializer(SerializerProvider provider, + private final ValueSerializer _findCachedSerializer(SerializationContext provider, Class rawType) { ValueSerializer ser = _dynamicValueSerializers.serializerFor(rawType); @@ -423,7 +423,7 @@ private final ValueSerializer _findCachedSerializer(SerializerProvider p return ser; } - private final ValueSerializer _findSerializer(SerializerProvider provider, + private final ValueSerializer _findSerializer(SerializationContext provider, JavaType type, BeanProperty prop) { // 13-Mar-2017, tatu: Used to call `findTypeValueSerializer()`, but contextualization diff --git a/src/main/java/tools/jackson/databind/ser/std/SimpleBeanPropertyFilter.java b/src/main/java/tools/jackson/databind/ser/std/SimpleBeanPropertyFilter.java index 3712a98258..c5d2201a61 100644 --- a/src/main/java/tools/jackson/databind/ser/std/SimpleBeanPropertyFilter.java +++ b/src/main/java/tools/jackson/databind/ser/std/SimpleBeanPropertyFilter.java @@ -115,7 +115,7 @@ protected boolean includeElement(Object elementValue) { @Override public void serializeAsProperty(Object pojo, JsonGenerator g, - SerializerProvider provider, PropertyWriter writer) + SerializationContext provider, PropertyWriter writer) throws Exception { if (include(writer)) { @@ -126,7 +126,7 @@ public void serializeAsProperty(Object pojo, JsonGenerator g, } @Override - public void serializeAsElement(Object elementValue, JsonGenerator g, SerializerProvider provider, + public void serializeAsElement(Object elementValue, JsonGenerator g, SerializationContext provider, PropertyWriter writer) throws Exception { @@ -138,7 +138,7 @@ public void serializeAsElement(Object elementValue, JsonGenerator g, SerializerP @Override public void depositSchemaProperty(PropertyWriter writer, JsonObjectFormatVisitor objectVisitor, - SerializerProvider provider) + SerializationContext provider) { if (include(writer)) { writer.depositSchemaProperty(objectVisitor, provider); diff --git a/src/main/java/tools/jackson/databind/ser/std/SimpleFilterProvider.java b/src/main/java/tools/jackson/databind/ser/std/SimpleFilterProvider.java index c9210c53f4..ed43a687ff 100644 --- a/src/main/java/tools/jackson/databind/ser/std/SimpleFilterProvider.java +++ b/src/main/java/tools/jackson/databind/ser/std/SimpleFilterProvider.java @@ -3,7 +3,7 @@ import java.util.*; import tools.jackson.core.util.Snapshottable; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.ser.*; import tools.jackson.databind.util.ClassUtil; @@ -152,7 +152,7 @@ public PropertyFilter removeFilter(String id) { */ @Override - public PropertyFilter findPropertyFilter(SerializerProvider ctxt, + public PropertyFilter findPropertyFilter(SerializationContext ctxt, Object filterId, Object valueToFilter) { PropertyFilter f = _filtersById.get(filterId); diff --git a/src/main/java/tools/jackson/databind/ser/std/StdContainerSerializer.java b/src/main/java/tools/jackson/databind/ser/std/StdContainerSerializer.java index 8ae21c3cdd..90d04692ce 100644 --- a/src/main/java/tools/jackson/databind/ser/std/StdContainerSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/std/StdContainerSerializer.java @@ -99,7 +99,7 @@ public StdContainerSerializer withValueTypeSerializer(TypeSerializer vts) { * known statically. * Note that for dynamic types this may return null; if so, * caller has to instead use {@link #getContentType()} and - * {@link tools.jackson.databind.SerializerProvider#findContentValueSerializer}. + * {@link tools.jackson.databind.SerializationContext#findContentValueSerializer}. */ public abstract ValueSerializer getContentSerializer(); @@ -110,7 +110,7 @@ public StdContainerSerializer withValueTypeSerializer(TypeSerializer vts) { */ @Override - public abstract boolean isEmpty(SerializerProvider prov, T value); + public abstract boolean isEmpty(SerializationContext prov, T value); /** * Method called to determine if the given value (of type handled by @@ -143,7 +143,7 @@ public StdContainerSerializer withValueTypeSerializer(TypeSerializer vts) { /** * @since 3.0 */ - protected ValueSerializer _findAndAddDynamic(SerializerProvider ctxt, Class type) + protected ValueSerializer _findAndAddDynamic(SerializationContext ctxt, Class type) { PropertySerializerMap map = _dynamicValueSerializers; PropertySerializerMap.SerializerAndMapResult result = map.findAndAddSecondarySerializer(type, ctxt, _property); @@ -157,7 +157,7 @@ protected ValueSerializer _findAndAddDynamic(SerializerProvider ctxt, Cl /** * @since 3.0 */ - protected ValueSerializer _findAndAddDynamic(SerializerProvider ctxt, JavaType type) + protected ValueSerializer _findAndAddDynamic(SerializationContext ctxt, JavaType type) { PropertySerializerMap map = _dynamicValueSerializers; PropertySerializerMap.SerializerAndMapResult result = map.findAndAddSecondarySerializer(type, ctxt, _property); diff --git a/src/main/java/tools/jackson/databind/ser/std/StdDelegatingSerializer.java b/src/main/java/tools/jackson/databind/ser/std/StdDelegatingSerializer.java index 38cd9639be..0e04b6dcb0 100644 --- a/src/main/java/tools/jackson/databind/ser/std/StdDelegatingSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/std/StdDelegatingSerializer.java @@ -104,7 +104,7 @@ protected StdDelegatingSerializer withDelegate(Converter converter, */ @Override - public void resolve(SerializerProvider ctxt) + public void resolve(SerializationContext ctxt) { if (_delegateSerializer != null) { _delegateSerializer.resolve(ctxt); @@ -112,7 +112,7 @@ public void resolve(SerializerProvider ctxt) } @Override - public ValueSerializer createContextual(SerializerProvider ctxt, BeanProperty property) + public ValueSerializer createContextual(SerializationContext ctxt, BeanProperty property) { ValueSerializer delSer = _delegateSerializer; JavaType delegateType = _delegateType; @@ -160,7 +160,7 @@ public ValueSerializer getDelegatee() { */ @Override - public void serialize(Object value, JsonGenerator gen, SerializerProvider ctxt) + public void serialize(Object value, JsonGenerator gen, SerializationContext ctxt) throws JacksonException { Object delegateValue = convertValue(value); @@ -178,7 +178,7 @@ public void serialize(Object value, JsonGenerator gen, SerializerProvider ctxt) } @Override - public void serializeWithType(Object value, JsonGenerator gen, SerializerProvider ctxt, + public void serializeWithType(Object value, JsonGenerator gen, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { @@ -198,7 +198,7 @@ public void serializeWithType(Object value, JsonGenerator gen, SerializerProvide } @Override - public boolean isEmpty(SerializerProvider ctxt, Object value) + public boolean isEmpty(SerializationContext ctxt, Object value) { Object delegateValue = convertValue(value); if (delegateValue == null) { @@ -256,7 +256,7 @@ protected Object convertValue(Object value) { * {@link java.lang.Object}, and where serializer needs to be located dynamically * based on actual value type. */ - protected ValueSerializer _findSerializer(Object value, SerializerProvider ctxt) + protected ValueSerializer _findSerializer(Object value, SerializationContext ctxt) { // 17-Apr-2018, tatu: Basically inline `_findAndAddDynamic(...)` // 17-Apr-2018, tatu: difficult to know if these are primary or secondary serializers... diff --git a/src/main/java/tools/jackson/databind/ser/std/StdDynamicSerializer.java b/src/main/java/tools/jackson/databind/ser/std/StdDynamicSerializer.java index 9ca0b30b2b..effbeb9a83 100644 --- a/src/main/java/tools/jackson/databind/ser/std/StdDynamicSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/std/StdDynamicSerializer.java @@ -82,7 +82,7 @@ protected StdDynamicSerializer(StdDynamicSerializer src, /********************************************************************** */ - protected final ValueSerializer _findAndAddDynamic(SerializerProvider ctxt, Class type) + protected final ValueSerializer _findAndAddDynamic(SerializationContext ctxt, Class type) { PropertySerializerMap map = _dynamicValueSerializers; PropertySerializerMap.SerializerAndMapResult result = map.findAndAddSecondarySerializer(type, @@ -93,7 +93,7 @@ protected final ValueSerializer _findAndAddDynamic(SerializerProvider ct return result.serializer; } - protected final ValueSerializer _findAndAddDynamic(SerializerProvider ctxt, Class type, + protected final ValueSerializer _findAndAddDynamic(SerializationContext ctxt, Class type, UnaryOperator> serTransformer) { PropertySerializerMap map = _dynamicValueSerializers; @@ -105,7 +105,7 @@ protected final ValueSerializer _findAndAddDynamic(SerializerProvider ct return result.serializer; } - protected final ValueSerializer _findAndAddDynamic(SerializerProvider ctxt, JavaType type) + protected final ValueSerializer _findAndAddDynamic(SerializationContext ctxt, JavaType type) { PropertySerializerMap map = _dynamicValueSerializers; PropertySerializerMap.SerializerAndMapResult result = map.findAndAddSecondarySerializer(type, @@ -116,7 +116,7 @@ protected final ValueSerializer _findAndAddDynamic(SerializerProvider ct return result.serializer; } - protected final ValueSerializer _findAndAddDynamic(SerializerProvider ctxt, JavaType type, + protected final ValueSerializer _findAndAddDynamic(SerializationContext ctxt, JavaType type, UnaryOperator> serTransformer) { PropertySerializerMap map = _dynamicValueSerializers; diff --git a/src/main/java/tools/jackson/databind/ser/std/StdScalarSerializer.java b/src/main/java/tools/jackson/databind/ser/std/StdScalarSerializer.java index 17d712b291..431ae0043f 100644 --- a/src/main/java/tools/jackson/databind/ser/std/StdScalarSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/std/StdScalarSerializer.java @@ -3,7 +3,7 @@ import tools.jackson.core.*; import tools.jackson.core.type.WritableTypeId; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper; import tools.jackson.databind.jsontype.TypeSerializer; @@ -42,7 +42,7 @@ protected StdScalarSerializer(StdScalarSerializer src) { * change this behavior. */ @Override - public void serializeWithType(T value, JsonGenerator g, SerializerProvider ctxt, + public void serializeWithType(T value, JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { diff --git a/src/main/java/tools/jackson/databind/ser/std/StdSerializer.java b/src/main/java/tools/jackson/databind/ser/std/StdSerializer.java index 169672ff70..b72bd36045 100644 --- a/src/main/java/tools/jackson/databind/ser/std/StdSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/std/StdSerializer.java @@ -87,7 +87,7 @@ protected StdSerializer(StdSerializer src) { */ @Override - public abstract void serialize(T value, JsonGenerator gen, SerializerProvider provider) + public abstract void serialize(T value, JsonGenerator gen, SerializationContext provider) throws JacksonException; /* @@ -230,7 +230,7 @@ protected void visitArrayFormat(JsonFormatVisitorWrapper visitor, JavaType typeH *
  • Wrapped {@code IOException}s are unpeeled * */ - public void wrapAndThrow(SerializerProvider provider, + public void wrapAndThrow(SerializationContext provider, Throwable t, Object bean, String fieldName) throws JacksonException { @@ -256,7 +256,7 @@ public void wrapAndThrow(SerializerProvider provider, throw DatabindException.wrapWithPath(t, bean, fieldName); } - public void wrapAndThrow(SerializerProvider provider, + public void wrapAndThrow(SerializationContext provider, Throwable t, Object bean, int index) throws JacksonException { @@ -292,7 +292,7 @@ public void wrapAndThrow(SerializerProvider provider, * @param existingSerializer (optional) configured content * serializer if one already exists. */ - protected ValueSerializer findContextualConvertingSerializer(SerializerProvider provider, + protected ValueSerializer findContextualConvertingSerializer(SerializationContext provider, BeanProperty prop, ValueSerializer existingSerializer) { // 08-Dec-2016, tatu: to fix [databind#357], need to prevent recursive calls for @@ -324,7 +324,7 @@ protected ValueSerializer findContextualConvertingSerializer(SerializerProvid return existingSerializer; } - private ValueSerializer _findConvertingContentSerializer(SerializerProvider provider, + private ValueSerializer _findConvertingContentSerializer(SerializationContext provider, AnnotationIntrospector intr, BeanProperty prop, ValueSerializer existingSerializer) { AnnotatedMember m = prop.getMember(); @@ -347,7 +347,7 @@ private ValueSerializer _findConvertingContentSerializer(SerializerProvider p * Helper method used to locate filter that is needed, based on filter id * this serializer was constructed with. */ - protected PropertyFilter findPropertyFilter(SerializerProvider provider, + protected PropertyFilter findPropertyFilter(SerializationContext provider, Object filterId, Object valueToFilter) { FilterProvider filters = provider.getFilterProvider(); @@ -367,7 +367,7 @@ protected PropertyFilter findPropertyFilter(SerializerProvider provider, * * @param typeForDefaults Type (erased) used for finding default format settings, if any */ - protected JsonFormat.Value findFormatOverrides(SerializerProvider provider, + protected JsonFormat.Value findFormatOverrides(SerializationContext provider, BeanProperty prop, Class typeForDefaults) { if (prop != null) { @@ -384,7 +384,7 @@ protected JsonFormat.Value findFormatOverrides(SerializerProvider provider, * * @param typeForDefaults Type (erased) used for finding default format settings, if any */ - protected Boolean findFormatFeature(SerializerProvider provider, + protected Boolean findFormatFeature(SerializationContext provider, BeanProperty prop, Class typeForDefaults, JsonFormat.Feature feat) { JsonFormat.Value format = findFormatOverrides(provider, prop, typeForDefaults); @@ -394,7 +394,7 @@ protected Boolean findFormatFeature(SerializerProvider provider, return null; } - protected JsonInclude.Value findIncludeOverrides(SerializerProvider provider, + protected JsonInclude.Value findIncludeOverrides(SerializationContext provider, BeanProperty prop, Class typeForDefaults) { if (prop != null) { @@ -407,7 +407,7 @@ protected JsonInclude.Value findIncludeOverrides(SerializerProvider provider, /** * Convenience method for finding out possibly configured content value serializer. */ - protected ValueSerializer findAnnotatedContentSerializer(SerializerProvider serializers, + protected ValueSerializer findAnnotatedContentSerializer(SerializationContext serializers, BeanProperty property) { if (property != null) { @@ -447,7 +447,7 @@ protected final static boolean _nonEmpty(Collection c) { } // @since 3.0 - protected JacksonException _wrapIOFailure(SerializerProvider ctxt, IOException e) { + protected JacksonException _wrapIOFailure(SerializationContext ctxt, IOException e) { return JacksonIOException.construct(e, ctxt.getGenerator()); } } diff --git a/src/main/java/tools/jackson/databind/ser/std/ToEmptyObjectSerializer.java b/src/main/java/tools/jackson/databind/ser/std/ToEmptyObjectSerializer.java index 248380ddd2..a8737b78c6 100644 --- a/src/main/java/tools/jackson/databind/ser/std/ToEmptyObjectSerializer.java +++ b/src/main/java/tools/jackson/databind/ser/std/ToEmptyObjectSerializer.java @@ -5,7 +5,7 @@ import tools.jackson.core.JsonToken; import tools.jackson.core.type.WritableTypeId; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.annotation.JacksonStdImpl; import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper; import tools.jackson.databind.jsontype.TypeSerializer; @@ -29,7 +29,7 @@ public ToEmptyObjectSerializer(JavaType type) { } @Override - public void serialize(Object value, JsonGenerator gen, SerializerProvider ctxt) + public void serialize(Object value, JsonGenerator gen, SerializationContext ctxt) throws JacksonException { gen.writeStartObject(value, 0); @@ -38,7 +38,7 @@ public void serialize(Object value, JsonGenerator gen, SerializerProvider ctxt) @Override public void serializeWithType(Object value, JsonGenerator gen, - SerializerProvider ctxt, TypeSerializer typeSer) + SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { WritableTypeId typeIdDef = typeSer.writeTypePrefix(gen, ctxt, @@ -47,7 +47,7 @@ public void serializeWithType(Object value, JsonGenerator gen, } @Override - public boolean isEmpty(SerializerProvider provider, Object value) { + public boolean isEmpty(SerializationContext provider, Object value) { return true; } diff --git a/src/main/java/tools/jackson/databind/ser/std/ToStringSerializerBase.java b/src/main/java/tools/jackson/databind/ser/std/ToStringSerializerBase.java index 118d49250c..2575c00ab2 100644 --- a/src/main/java/tools/jackson/databind/ser/std/ToStringSerializerBase.java +++ b/src/main/java/tools/jackson/databind/ser/std/ToStringSerializerBase.java @@ -5,7 +5,7 @@ import tools.jackson.core.JsonToken; import tools.jackson.core.type.WritableTypeId; import tools.jackson.databind.JavaType; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper; import tools.jackson.databind.jsontype.TypeSerializer; @@ -23,12 +23,12 @@ public ToStringSerializerBase(Class handledType) { } @Override - public boolean isEmpty(SerializerProvider prov, Object value) { + public boolean isEmpty(SerializationContext prov, Object value) { return valueToString(value).isEmpty(); } @Override - public void serialize(Object value, JsonGenerator gen, SerializerProvider provider) + public void serialize(Object value, JsonGenerator gen, SerializationContext provider) throws JacksonException { gen.writeString(valueToString(value)); @@ -42,7 +42,7 @@ public void serialize(Object value, JsonGenerator gen, SerializerProvider provid * change this behavior. */ @Override - public void serializeWithType(Object value, JsonGenerator g, SerializerProvider ctxt, + public void serializeWithType(Object value, JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { diff --git a/src/main/java/tools/jackson/databind/type/TypeBase.java b/src/main/java/tools/jackson/databind/type/TypeBase.java index dd46ed49a7..096581d0ea 100644 --- a/src/main/java/tools/jackson/databind/type/TypeBase.java +++ b/src/main/java/tools/jackson/databind/type/TypeBase.java @@ -153,7 +153,7 @@ public JavaType[] findTypeParameters(Class expType) */ @Override - public void serializeWithType(JsonGenerator g, SerializerProvider ctxt, + public void serializeWithType(JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) throws JacksonException { @@ -164,7 +164,7 @@ public void serializeWithType(JsonGenerator g, SerializerProvider ctxt, } @Override - public void serialize(JsonGenerator gen, SerializerProvider provider) + public void serialize(JsonGenerator gen, SerializationContext provider) throws JacksonException { gen.writeString(toCanonical()); diff --git a/src/main/java/tools/jackson/databind/util/JSONPObject.java b/src/main/java/tools/jackson/databind/util/JSONPObject.java index 39c3b46094..479eb4bad1 100644 --- a/src/main/java/tools/jackson/databind/util/JSONPObject.java +++ b/src/main/java/tools/jackson/databind/util/JSONPObject.java @@ -51,7 +51,7 @@ public JSONPObject(String function, Object value, JavaType asType) */ @Override - public void serializeWithType(JsonGenerator gen, SerializerProvider provider, TypeSerializer typeSer) + public void serializeWithType(JsonGenerator gen, SerializationContext provider, TypeSerializer typeSer) throws JacksonException { // No type for JSONP wrapping: value serializer will handle typing for value: @@ -59,7 +59,7 @@ public void serializeWithType(JsonGenerator gen, SerializerProvider provider, Ty } @Override - public void serialize(JsonGenerator gen, SerializerProvider provider) + public void serialize(JsonGenerator gen, SerializationContext provider) throws JacksonException { // First, wrapping: diff --git a/src/main/java/tools/jackson/databind/util/JSONWrappedObject.java b/src/main/java/tools/jackson/databind/util/JSONWrappedObject.java index 00efdae27a..16f5465c4c 100644 --- a/src/main/java/tools/jackson/databind/util/JSONWrappedObject.java +++ b/src/main/java/tools/jackson/databind/util/JSONWrappedObject.java @@ -63,7 +63,7 @@ public JSONWrappedObject(String prefix, String suffix, Object value, JavaType as */ @Override - public void serializeWithType(JsonGenerator g, SerializerProvider provider, TypeSerializer typeSer) + public void serializeWithType(JsonGenerator g, SerializationContext provider, TypeSerializer typeSer) throws JacksonException { // No type for JSONP wrapping: value serializer will handle typing for value: @@ -71,7 +71,7 @@ public void serializeWithType(JsonGenerator g, SerializerProvider provider, Type } @Override - public void serialize(JsonGenerator g, SerializerProvider provider) + public void serialize(JsonGenerator g, SerializationContext provider) throws JacksonException { // First, wrapping: diff --git a/src/main/java/tools/jackson/databind/util/RawValue.java b/src/main/java/tools/jackson/databind/util/RawValue.java index 6c64c6a0d5..776d712a8a 100644 --- a/src/main/java/tools/jackson/databind/util/RawValue.java +++ b/src/main/java/tools/jackson/databind/util/RawValue.java @@ -4,7 +4,7 @@ import tools.jackson.core.JsonGenerator; import tools.jackson.core.SerializableString; import tools.jackson.databind.JacksonSerializable; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.jsontype.TypeSerializer; /** @@ -55,7 +55,7 @@ public Object rawValue() { } @Override - public void serialize(JsonGenerator gen, SerializerProvider serializers) throws JacksonException + public void serialize(JsonGenerator gen, SerializationContext serializers) throws JacksonException { if (_value instanceof JacksonSerializable) { ((JacksonSerializable) _value).serialize(gen, serializers); @@ -65,7 +65,7 @@ public void serialize(JsonGenerator gen, SerializerProvider serializers) throws } @Override - public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, + public void serializeWithType(JsonGenerator gen, SerializationContext serializers, TypeSerializer typeSer) throws JacksonException { if (_value instanceof JacksonSerializable) { @@ -81,7 +81,7 @@ public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, public void serialize(JsonGenerator gen) throws JacksonException { if (_value instanceof JacksonSerializable) { - // No SerializerProvider passed, must go via generator, callback + // No SerializationContext passed, must go via generator, callback gen.writePOJO(_value); } else { _serialize(gen); diff --git a/src/test-jdk17/java/tools/jackson/databind/records/RecordJsonSerDeser188Test.java b/src/test-jdk17/java/tools/jackson/databind/records/RecordJsonSerDeser188Test.java index 66f53c2066..803a264041 100644 --- a/src/test-jdk17/java/tools/jackson/databind/records/RecordJsonSerDeser188Test.java +++ b/src/test-jdk17/java/tools/jackson/databind/records/RecordJsonSerDeser188Test.java @@ -6,7 +6,7 @@ import tools.jackson.core.JsonParser; import tools.jackson.databind.DeserializationContext; import tools.jackson.databind.ObjectMapper; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.annotation.JsonDeserialize; import tools.jackson.databind.annotation.JsonSerialize; import tools.jackson.databind.deser.std.StdScalarDeserializer; @@ -37,7 +37,7 @@ protected PrefixStringSerializer() { } @Override - public void serialize(String value, JsonGenerator jgen, SerializerProvider provider) + public void serialize(String value, JsonGenerator jgen, SerializationContext provider) { jgen.writeString("custom " + value); } diff --git a/src/test/java/perf/ManualWritePerfWithUUID.java b/src/test/java/perf/ManualWritePerfWithUUID.java index d870d63d7f..49fa6b145e 100644 --- a/src/test/java/perf/ManualWritePerfWithUUID.java +++ b/src/test/java/perf/ManualWritePerfWithUUID.java @@ -3,7 +3,7 @@ import java.util.UUID; import tools.jackson.core.JsonGenerator; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.annotation.JsonSerialize; import tools.jackson.databind.json.JsonMapper; import tools.jackson.databind.ser.std.StdScalarSerializer; @@ -51,7 +51,7 @@ class SlowSer extends StdScalarSerializer @Override public void serialize(UUID value, JsonGenerator jgen, - SerializerProvider provider) { + SerializationContext provider) { jgen.writeString(value.toString()); } } diff --git a/src/test/java/tools/jackson/databind/HandlerInstantiationTest.java b/src/test/java/tools/jackson/databind/HandlerInstantiationTest.java index 292b8b98f3..ca2d629b07 100644 --- a/src/test/java/tools/jackson/databind/HandlerInstantiationTest.java +++ b/src/test/java/tools/jackson/databind/HandlerInstantiationTest.java @@ -101,7 +101,7 @@ public MyBeanSerializer(String p) { } @Override - public void serialize(MyBean value, JsonGenerator jgen, SerializerProvider provider) + public void serialize(MyBean value, JsonGenerator jgen, SerializationContext provider) { jgen.writeString(_prefix + value.value); } diff --git a/src/test/java/tools/jackson/databind/ObjectMapperTestAccess.java b/src/test/java/tools/jackson/databind/ObjectMapperTestAccess.java index 4662db5837..6ddd247b1a 100644 --- a/src/test/java/tools/jackson/databind/ObjectMapperTestAccess.java +++ b/src/test/java/tools/jackson/databind/ObjectMapperTestAccess.java @@ -13,6 +13,6 @@ public static BeanDescription beanDescriptionForDeser(ObjectMapper mapper, Class } public static BeanDescription beanDescriptionForSer(ObjectMapper mapper, Class type) { - return mapper._serializerProvider().introspectBeanDescription(mapper.constructType(type)); + return mapper._serializationContext().introspectBeanDescription(mapper.constructType(type)); } } diff --git a/src/test/java/tools/jackson/databind/ObjectReaderTest.java b/src/test/java/tools/jackson/databind/ObjectReaderTest.java index 2fccce05bc..f5f87641bf 100644 --- a/src/test/java/tools/jackson/databind/ObjectReaderTest.java +++ b/src/test/java/tools/jackson/databind/ObjectReaderTest.java @@ -544,12 +544,12 @@ public JsonToken asToken() { } @Override - public void serialize(JsonGenerator g, SerializerProvider ctxt) { + public void serialize(JsonGenerator g, SerializationContext ctxt) { // ignore, will not be called } @Override - public void serializeWithType(JsonGenerator g, SerializerProvider ctxt, TypeSerializer typeSer) { + public void serializeWithType(JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) { // ignore, will not be called } @@ -665,12 +665,12 @@ public JsonToken asToken() { } @Override - public void serialize(JsonGenerator g, SerializerProvider ctxt) { + public void serialize(JsonGenerator g, SerializationContext ctxt) { // ignore, will not be called } @Override - public void serializeWithType(JsonGenerator g, SerializerProvider ctxt, TypeSerializer typeSer) { + public void serializeWithType(JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer) { // ignore, will not be called } diff --git a/src/test/java/tools/jackson/databind/contextual/ContextAttributeWithSerTest.java b/src/test/java/tools/jackson/databind/contextual/ContextAttributeWithSerTest.java index 6248890b89..a642e44368 100644 --- a/src/test/java/tools/jackson/databind/contextual/ContextAttributeWithSerTest.java +++ b/src/test/java/tools/jackson/databind/contextual/ContextAttributeWithSerTest.java @@ -26,7 +26,7 @@ protected PrefixStringSerializer() { @Override public void serialize(String value, JsonGenerator jgen, - SerializerProvider provider) + SerializationContext provider) { Integer I = (Integer) provider.getAttribute(KEY); if (I == null) { diff --git a/src/test/java/tools/jackson/databind/contextual/ContextualKeyTypesTest.java b/src/test/java/tools/jackson/databind/contextual/ContextualKeyTypesTest.java index 956aacb8d3..256886377a 100644 --- a/src/test/java/tools/jackson/databind/contextual/ContextualKeyTypesTest.java +++ b/src/test/java/tools/jackson/databind/contextual/ContextualKeyTypesTest.java @@ -37,7 +37,7 @@ public ContextualKeySerializer(String p) { } @Override - public void serialize(String value, JsonGenerator g, SerializerProvider provider) + public void serialize(String value, JsonGenerator g, SerializationContext provider) { if (_prefix != null) { value = _prefix + value; @@ -46,7 +46,7 @@ public void serialize(String value, JsonGenerator g, SerializerProvider provider } @Override - public ValueSerializer createContextual(SerializerProvider prov, BeanProperty property) + public ValueSerializer createContextual(SerializationContext prov, BeanProperty property) { return new ContextualKeySerializer(_prefix+":"); } diff --git a/src/test/java/tools/jackson/databind/contextual/ContextualSerializationTest.java b/src/test/java/tools/jackson/databind/contextual/ContextualSerializationTest.java index 81972a141d..2375f8f0e9 100644 --- a/src/test/java/tools/jackson/databind/contextual/ContextualSerializationTest.java +++ b/src/test/java/tools/jackson/databind/contextual/ContextualSerializationTest.java @@ -132,13 +132,13 @@ public AnnotatedContextualSerializer(String p) { } @Override - public void serialize(String value, JsonGenerator g, SerializerProvider provider) + public void serialize(String value, JsonGenerator g, SerializationContext provider) { g.writeString(_prefix + value); } @Override - public ValueSerializer createContextual(SerializerProvider prov, BeanProperty property) + public ValueSerializer createContextual(SerializationContext prov, BeanProperty property) { String prefix = "UNKNOWN"; Prefix ann = null; @@ -170,19 +170,19 @@ public ContextualAndResolvable(int resolved, int contextual) } @Override - public void serialize(String value, JsonGenerator g, SerializerProvider provider) + public void serialize(String value, JsonGenerator g, SerializationContext provider) { g.writeString("contextual="+isContextual+",resolved="+isResolved); } @Override - public ValueSerializer createContextual(SerializerProvider prov, BeanProperty property) + public ValueSerializer createContextual(SerializationContext prov, BeanProperty property) { return new ContextualAndResolvable(isResolved, isContextual+1); } @Override - public void resolve(SerializerProvider provider) { + public void resolve(SerializationContext provider) { ++isResolved; } } @@ -199,13 +199,13 @@ public AccumulatingContextual(String newDesc) { } @Override - public void serialize(String value, JsonGenerator g, SerializerProvider provider) + public void serialize(String value, JsonGenerator g, SerializationContext provider) { g.writeString(desc+"/"+value); } @Override - public ValueSerializer createContextual(SerializerProvider prov, BeanProperty property) + public ValueSerializer createContextual(SerializationContext prov, BeanProperty property) { if (property == null) { return new AccumulatingContextual(desc+"/ROOT"); diff --git a/src/test/java/tools/jackson/databind/convert/ConvertingSerializerTest.java b/src/test/java/tools/jackson/databind/convert/ConvertingSerializerTest.java index 3567813879..de15a52526 100644 --- a/src/test/java/tools/jackson/databind/convert/ConvertingSerializerTest.java +++ b/src/test/java/tools/jackson/databind/convert/ConvertingSerializerTest.java @@ -157,7 +157,7 @@ public Target convert(Source value) { static class TargetSerializer extends ValueSerializer { @Override - public void serialize(Target a, JsonGenerator g, SerializerProvider provider) { + public void serialize(Target a, JsonGenerator g, SerializationContext provider) { g.writeString("Target"); } } diff --git a/src/test/java/tools/jackson/databind/deser/CustomDeserializersTest.java b/src/test/java/tools/jackson/databind/deser/CustomDeserializersTest.java index 0da45ad4fc..1c7e4ebb03 100644 --- a/src/test/java/tools/jackson/databind/deser/CustomDeserializersTest.java +++ b/src/test/java/tools/jackson/databind/deser/CustomDeserializersTest.java @@ -144,7 +144,7 @@ public Map getMap() { static class CustomKeySerializer extends ValueSerializer { @Override - public void serialize(CustomKey value, JsonGenerator g, SerializerProvider provider) { + public void serialize(CustomKey value, JsonGenerator g, SerializationContext provider) { g.writeName(String.valueOf(value.getId())); } } diff --git a/src/test/java/tools/jackson/databind/deser/jdk/ArrayDeserializationTest.java b/src/test/java/tools/jackson/databind/deser/jdk/ArrayDeserializationTest.java index 88e03f3859..86fd23c951 100644 --- a/src/test/java/tools/jackson/databind/deser/jdk/ArrayDeserializationTest.java +++ b/src/test/java/tools/jackson/databind/deser/jdk/ArrayDeserializationTest.java @@ -75,7 +75,7 @@ public Bean2(String d) } @Override - public void serialize(JsonGenerator gen, SerializerProvider provider) + public void serialize(JsonGenerator gen, SerializationContext provider) { gen.writeString(_desc); } @@ -90,7 +90,7 @@ public void serialize(JsonGenerator gen, SerializerProvider provider) @Override public void serializeWithType(JsonGenerator gen, - SerializerProvider provider, TypeSerializer typeSer) { + SerializationContext provider, TypeSerializer typeSer) { } } diff --git a/src/test/java/tools/jackson/databind/deser/jdk/CustomMapKeys2454Test.java b/src/test/java/tools/jackson/databind/deser/jdk/CustomMapKeys2454Test.java index 486bbd338d..97178871c9 100644 --- a/src/test/java/tools/jackson/databind/deser/jdk/CustomMapKeys2454Test.java +++ b/src/test/java/tools/jackson/databind/deser/jdk/CustomMapKeys2454Test.java @@ -38,7 +38,7 @@ public Object deserializeKey(String key, DeserializationContext ctxt) { static class Key2454Serializer extends ValueSerializer { @Override public void serialize(Key2454 value, JsonGenerator gen, - SerializerProvider serializers) { + SerializationContext serializers) { gen.writeName("id="+value.id); } } diff --git a/src/test/java/tools/jackson/databind/exc/TestExceptionsDuringWriting.java b/src/test/java/tools/jackson/databind/exc/TestExceptionsDuringWriting.java index 8281a9f35d..e9a6a57e70 100644 --- a/src/test/java/tools/jackson/databind/exc/TestExceptionsDuringWriting.java +++ b/src/test/java/tools/jackson/databind/exc/TestExceptionsDuringWriting.java @@ -38,7 +38,7 @@ static class SerializerWithErrors extends ValueSerializer { @Override - public void serialize(Bean value, JsonGenerator jgen, SerializerProvider provider) + public void serialize(Bean value, JsonGenerator jgen, SerializationContext provider) { throw new IllegalArgumentException("test string"); } diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalTest.java index 6faf40fa6e..2d5969af53 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalTest.java @@ -101,7 +101,7 @@ public static class UpperCasingSerializer extends StdScalarSerializer @Override public void serialize(String value, JsonGenerator gen, - SerializerProvider provider) { + SerializationContext provider) { gen.writeString(value.toUpperCase()); } } diff --git a/src/test/java/tools/jackson/databind/introspect/JacksonAnnotationIntrospectorTest.java b/src/test/java/tools/jackson/databind/introspect/JacksonAnnotationIntrospectorTest.java index f64cf8a4ae..03a5ecffd9 100644 --- a/src/test/java/tools/jackson/databind/introspect/JacksonAnnotationIntrospectorTest.java +++ b/src/test/java/tools/jackson/databind/introspect/JacksonAnnotationIntrospectorTest.java @@ -95,7 +95,7 @@ public void setEnumProperty(EnumExample enumProperty) public static class QNameSerializer extends ValueSerializer { @Override - public void serialize(QName value, JsonGenerator g, SerializerProvider provider) + public void serialize(QName value, JsonGenerator g, SerializationContext provider) { g.writeString(value.toString()); } diff --git a/src/test/java/tools/jackson/databind/jsonschema/NewSchemaTest.java b/src/test/java/tools/jackson/databind/jsonschema/NewSchemaTest.java index 51fff8182e..f23fb66521 100644 --- a/src/test/java/tools/jackson/databind/jsonschema/NewSchemaTest.java +++ b/src/test/java/tools/jackson/databind/jsonschema/NewSchemaTest.java @@ -144,7 +144,7 @@ private void _visit(BeanProperty prop) } BeanPropertyWriter bpw = (BeanPropertyWriter) prop; ValueSerializer ser = bpw.getSerializer(); - final SerializerProvider prov = getProvider(); + final SerializationContext prov = getProvider(); if (ser == null) { if (prov == null) { throw new Error("SerializerProvider missing"); @@ -314,7 +314,7 @@ public void optionalProperty(BeanProperty prop) { BeanPropertyWriter bpw = (BeanPropertyWriter) prop; ser = bpw.getSerializer(); } - final SerializerProvider prov = getProvider(); + final SerializationContext prov = getProvider(); if (ser == null) { ser = prov.findPrimaryPropertySerializer(prop.getType(), prop); } diff --git a/src/test/java/tools/jackson/databind/jsontype/TestWithGenerics.java b/src/test/java/tools/jackson/databind/jsontype/TestWithGenerics.java index ed2723ebd9..c8131c613e 100644 --- a/src/test/java/tools/jackson/databind/jsontype/TestWithGenerics.java +++ b/src/test/java/tools/jackson/databind/jsontype/TestWithGenerics.java @@ -78,7 +78,7 @@ static class CustomValueSerializer extends ValueSerializer public CustomValueSerializer( ValueSerializer beanSerializer ) { this.beanSerializer = beanSerializer; } @Override - public void serialize( Object value, JsonGenerator g, SerializerProvider provider ) + public void serialize( Object value, JsonGenerator g, SerializationContext provider ) { beanSerializer.serialize(value, g, provider); } @@ -87,13 +87,13 @@ public void serialize( Object value, JsonGenerator g, SerializerProvider provide public Class handledType() { return beanSerializer.handledType(); } @Override - public void serializeWithType( Object value, JsonGenerator g, SerializerProvider provider, TypeSerializer typeSer ) + public void serializeWithType( Object value, JsonGenerator g, SerializationContext provider, TypeSerializer typeSer ) { beanSerializer.serializeWithType(value, g, provider, typeSer); } @Override - public void resolve(SerializerProvider provider) + public void resolve(SerializationContext provider) { beanSerializer.resolve(provider); } diff --git a/src/test/java/tools/jackson/databind/jsontype/jdk/TypeRefinementForMapTest.java b/src/test/java/tools/jackson/databind/jsontype/jdk/TypeRefinementForMapTest.java index dd8aeae4fa..1262ff48a0 100644 --- a/src/test/java/tools/jackson/databind/jsontype/jdk/TypeRefinementForMapTest.java +++ b/src/test/java/tools/jackson/databind/jsontype/jdk/TypeRefinementForMapTest.java @@ -95,7 +95,7 @@ public Object deserializeKey(String s, DeserializationContext deserializationCon static class CompoundKeySerializer extends StdSerializer { public CompoundKeySerializer() { super(CompoundKey.class); } @Override - public void serialize(CompoundKey compoundKey, JsonGenerator g, SerializerProvider serializerProvider) { + public void serialize(CompoundKey compoundKey, JsonGenerator g, SerializationContext serializerProvider) { g.writeName(compoundKey.getPart0() + '|' + compoundKey.getPart1()); } } diff --git a/src/test/java/tools/jackson/databind/module/SimpleModuleTest.java b/src/test/java/tools/jackson/databind/module/SimpleModuleTest.java index babd89147c..117d934b98 100644 --- a/src/test/java/tools/jackson/databind/module/SimpleModuleTest.java +++ b/src/test/java/tools/jackson/databind/module/SimpleModuleTest.java @@ -43,7 +43,7 @@ static class CustomBeanSerializer extends StdSerializer public CustomBeanSerializer() { super(CustomBean.class); } @Override - public void serialize(CustomBean value, JsonGenerator g, SerializerProvider provider) + public void serialize(CustomBean value, JsonGenerator g, SerializationContext provider) { // We will write it as a String, with '|' as delimiter g.writeString(value.str + "|" + value.num); @@ -71,7 +71,7 @@ static class SimpleEnumSerializer extends StdSerializer public SimpleEnumSerializer() { super(SimpleEnum.class); } @Override - public void serialize(SimpleEnum value, JsonGenerator g, SerializerProvider provider) + public void serialize(SimpleEnum value, JsonGenerator g, SerializationContext provider) { g.writeString(value.name().toLowerCase()); } @@ -105,7 +105,7 @@ static class BaseSerializer extends StdScalarSerializer public BaseSerializer() { super(Base.class); } @Override - public void serialize(Base value, JsonGenerator g, SerializerProvider provider) { + public void serialize(Base value, JsonGenerator g, SerializationContext provider) { g.writeString("Base:"+value.getText()); } } @@ -185,14 +185,14 @@ public Test3787Bean deserialize(JsonParser p, DeserializationContext ctxt) { static class Serializer3787A extends ValueSerializer { @Override - public void serialize(Test3787Bean value, JsonGenerator gen, SerializerProvider serializers) { + public void serialize(Test3787Bean value, JsonGenerator gen, SerializationContext serializers) { gen.writeRaw("a-result"); } } static class Serializer3787B extends ValueSerializer { @Override - public void serialize(Test3787Bean value, JsonGenerator gen, SerializerProvider serializers) { + public void serialize(Test3787Bean value, JsonGenerator gen, SerializationContext serializers) { gen.writeRaw("b-result"); } } diff --git a/src/test/java/tools/jackson/databind/module/TestCustomEnumKeyDeserializer.java b/src/test/java/tools/jackson/databind/module/TestCustomEnumKeyDeserializer.java index 14aaddbed8..8f8b9006b6 100644 --- a/src/test/java/tools/jackson/databind/module/TestCustomEnumKeyDeserializer.java +++ b/src/test/java/tools/jackson/databind/module/TestCustomEnumKeyDeserializer.java @@ -60,7 +60,7 @@ public String code() { static class TestEnumSerializer extends ValueSerializer { @Override - public void serialize(TestEnum languageCode, JsonGenerator g, SerializerProvider serializerProvider) { + public void serialize(TestEnum languageCode, JsonGenerator g, SerializationContext serializerProvider) { g.writeString(languageCode.code()); } @@ -100,7 +100,7 @@ public TestEnum deserialize(JsonParser p, DeserializationContext ctxt) { static class TestEnumKeySerializer extends ValueSerializer { @Override - public void serialize(TestEnum test, JsonGenerator g, SerializerProvider serializerProvider) { + public void serialize(TestEnum test, JsonGenerator g, SerializationContext serializerProvider) { g.writeName(test.code()); } diff --git a/src/test/java/tools/jackson/databind/module/TestTypeModifiers.java b/src/test/java/tools/jackson/databind/module/TestTypeModifiers.java index 195016a359..2ab760c814 100644 --- a/src/test/java/tools/jackson/databind/module/TestTypeModifiers.java +++ b/src/test/java/tools/jackson/databind/module/TestTypeModifiers.java @@ -83,7 +83,7 @@ static class XxxSerializer extends StdSerializer { public XxxSerializer() { super(Object.class); } @Override - public void serialize(Object value, JsonGenerator g, SerializerProvider provider) { + public void serialize(Object value, JsonGenerator g, SerializationContext provider) { g.writeString("xxx:"+value); } } @@ -138,7 +138,7 @@ public MyMapSerializer(ValueSerializer keySer, ValueSerializer v } @Override - public void serialize(MapMarker value, JsonGenerator jgen, SerializerProvider provider) + public void serialize(MapMarker value, JsonGenerator jgen, SerializationContext provider) { jgen.writeStartObject(); if (_keySerializer == null) { @@ -173,7 +173,7 @@ static class MyCollectionSerializer extends StdSerializer { public MyCollectionSerializer() { super(MyCollectionLikeType.class); } @Override - public void serialize(MyCollectionLikeType value, JsonGenerator g, SerializerProvider provider) { + public void serialize(MyCollectionLikeType value, JsonGenerator g, SerializationContext provider) { g.writeStartArray(); g.writeNumber(value.value); g.writeEndArray(); diff --git a/src/test/java/tools/jackson/databind/node/JsonNodeConversionsTest.java b/src/test/java/tools/jackson/databind/node/JsonNodeConversionsTest.java index 2ade786696..52a81eca4f 100644 --- a/src/test/java/tools/jackson/databind/node/JsonNodeConversionsTest.java +++ b/src/test/java/tools/jackson/databind/node/JsonNodeConversionsTest.java @@ -58,7 +58,7 @@ static class Issue467Tree { static class Issue467Serializer extends ValueSerializer { @Override public void serialize(Issue467Bean value, JsonGenerator g, - SerializerProvider provider) { + SerializationContext provider) { g.writePOJO(new Issue467TmpBean(value.i)); } } @@ -66,7 +66,7 @@ public void serialize(Issue467Bean value, JsonGenerator g, static class Issue467TreeSerializer extends ValueSerializer { @Override public void serialize(Issue467Tree value, JsonGenerator g, - SerializerProvider provider) { + SerializationContext provider) { g.writeTree(BooleanNode.TRUE); } } @@ -96,14 +96,14 @@ public void setFoo(final String foo) { } @Override - public void serialize(final JsonGenerator jgen, final SerializerProvider provider) + public void serialize(final JsonGenerator jgen, final SerializationContext provider) { jgen.writeTree(node); } @Override public void serializeWithType(JsonGenerator g, - SerializerProvider ctxt, TypeSerializer typeSer) + SerializationContext ctxt, TypeSerializer typeSer) { WritableTypeId typeIdDef = new WritableTypeId(this, JsonToken.START_OBJECT); typeSer.writeTypePrefix(g, ctxt, typeIdDef); diff --git a/src/test/java/tools/jackson/databind/node/POJONodeTest.java b/src/test/java/tools/jackson/databind/node/POJONodeTest.java index cb0f3809a3..7943d1aaba 100644 --- a/src/test/java/tools/jackson/databind/node/POJONodeTest.java +++ b/src/test/java/tools/jackson/databind/node/POJONodeTest.java @@ -25,7 +25,7 @@ public CustomSer() { } @Override - public void serialize(Data value, JsonGenerator gen, SerializerProvider provider) + public void serialize(Data value, JsonGenerator gen, SerializationContext provider) { String attrStr = (String) provider.getAttribute("myAttr"); gen.writeStartObject(); diff --git a/src/test/java/tools/jackson/databind/seq/PolyMapWriter827Test.java b/src/test/java/tools/jackson/databind/seq/PolyMapWriter827Test.java index 7af06aa4f3..b4af30d2e9 100644 --- a/src/test/java/tools/jackson/databind/seq/PolyMapWriter827Test.java +++ b/src/test/java/tools/jackson/databind/seq/PolyMapWriter827Test.java @@ -27,7 +27,7 @@ static class CustomKey { public class CustomKeySerializer extends StdSerializer { public CustomKeySerializer() { super(CustomKey.class); } @Override - public void serialize(CustomKey key, JsonGenerator g, SerializerProvider serializerProvider) { + public void serialize(CustomKey key, JsonGenerator g, SerializationContext serializerProvider) { g.writeName(key.a + "," + key.b); } } diff --git a/src/test/java/tools/jackson/databind/ser/AnyGetterTest.java b/src/test/java/tools/jackson/databind/ser/AnyGetterTest.java index d9fd0acc1e..dcbba02d03 100644 --- a/src/test/java/tools/jackson/databind/ser/AnyGetterTest.java +++ b/src/test/java/tools/jackson/databind/ser/AnyGetterTest.java @@ -90,7 +90,7 @@ public Issue705Serializer() { } @Override - public void serialize(Object value, JsonGenerator g, SerializerProvider ctxt) + public void serialize(Object value, JsonGenerator g, SerializationContext ctxt) { StringBuilder sb = new StringBuilder(); for (Map.Entry entry : ((Map) value).entrySet()) { @@ -128,7 +128,7 @@ static class MyUCSerializer extends StdScalarSerializer @Override public void serialize(String value, JsonGenerator gen, - SerializerProvider provider) { + SerializationContext provider) { gen.writeString(value.toUpperCase()); } } diff --git a/src/test/java/tools/jackson/databind/ser/CustomSerializersTest.java b/src/test/java/tools/jackson/databind/ser/CustomSerializersTest.java index 284eb37379..0bc179da9d 100644 --- a/src/test/java/tools/jackson/databind/ser/CustomSerializersTest.java +++ b/src/test/java/tools/jackson/databind/ser/CustomSerializersTest.java @@ -34,7 +34,7 @@ static class ElementSerializer extends StdSerializer { public ElementSerializer() { super(Element.class); } @Override - public void serialize(Element value, JsonGenerator gen, SerializerProvider provider) { + public void serialize(Element value, JsonGenerator gen, SerializationContext provider) { gen.writeString("element"); } } @@ -120,7 +120,7 @@ protected ParentClassSerializer() { @Override public void serialize(Object value, JsonGenerator gen, - SerializerProvider provider) { + SerializationContext provider) { Object parent = gen.currentValue(); String desc = (parent == null) ? "NULL" : parent.getClass().getSimpleName(); gen.writeString(desc+"/"+value); @@ -133,7 +133,7 @@ static class UCStringSerializer extends StdScalarSerializer @Override public void serialize(String value, JsonGenerator gen, - SerializerProvider provider) { + SerializationContext provider) { gen.writeString(value.toUpperCase()); } } @@ -155,7 +155,7 @@ public StringListWrapper(String... values) { // [databind#2475] static class MyFilter2475 extends SimpleBeanPropertyFilter { @Override - public void serializeAsProperty(Object pojo, JsonGenerator jgen, SerializerProvider provider, PropertyWriter writer) throws Exception { + public void serializeAsProperty(Object pojo, JsonGenerator jgen, SerializationContext provider, PropertyWriter writer) throws Exception { // Ensure that "current value" remains pojo final TokenStreamContext ctx = jgen.streamWriteContext(); final Object curr = ctx.currentValue(); @@ -272,7 +272,7 @@ public void testCustomLists() throws Exception module.addSerializer(Collection.class, new ValueSerializer() { @Override - public void serialize(Collection value, JsonGenerator gen, SerializerProvider provider) + public void serialize(Collection value, JsonGenerator gen, SerializationContext provider) { if (!value.isEmpty()) { collectionSerializer.serialize(value, gen, provider); diff --git a/src/test/java/tools/jackson/databind/ser/EnumAsMapKeyTest.java b/src/test/java/tools/jackson/databind/ser/EnumAsMapKeyTest.java index f66daaff35..5b61248bf6 100644 --- a/src/test/java/tools/jackson/databind/ser/EnumAsMapKeyTest.java +++ b/src/test/java/tools/jackson/databind/ser/EnumAsMapKeyTest.java @@ -69,7 +69,7 @@ enum Foo661 { FOO; public static class Serializer extends ValueSerializer { @Override - public void serialize(Foo661 value, JsonGenerator g, SerializerProvider provider) + public void serialize(Foo661 value, JsonGenerator g, SerializationContext provider) { g.writeName("X-"+value.name()); } diff --git a/src/test/java/tools/jackson/databind/ser/JsonValueSerializationTest.java b/src/test/java/tools/jackson/databind/ser/JsonValueSerializationTest.java index 155610fbe9..80a5512860 100644 --- a/src/test/java/tools/jackson/databind/ser/JsonValueSerializationTest.java +++ b/src/test/java/tools/jackson/databind/ser/JsonValueSerializationTest.java @@ -194,7 +194,7 @@ public Bean838Serializer() { @Override public void serialize(Bean838 value, JsonGenerator gen, - SerializerProvider provider) { + SerializationContext provider) { gen.writeNumber(42); } } diff --git a/src/test/java/tools/jackson/databind/ser/SerializationAnnotationsTest.java b/src/test/java/tools/jackson/databind/ser/SerializationAnnotationsTest.java index 0f0dc0bf8c..662a23bde9 100644 --- a/src/test/java/tools/jackson/databind/ser/SerializationAnnotationsTest.java +++ b/src/test/java/tools/jackson/databind/ser/SerializationAnnotationsTest.java @@ -107,7 +107,7 @@ public final static class BogusSerializer extends StdSerializer { public BogusSerializer() { super(Object.class); } @Override - public void serialize(Object value, JsonGenerator g, SerializerProvider provider) + public void serialize(Object value, JsonGenerator g, SerializationContext provider) { g.writeBoolean(true); } @@ -117,7 +117,7 @@ private final static class StringSerializer extends StdSerializer { public StringSerializer() { super(Object.class); } @Override - public void serialize(Object value, JsonGenerator g, SerializerProvider provider) + public void serialize(Object value, JsonGenerator g, SerializationContext provider) { g.writeString("X"+value+"X"); } diff --git a/src/test/java/tools/jackson/databind/ser/TestEmptyClass.java b/src/test/java/tools/jackson/databind/ser/TestEmptyClass.java index 68eedcf002..1b484cc93f 100644 --- a/src/test/java/tools/jackson/databind/ser/TestEmptyClass.java +++ b/src/test/java/tools/jackson/databind/ser/TestEmptyClass.java @@ -39,13 +39,13 @@ public NonZeroWrapper(int i) { static class NonZeroSerializer extends ValueSerializer { @Override - public void serialize(NonZero value, JsonGenerator jgen, SerializerProvider provider) + public void serialize(NonZero value, JsonGenerator jgen, SerializationContext provider) { jgen.writeNumber(value.nr); } @Override - public boolean isEmpty(SerializerProvider provider, NonZero value) { + public boolean isEmpty(SerializationContext provider, NonZero value) { if (value == null) return true; return (value.nr == 0); } diff --git a/src/test/java/tools/jackson/databind/ser/TestJsonSerialize.java b/src/test/java/tools/jackson/databind/ser/TestJsonSerialize.java index e87433ce90..90b60b344b 100644 --- a/src/test/java/tools/jackson/databind/ser/TestJsonSerialize.java +++ b/src/test/java/tools/jackson/databind/ser/TestJsonSerialize.java @@ -117,7 +117,7 @@ static class Bar294Serializer extends StdSerializer public Bar294Serializer() { super(Bar294.class); } @Override public void serialize(Bar294 bar, JsonGenerator g, - SerializerProvider provider) + SerializationContext provider) { g.writeString(bar.id); } diff --git a/src/test/java/tools/jackson/databind/ser/TestJsonSerialize2.java b/src/test/java/tools/jackson/databind/ser/TestJsonSerialize2.java index 4a9e1951e9..e04acfb152 100644 --- a/src/test/java/tools/jackson/databind/ser/TestJsonSerialize2.java +++ b/src/test/java/tools/jackson/databind/ser/TestJsonSerialize2.java @@ -43,7 +43,7 @@ static class ActualValue extends SimpleValue static class SimpleKeySerializer extends ValueSerializer { @Override - public void serialize(SimpleKey key, JsonGenerator g, SerializerProvider provider) + public void serialize(SimpleKey key, JsonGenerator g, SerializationContext provider) { g.writeName("key "+key.key); } @@ -51,7 +51,7 @@ public void serialize(SimpleKey key, JsonGenerator g, SerializerProvider provide static class SimpleValueSerializer extends ValueSerializer { @Override - public void serialize(SimpleValue value, JsonGenerator g, SerializerProvider provider) + public void serialize(SimpleValue value, JsonGenerator g, SerializationContext provider) { g.writeString("value "+value.value); } diff --git a/src/test/java/tools/jackson/databind/ser/TestJsonSerialize3.java b/src/test/java/tools/jackson/databind/ser/TestJsonSerialize3.java index 449afa2f48..64c8d22b68 100644 --- a/src/test/java/tools/jackson/databind/ser/TestJsonSerialize3.java +++ b/src/test/java/tools/jackson/databind/ser/TestJsonSerialize3.java @@ -16,7 +16,7 @@ public class TestJsonSerialize3 extends DatabindTestUtil // [JACKSON-829] static class FooToBarSerializer extends ValueSerializer { @Override - public void serialize(String value, JsonGenerator g, SerializerProvider provider) + public void serialize(String value, JsonGenerator g, SerializationContext provider) { if ("foo".equals(value)) { g.writeString("bar"); diff --git a/src/test/java/tools/jackson/databind/ser/TestVirtualProperties.java b/src/test/java/tools/jackson/databind/ser/TestVirtualProperties.java index 86fd7be25e..b7f105a05a 100644 --- a/src/test/java/tools/jackson/databind/ser/TestVirtualProperties.java +++ b/src/test/java/tools/jackson/databind/ser/TestVirtualProperties.java @@ -60,7 +60,7 @@ private CustomVProperty(BeanPropertyDefinition propDef, } @Override - protected Object value(Object bean, JsonGenerator jgen, SerializerProvider prov) { + protected Object value(Object bean, JsonGenerator jgen, SerializationContext prov) { if (_name.toString().equals("id")) { return "abc123"; } diff --git a/src/test/java/tools/jackson/databind/ser/ValueSerializerModifierTest.java b/src/test/java/tools/jackson/databind/ser/ValueSerializerModifierTest.java index d793450398..10732b19b9 100644 --- a/src/test/java/tools/jackson/databind/ser/ValueSerializerModifierTest.java +++ b/src/test/java/tools/jackson/databind/ser/ValueSerializerModifierTest.java @@ -141,7 +141,7 @@ public BogusBeanSerializer(int v) { @Override public void serialize(Object value, JsonGenerator g, - SerializerProvider provider) { + SerializationContext provider) { g.writeNumber(_value); } } @@ -197,7 +197,7 @@ static class ArraySerializerModifier extends ValueSerializerModifier { public ValueSerializer modifyArraySerializer(SerializationConfig config, ArrayType valueType, BeanDescription beanDesc, ValueSerializer serializer) { return new StdSerializer(Object.class) { - @Override public void serialize(Object value, JsonGenerator g, SerializerProvider provider) { + @Override public void serialize(Object value, JsonGenerator g, SerializationContext provider) { g.writeNumber(123); } }; @@ -209,7 +209,7 @@ static class CollectionSerializerModifier extends ValueSerializerModifier { public ValueSerializer modifyCollectionSerializer(SerializationConfig config, CollectionType valueType, BeanDescription beanDesc, ValueSerializer serializer) { return new StdSerializer(Object.class) { - @Override public void serialize(Object value, JsonGenerator g, SerializerProvider provider) { + @Override public void serialize(Object value, JsonGenerator g, SerializationContext provider) { g.writeNumber(123); } }; @@ -221,7 +221,7 @@ static class MapSerializerModifier extends ValueSerializerModifier { public ValueSerializer modifyMapSerializer(SerializationConfig config, MapType valueType, BeanDescription beanDesc, ValueSerializer serializer) { return new StdSerializer(Object.class) { - @Override public void serialize(Object value, JsonGenerator g, SerializerProvider provider) { + @Override public void serialize(Object value, JsonGenerator g, SerializationContext provider) { g.writeNumber(123); } }; @@ -233,7 +233,7 @@ static class EnumSerializerModifier extends ValueSerializerModifier { public ValueSerializer modifyEnumSerializer(SerializationConfig config, JavaType valueType, BeanDescription beanDesc, ValueSerializer serializer) { return new StdSerializer(Object.class) { - @Override public void serialize(Object value, JsonGenerator g, SerializerProvider provider) { + @Override public void serialize(Object value, JsonGenerator g, SerializationContext provider) { g.writeNumber(123); } }; @@ -245,7 +245,7 @@ static class KeySerializerModifier extends ValueSerializerModifier { public ValueSerializer modifyKeySerializer(SerializationConfig config, JavaType valueType, BeanDescription beanDesc, ValueSerializer serializer) { return new StdSerializer(Object.class) { - @Override public void serialize(Object value, JsonGenerator g, SerializerProvider provider) { + @Override public void serialize(Object value, JsonGenerator g, SerializationContext provider) { g.writeName("foo"); } }; diff --git a/src/test/java/tools/jackson/databind/ser/filter/CurrentObject3160Test.java b/src/test/java/tools/jackson/databind/ser/filter/CurrentObject3160Test.java index 21529991ee..57033f041d 100644 --- a/src/test/java/tools/jackson/databind/ser/filter/CurrentObject3160Test.java +++ b/src/test/java/tools/jackson/databind/ser/filter/CurrentObject3160Test.java @@ -50,7 +50,7 @@ static class Foo implements Strategy { // from [databind#2475] test/filter static class MyFilter3160 extends SimpleBeanPropertyFilter { @Override - public void serializeAsProperty(Object pojo, JsonGenerator g, SerializerProvider provider, PropertyWriter writer) + public void serializeAsProperty(Object pojo, JsonGenerator g, SerializationContext provider, PropertyWriter writer) throws JacksonException { // Ensure that "current value" remains pojo diff --git a/src/test/java/tools/jackson/databind/ser/filter/CustomNullSerializationTest.java b/src/test/java/tools/jackson/databind/ser/filter/CustomNullSerializationTest.java index f1533ac288..1bb19ac465 100644 --- a/src/test/java/tools/jackson/databind/ser/filter/CustomNullSerializationTest.java +++ b/src/test/java/tools/jackson/databind/ser/filter/CustomNullSerializationTest.java @@ -22,7 +22,7 @@ static class NullAsFoobarSerializer extends StdSerializer { public NullAsFoobarSerializer() { super(Object.class); } @Override - public void serialize(Object value, JsonGenerator gen, SerializerProvider provider) + public void serialize(Object value, JsonGenerator gen, SerializationContext provider) { gen.writeString("foobar"); } diff --git a/src/test/java/tools/jackson/databind/ser/filter/JsonFilterTest.java b/src/test/java/tools/jackson/databind/ser/filter/JsonFilterTest.java index fa3e33e27a..3244b6ae3c 100644 --- a/src/test/java/tools/jackson/databind/ser/filter/JsonFilterTest.java +++ b/src/test/java/tools/jackson/databind/ser/filter/JsonFilterTest.java @@ -65,7 +65,7 @@ public BeanB(String a, String b, String c) { static class CheckSiblingContextFilter extends SimpleBeanPropertyFilter { @Override - public void serializeAsProperty(Object bean, JsonGenerator jgen, SerializerProvider prov, PropertyWriter writer) throws Exception { + public void serializeAsProperty(Object bean, JsonGenerator jgen, SerializationContext prov, PropertyWriter writer) throws Exception { TokenStreamContext sc = jgen.streamWriteContext(); if (writer.getName() != null && writer.getName().equals("c")) { diff --git a/src/test/java/tools/jackson/databind/ser/filter/JsonInclude4464Test.java b/src/test/java/tools/jackson/databind/ser/filter/JsonInclude4464Test.java index 8ea5fa90d0..a52fc0be99 100644 --- a/src/test/java/tools/jackson/databind/ser/filter/JsonInclude4464Test.java +++ b/src/test/java/tools/jackson/databind/ser/filter/JsonInclude4464Test.java @@ -20,12 +20,12 @@ public BarSerializer() { } @Override - public void serialize(Bar value, JsonGenerator gen, SerializerProvider provider) { + public void serialize(Bar value, JsonGenerator gen, SerializationContext provider) { gen.writePOJO(value); } @Override - public boolean isEmpty(SerializerProvider provider, Bar value) { + public boolean isEmpty(SerializationContext provider, Bar value) { return "I_AM_EMPTY".equals(value.getName()); } } diff --git a/src/test/java/tools/jackson/databind/ser/filter/TestAnyGetterFiltering.java b/src/test/java/tools/jackson/databind/ser/filter/TestAnyGetterFiltering.java index 58933cc45d..8f5a9e307c 100644 --- a/src/test/java/tools/jackson/databind/ser/filter/TestAnyGetterFiltering.java +++ b/src/test/java/tools/jackson/databind/ser/filter/TestAnyGetterFiltering.java @@ -8,7 +8,7 @@ import tools.jackson.core.JsonGenerator; import tools.jackson.databind.ObjectMapper; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.ser.FilterProvider; import tools.jackson.databind.ser.PropertyWriter; import tools.jackson.databind.ser.std.SimpleBeanPropertyFilter; @@ -73,7 +73,7 @@ public Map getAny() { static class CustomFilter extends SimpleBeanPropertyFilter { @Override - public void serializeAsProperty(Object pojo, JsonGenerator gen, SerializerProvider provider, + public void serializeAsProperty(Object pojo, JsonGenerator gen, SerializationContext provider, PropertyWriter writer) throws Exception { if (pojo instanceof OuterObject) { diff --git a/src/test/java/tools/jackson/databind/ser/filter/TestMapFiltering.java b/src/test/java/tools/jackson/databind/ser/filter/TestMapFiltering.java index 40dd61ff6a..6b7ddae191 100644 --- a/src/test/java/tools/jackson/databind/ser/filter/TestMapFiltering.java +++ b/src/test/java/tools/jackson/databind/ser/filter/TestMapFiltering.java @@ -68,7 +68,7 @@ public PropertyFilter snapshot() { @Override public void serializeAsProperty(Object bean, JsonGenerator g, - SerializerProvider provider, PropertyWriter writer) + SerializationContext provider, PropertyWriter writer) throws Exception { String name = writer.getName(); @@ -94,7 +94,7 @@ public void serializeAsProperty(Object bean, JsonGenerator g, @Override public void serializeAsElement(Object elementValue, JsonGenerator jgen, - SerializerProvider prov, PropertyWriter writer) + SerializationContext prov, PropertyWriter writer) throws Exception { // not needed for testing } @@ -103,7 +103,7 @@ public void serializeAsElement(Object elementValue, JsonGenerator jgen, public void depositSchemaProperty(PropertyWriter writer, JsonObjectFormatVisitor objectVisitor, - SerializerProvider provider) { } + SerializationContext provider) { } } // [databind#527] diff --git a/src/test/java/tools/jackson/databind/ser/jdk/AtomicTypeSerializationTest.java b/src/test/java/tools/jackson/databind/ser/jdk/AtomicTypeSerializationTest.java index efdfe44c3a..b6f1218433 100644 --- a/src/test/java/tools/jackson/databind/ser/jdk/AtomicTypeSerializationTest.java +++ b/src/test/java/tools/jackson/databind/ser/jdk/AtomicTypeSerializationTest.java @@ -11,7 +11,7 @@ import tools.jackson.core.JsonGenerator; import tools.jackson.core.json.JsonWriteFeature; import tools.jackson.databind.ObjectMapper; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.annotation.JsonSerialize; import tools.jackson.databind.ser.std.StdScalarSerializer; import tools.jackson.databind.testutil.DatabindTestUtil; @@ -31,7 +31,7 @@ static class UpperCasingSerializer extends StdScalarSerializer @Override public void serialize(String value, JsonGenerator gen, - SerializerProvider provider) { + SerializationContext provider) { gen.writeString(value.toUpperCase()); } } diff --git a/src/test/java/tools/jackson/databind/ser/jdk/CollectionSerializationTest.java b/src/test/java/tools/jackson/databind/ser/jdk/CollectionSerializationTest.java index 332fde19cd..53771f743c 100644 --- a/src/test/java/tools/jackson/databind/ser/jdk/CollectionSerializationTest.java +++ b/src/test/java/tools/jackson/databind/ser/jdk/CollectionSerializationTest.java @@ -59,7 +59,7 @@ static class ListSerializer extends StdSerializer> public ListSerializer() { super(List.class); } @Override - public void serialize(List value, JsonGenerator gen, SerializerProvider provider) + public void serialize(List value, JsonGenerator gen, SerializationContext provider) { // just use standard List.toString(), output as JSON String gen.writeString(value.toString()); diff --git a/src/test/java/tools/jackson/databind/ser/jdk/EnumSerializationTest.java b/src/test/java/tools/jackson/databind/ser/jdk/EnumSerializationTest.java index e801ea4d97..fee07c3953 100644 --- a/src/test/java/tools/jackson/databind/ser/jdk/EnumSerializationTest.java +++ b/src/test/java/tools/jackson/databind/ser/jdk/EnumSerializationTest.java @@ -72,13 +72,13 @@ protected static enum SerializableEnum implements JacksonSerializable private SerializableEnum() { } @Override - public void serializeWithType(JsonGenerator g, SerializerProvider provider, TypeSerializer typeSer) + public void serializeWithType(JsonGenerator g, SerializationContext provider, TypeSerializer typeSer) { serialize(g, provider); } @Override - public void serialize(JsonGenerator g, SerializerProvider provider) + public void serialize(JsonGenerator g, SerializationContext provider) { g.writeString("foo"); } @@ -118,7 +118,7 @@ static class LowerCasingEnumSerializer extends StdSerializer public LowerCasingEnumSerializer() { super(Enum.class); } @Override public void serialize(Enum value, JsonGenerator g, - SerializerProvider provider) { + SerializationContext provider) { g.writeString(value.name().toLowerCase()); } } diff --git a/src/test/java/tools/jackson/databind/ser/jdk/IterableSerializationTest.java b/src/test/java/tools/jackson/databind/ser/jdk/IterableSerializationTest.java index a8a100577a..ea010b6fd3 100644 --- a/src/test/java/tools/jackson/databind/ser/jdk/IterableSerializationTest.java +++ b/src/test/java/tools/jackson/databind/ser/jdk/IterableSerializationTest.java @@ -97,7 +97,7 @@ static class B { static class ASerializer extends ValueSerializer { @Override - public void serialize(A a, JsonGenerator g, SerializerProvider provider) + public void serialize(A a, JsonGenerator g, SerializationContext provider) { g.writeStartArray(); g.writeString("Hello world."); diff --git a/src/test/java/tools/jackson/databind/ser/jdk/MapKeySerializationTest.java b/src/test/java/tools/jackson/databind/ser/jdk/MapKeySerializationTest.java index 023f31bb80..8624ca6e65 100644 --- a/src/test/java/tools/jackson/databind/ser/jdk/MapKeySerializationTest.java +++ b/src/test/java/tools/jackson/databind/ser/jdk/MapKeySerializationTest.java @@ -29,7 +29,7 @@ public class MapKeySerializationTest extends DatabindTestUtil static class KarlSerializer extends ValueSerializer { @Override - public void serialize(String value, JsonGenerator gen, SerializerProvider provider) { + public void serialize(String value, JsonGenerator gen, SerializationContext provider) { gen.writeName("Karl"); } } @@ -92,7 +92,7 @@ public String toString() { static class ABCKeySerializer extends ValueSerializer { @Override public void serialize(ABC value, JsonGenerator gen, - SerializerProvider provider) { + SerializationContext provider) { gen.writeName("xxx"+value); } } @@ -102,7 +102,7 @@ static class NullKeySerializer extends ValueSerializer private String _null; public NullKeySerializer(String s) { _null = s; } @Override - public void serialize(Object value, JsonGenerator gen, SerializerProvider provider) { + public void serialize(Object value, JsonGenerator gen, SerializationContext provider) { gen.writeName(_null); } } @@ -112,7 +112,7 @@ static class NullValueSerializer extends ValueSerializer private String _null; public NullValueSerializer(String s) { _null = s; } @Override - public void serialize(Object value, JsonGenerator gen, SerializerProvider provider) { + public void serialize(Object value, JsonGenerator gen, SerializationContext provider) { gen.writeString(_null); } } @@ -120,7 +120,7 @@ public void serialize(Object value, JsonGenerator gen, SerializerProvider provid static class DefaultKeySerializer extends ValueSerializer { @Override - public void serialize(Object value, JsonGenerator g, SerializerProvider provider) { + public void serialize(Object value, JsonGenerator g, SerializationContext provider) { g.writeName("DEFAULT:"+value); } } diff --git a/src/test/java/tools/jackson/databind/ser/jdk/MapSerializationTest.java b/src/test/java/tools/jackson/databind/ser/jdk/MapSerializationTest.java index 642c45f897..eec949f4a7 100644 --- a/src/test/java/tools/jackson/databind/ser/jdk/MapSerializationTest.java +++ b/src/test/java/tools/jackson/databind/ser/jdk/MapSerializationTest.java @@ -35,7 +35,7 @@ static class PseudoMapSerializer extends ValueSerializer> { @Override public void serialize(Map value, - JsonGenerator gen, SerializerProvider provider) + JsonGenerator gen, SerializationContext provider) { // just use standard Map.toString(), output as JSON String gen.writeString(value.toString()); diff --git a/src/test/java/tools/jackson/databind/ser/jdk/NumberSerTest.java b/src/test/java/tools/jackson/databind/ser/jdk/NumberSerTest.java index 3602b36b24..db6432756d 100644 --- a/src/test/java/tools/jackson/databind/ser/jdk/NumberSerTest.java +++ b/src/test/java/tools/jackson/databind/ser/jdk/NumberSerTest.java @@ -14,7 +14,7 @@ import tools.jackson.core.JsonGenerator; import tools.jackson.databind.ObjectMapper; -import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.SerializationContext; import tools.jackson.databind.ValueSerializer; import tools.jackson.databind.annotation.JsonSerialize; import tools.jackson.databind.module.SimpleModule; @@ -103,7 +103,7 @@ static class BigDecimalAsStringSerializer extends ValueSerializer { private final DecimalFormat df = createDecimalFormatForDefaultLocale("0.0"); @Override - public void serialize(BigDecimal value, JsonGenerator gen, SerializerProvider serializers) { + public void serialize(BigDecimal value, JsonGenerator gen, SerializationContext serializers) { gen.writeString(df.format(value)); } } @@ -112,7 +112,7 @@ static class BigDecimalAsNumberSerializer extends ValueSerializer { private final DecimalFormat df = createDecimalFormatForDefaultLocale("0.0"); @Override - public void serialize(BigDecimal value, JsonGenerator gen, SerializerProvider serializers) { + public void serialize(BigDecimal value, JsonGenerator gen, SerializationContext serializers) { gen.writeNumber(df.format(value)); } } diff --git a/src/test/java/tools/jackson/databind/util/TokenBufferTest.java b/src/test/java/tools/jackson/databind/util/TokenBufferTest.java index 7fe91339d7..6268adc7e7 100644 --- a/src/test/java/tools/jackson/databind/util/TokenBufferTest.java +++ b/src/test/java/tools/jackson/databind/util/TokenBufferTest.java @@ -41,7 +41,7 @@ static class Serializer3816 extends StdSerializer { } @Override - public void serialize(Foo3816 value, JsonGenerator gen, SerializerProvider provider) { + public void serialize(Foo3816 value, JsonGenerator gen, SerializationContext provider) { gen.writeStartObject(); gen.writeName("field"); gen.writeString(new StringReader("foobar"), 6);