Changes wrt databind/3043 (SerializerProvider -> SerializationContext)

FasterXML · Nov 29, 2024 · eda1fae · eda1fae
1 parent 9c09196
commit eda1fae
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 52 deletions.
diff --git a/jakarta-jsonp/src/main/java/tools/jackson/datatype/jsonp/JsonValueSerializer.java b/jakarta-jsonp/src/main/java/tools/jackson/datatype/jsonp/JsonValueSerializer.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.StdSerializer;
 
@@ -23,27 +23,27 @@ public JsonValueSerializer() {
      */
 
     @Override
-    public void serialize(JsonValue value, JsonGenerator g, SerializerProvider provider)
+    public void serialize(JsonValue value, JsonGenerator g, SerializationContext ctxt)
         throws JacksonException
     {
         switch (value.getValueType()) {
         case ARRAY:
             g.writeStartArray();
-            serializeArrayContents((JsonArray) value, g, provider);
+            serializeArrayContents((JsonArray) value, g, ctxt);
             g.writeEndArray();
             break;
         case OBJECT:
             g.writeStartObject(value);
-            serializeObjectContents((JsonObject) value, g, provider);
+            serializeObjectContents((JsonObject) value, g, ctxt);
             g.writeEndObject();
             break;
         default: // value type of some kind (scalar)
-            serializeScalar(value, g, provider);
+            serializeScalar(value, g, ctxt);
         }
     }
 
     @Override
-    public void serializeWithType(JsonValue value, JsonGenerator g, SerializerProvider ctxt,
+    public void serializeWithType(JsonValue value, JsonGenerator g, SerializationContext ctxt,
             TypeSerializer typeSer)
         throws JacksonException
     {
@@ -67,7 +67,7 @@ public void serializeWithType(JsonValue value, JsonGenerator g, SerializerProvid
      */
 
     protected void serializeScalar(JsonValue value,
-            JsonGenerator g, SerializerProvider provider)
+            JsonGenerator g, SerializationContext ctxt)
         throws JacksonException
     {
         switch (value.getValueType()) {
@@ -103,24 +103,24 @@ protected void serializeScalar(JsonValue value,
     }
 
     protected void serializeArrayContents(JsonArray values,
-            JsonGenerator g, SerializerProvider provider)
+            JsonGenerator g, SerializationContext ctxt)
         throws JacksonException
     {
         if (!values.isEmpty()) {
             for (JsonValue value : values) {
-                serialize(value, g, provider);
+                serialize(value, g, ctxt);
             }
         }
     }
 
     protected void serializeObjectContents(JsonObject ob,
-            JsonGenerator g, SerializerProvider provider)
+            JsonGenerator g, SerializationContext ctxt)
         throws JacksonException
     {
         if (!ob.isEmpty()) {
             for (Map.Entry<String, JsonValue> entry : ob.entrySet()) {
                 g.writeName(entry.getKey());
-                serialize(entry.getValue(), g, provider);
+                serialize(entry.getValue(), g, ctxt);
             }
         }
     }

diff --git a/...l/src/main/java/tools/jackson/datatype/jakarta/mail/JakartaInternetAddressSerializer.java b/...l/src/main/java/tools/jackson/datatype/jakarta/mail/JakartaInternetAddressSerializer.java
@@ -19,7 +19,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.StdScalarSerializer;
 
 import jakarta.mail.internet.InternetAddress;
@@ -34,7 +34,7 @@ public JakartaInternetAddressSerializer() {
     }
 
     @Override
-    public void serialize(InternetAddress value, JsonGenerator gen, SerializerProvider provider)
+    public void serialize(InternetAddress value, JsonGenerator gen, SerializationContext ctxt)
         throws JacksonException
     {
         gen.writeString(value.toString());

diff --git a/joda-money/src/main/java/tools/jackson/datatype/jodamoney/CurrencyUnitSerializer.java b/joda-money/src/main/java/tools/jackson/datatype/jodamoney/CurrencyUnitSerializer.java
@@ -5,7 +5,7 @@
 import tools.jackson.core.JacksonException;
 import tools.jackson.core.JsonGenerator;
 
-import tools.jackson.databind.SerializerProvider;
+import tools.jackson.databind.SerializationContext;
 
 public class CurrencyUnitSerializer extends JodaMoneySerializerBase<CurrencyUnit>
 {
@@ -15,7 +15,7 @@ public CurrencyUnitSerializer() {
 
     @Override
     public void serialize(final CurrencyUnit currencyUnit,
-            final JsonGenerator g, final SerializerProvider ctxt)
+            final JsonGenerator g, final SerializationContext ctxt)
         throws JacksonException
     {
         g.writeString(currencyUnit.getCode());

diff --git a/joda-money/src/main/java/tools/jackson/datatype/jodamoney/JodaMoneySerializerBase.java b/joda-money/src/main/java/tools/jackson/datatype/jodamoney/JodaMoneySerializerBase.java
@@ -5,7 +5,7 @@
 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.StdSerializer;
 
@@ -14,7 +14,7 @@ abstract class JodaMoneySerializerBase<T> extends StdSerializer<T>
     protected JodaMoneySerializerBase(Class<T> cls) { super(cls); }
 
     @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/joda-money/src/main/java/tools/jackson/datatype/jodamoney/MoneySerializer.java b/joda-money/src/main/java/tools/jackson/datatype/jodamoney/MoneySerializer.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 static java.util.Objects.requireNonNull;
@@ -27,7 +27,7 @@ public MoneySerializer() {
 
     @Override
     public void serialize(final Money value,
-            final JsonGenerator g, final SerializerProvider ctxt)
+            final JsonGenerator g, final SerializationContext ctxt)
         throws JacksonException
     {
         g.writeStartObject();
@@ -39,7 +39,7 @@ public void serialize(final Money value,
     //    serialized as JSON Objects, unlike most other Joda types
     @Override
     public void serializeWithType(final Money value,
-            final JsonGenerator g, final SerializerProvider ctxt,
+            final JsonGenerator g, final SerializationContext ctxt,
             final TypeSerializer typeSer)
         throws JacksonException
     {
@@ -51,7 +51,7 @@ public void serializeWithType(final Money value,
     }
 
     private final void _writeProperties(final Money value,
-            final JsonGenerator g, final SerializerProvider ctxt)
+            final JsonGenerator g, final SerializationContext ctxt)
                     throws JacksonException
     {
         ctxt.defaultSerializeProperty("amount", amountConverter.fromMoney(value), g);

diff --git a/json-org/src/main/java/tools/jackson/datatype/jsonorg/JSONArraySerializer.java b/json-org/src/main/java/tools/jackson/datatype/jsonorg/JSONArraySerializer.java
@@ -19,21 +19,21 @@ public JSONArraySerializer()
     }
 
     @Override
-    public boolean isEmpty(SerializerProvider provider, JSONArray value) {
+    public boolean isEmpty(SerializationContext ctxt, JSONArray value) {
         return (value == null) || value.length() == 0;
     }
 
     @Override
-    public void serialize(JSONArray value, JsonGenerator g, SerializerProvider provider)
+    public void serialize(JSONArray value, JsonGenerator g, SerializationContext ctxt)
         throws JacksonException
     {
         g.writeStartArray();
-        serializeContents(value, g, provider);
+        serializeContents(value, g, ctxt);
         g.writeEndArray();
     }
 
     @Override
-    public void serializeWithType(JSONArray value, JsonGenerator g, SerializerProvider ctxt,
+    public void serializeWithType(JSONArray value, JsonGenerator g, SerializationContext ctxt,
             TypeSerializer typeSer)
         throws JacksonException
     {
@@ -44,7 +44,7 @@ public void serializeWithType(JSONArray value, JsonGenerator g, SerializerProvid
         typeSer.writeTypeSuffix(g, ctxt, typeIdDef);
     }
 
-    protected void serializeContents(JSONArray value, JsonGenerator g, SerializerProvider provider)
+    protected void serializeContents(JSONArray value, JsonGenerator g, SerializationContext ctxt)
         throws JacksonException
     {
         for (int i = 0, len = value.length(); i < len; ++i) {
@@ -55,9 +55,9 @@ protected void serializeContents(JSONArray value, JsonGenerator g, SerializerPro
             }
             Class<?> cls = ob.getClass();
             if (cls == JSONObject.class) {
-                JSONObjectSerializer.instance.serialize((JSONObject) ob, g, provider);
+                JSONObjectSerializer.instance.serialize((JSONObject) ob, g, ctxt);
             } else if (cls == JSONArray.class) {
-                serialize((JSONArray) ob, g, provider);
+                serialize((JSONArray) ob, g, ctxt);
             } else  if (cls == String.class) {
                 g.writeString((String) ob);
             } else  if (cls == Integer.class) {
@@ -69,11 +69,11 @@ protected void serializeContents(JSONArray value, JsonGenerator g, SerializerPro
             } else  if (cls == Double.class) {
                 g.writeNumber(((Double) ob).doubleValue());
             } else if (JSONObject.class.isAssignableFrom(cls)) { // sub-class
-                JSONObjectSerializer.instance.serialize((JSONObject) ob, g, provider);
+                JSONObjectSerializer.instance.serialize((JSONObject) ob, g, ctxt);
             } else if (JSONArray.class.isAssignableFrom(cls)) { // sub-class
-                serialize((JSONArray) ob, g, provider);
+                serialize((JSONArray) ob, g, ctxt);
             } else {
-                provider.writeValue(g, ob);
+                ctxt.writeValue(g, ob);
             }
         }        
     }

diff --git a/json-org/src/main/java/tools/jackson/datatype/jsonorg/JSONObjectSerializer.java b/json-org/src/main/java/tools/jackson/datatype/jsonorg/JSONObjectSerializer.java
@@ -20,21 +20,21 @@ public JSONObjectSerializer()
     }
 
     @Override
-    public boolean isEmpty(SerializerProvider provider, JSONObject value) {
+    public boolean isEmpty(SerializationContext provider, JSONObject value) {
         return (value == null) || value.length() == 0;
     }
 
     @Override
-    public void serialize(JSONObject value, JsonGenerator g, SerializerProvider provider)
+    public void serialize(JSONObject value, JsonGenerator g, SerializationContext ctxt)
         throws JacksonException
     {
         g.writeStartObject(value);
-        serializeContents(value, g, provider);
+        serializeContents(value, g, ctxt);
         g.writeEndObject();
     }
 
     @Override
-    public void serializeWithType(JSONObject value, JsonGenerator g, SerializerProvider ctxt,
+    public void serializeWithType(JSONObject value, JsonGenerator g, SerializationContext ctxt,
             TypeSerializer typeSer)
         throws JacksonException
     {
@@ -46,7 +46,7 @@ public void serializeWithType(JSONObject value, JsonGenerator g, SerializerProvi
 
     }
 
-    protected void serializeContents(JSONObject value, JsonGenerator g, SerializerProvider provider)
+    protected void serializeContents(JSONObject value, JsonGenerator g, SerializationContext ctxt)
         throws JacksonException
     {
         Iterator<?> it = value.keys();
@@ -61,9 +61,9 @@ protected void serializeContents(JSONObject value, JsonGenerator g, SerializerPr
             g.writeName(key);
             Class<?> cls = ob.getClass();
             if (cls == JSONObject.class) {
-                serialize((JSONObject) ob, g, provider);
+                serialize((JSONObject) ob, g, ctxt);
             } else if (cls == JSONArray.class) {
-                JSONArraySerializer.instance.serialize((JSONArray) ob, g, provider);
+                JSONArraySerializer.instance.serialize((JSONArray) ob, g, ctxt);
             } else  if (cls == String.class) {
                 g.writeString((String) ob);
             } else  if (cls == Integer.class) {
@@ -75,11 +75,11 @@ protected void serializeContents(JSONObject value, JsonGenerator g, SerializerPr
             } else  if (cls == Double.class) {
                 g.writeNumber(((Double) ob).doubleValue());
             } else if (JSONObject.class.isAssignableFrom(cls)) { // sub-class
-                serialize((JSONObject) ob, g, provider);
+                serialize((JSONObject) ob, g, ctxt);
             } else if (JSONArray.class.isAssignableFrom(cls)) { // sub-class
-                JSONArraySerializer.instance.serialize((JSONArray) ob, g, provider);
+                JSONArraySerializer.instance.serialize((JSONArray) ob, g, ctxt);
             } else {
-                provider.writeValue(g, ob);
+                ctxt.writeValue(g, ob);
             }
         }
     }

diff --git a/jsr-353/src/main/java/tools/jackson/datatype/jsr353/JsonValueSerializer.java b/jsr-353/src/main/java/tools/jackson/datatype/jsr353/JsonValueSerializer.java
@@ -6,7 +6,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.StdSerializer;
 
@@ -23,27 +23,27 @@ public JsonValueSerializer() {
      */
 
     @Override
-    public void serialize(JsonValue value, JsonGenerator g, SerializerProvider provider)
+    public void serialize(JsonValue value, JsonGenerator g, SerializationContext ctxt)
         throws JacksonException
     {
         switch (value.getValueType()) {
         case ARRAY:
             g.writeStartArray();
-            serializeArrayContents((JsonArray) value, g, provider);
+            serializeArrayContents((JsonArray) value, g, ctxt);
             g.writeEndArray();
             break;
         case OBJECT:
             g.writeStartObject(value);
-            serializeObjectContents((JsonObject) value, g, provider);
+            serializeObjectContents((JsonObject) value, g, ctxt);
             g.writeEndObject();
             break;
         default: // value type of some kind (scalar)
-            serializeScalar(value, g, provider);
+            serializeScalar(value, g, ctxt);
         }
     }
 
     @Override
-    public void serializeWithType(JsonValue value, JsonGenerator g, SerializerProvider ctxt,
+    public void serializeWithType(JsonValue value, JsonGenerator g, SerializationContext ctxt,
             TypeSerializer typeSer)
         throws JacksonException
     {
@@ -67,7 +67,7 @@ public void serializeWithType(JsonValue value, JsonGenerator g, SerializerProvid
      */
 
     protected void serializeScalar(JsonValue value,
-            JsonGenerator g, SerializerProvider provider)
+            JsonGenerator g, SerializationContext ctxt)
         throws JacksonException
     {
         switch (value.getValueType()) {
@@ -103,24 +103,24 @@ protected void serializeScalar(JsonValue value,
     }
 
     protected void serializeArrayContents(JsonArray values,
-            JsonGenerator g, SerializerProvider provider)
+            JsonGenerator g, SerializationContext ctxt)
         throws JacksonException
     {
         if (!values.isEmpty()) {
             for (JsonValue value : values) {
-                serialize(value, g, provider);
+                serialize(value, g, ctxt);
             }
         }
     }
 
     protected void serializeObjectContents(JsonObject ob,
-            JsonGenerator g, SerializerProvider provider)
+            JsonGenerator g, SerializationContext ctxt)
         throws JacksonException
     {
         if (!ob.isEmpty()) {
             for (Map.Entry<String, JsonValue> entry : ob.entrySet()) {
                 g.writeName(entry.getKey());
-                serialize(entry.getValue(), g, provider);
+                serialize(entry.getValue(), g, ctxt);
             }
         }
     }