Changes wrt databind/3043 (SerializerProvider -> SerializationContext)

cowtowncoder · cowtowncoder · commit eda1fae8ec40 · 2024-11-29T14:19:36.000-08:00
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/jakarta-mail/src/main/java/tools/jackson/datatype/jakarta/mail/JakartaInternetAddressSerializer.java b/jakarta-mail/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);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`import tools.jackson.core.*;`
`6`	`6`	`import tools.jackson.core.type.WritableTypeId;`
`7`		`-import tools.jackson.databind.SerializerProvider;`
	`7`	`+import tools.jackson.databind.SerializationContext;`
`8`	`8`	`import tools.jackson.databind.jsontype.TypeSerializer;`
`9`	`9`	`import tools.jackson.databind.ser.std.StdSerializer;`
`10`	`10`
`@@ -23,27 +23,27 @@ public JsonValueSerializer() {`
`23`	`23`	`*/`
`24`	`24`
`25`	`25`	`@Override`
`26`		`- public void serialize(JsonValue value, JsonGenerator g, SerializerProvider provider)`
	`26`	`+ public void serialize(JsonValue value, JsonGenerator g, SerializationContext ctxt)`
`27`	`27`	`throws JacksonException`
`28`	`28`	`{`
`29`	`29`	`switch (value.getValueType()) {`
`30`	`30`	`case ARRAY:`
`31`	`31`	`g.writeStartArray();`
`32`		`- serializeArrayContents((JsonArray) value, g, provider);`
	`32`	`+ serializeArrayContents((JsonArray) value, g, ctxt);`
`33`	`33`	`g.writeEndArray();`
`34`	`34`	`break;`
`35`	`35`	`case OBJECT:`
`36`	`36`	`g.writeStartObject(value);`
`37`		`- serializeObjectContents((JsonObject) value, g, provider);`
	`37`	`+ serializeObjectContents((JsonObject) value, g, ctxt);`
`38`	`38`	`g.writeEndObject();`
`39`	`39`	`break;`
`40`	`40`	`default: // value type of some kind (scalar)`
`41`		`- serializeScalar(value, g, provider);`
	`41`	`+ serializeScalar(value, g, ctxt);`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`
`46`		`- public void serializeWithType(JsonValue value, JsonGenerator g, SerializerProvider ctxt,`
	`46`	`+ public void serializeWithType(JsonValue value, JsonGenerator g, SerializationContext ctxt,`
`47`	`47`	`TypeSerializer typeSer)`
`48`	`48`	`throws JacksonException`
`49`	`49`	`{`
`@@ -67,7 +67,7 @@ public void serializeWithType(JsonValue value, JsonGenerator g, SerializerProvid`
`67`	`67`	`*/`
`68`	`68`
`69`	`69`	`protected void serializeScalar(JsonValue value,`
`70`		`- JsonGenerator g, SerializerProvider provider)`
	`70`	`+ JsonGenerator g, SerializationContext ctxt)`
`71`	`71`	`throws JacksonException`
`72`	`72`	`{`
`73`	`73`	`switch (value.getValueType()) {`
`@@ -103,24 +103,24 @@ protected void serializeScalar(JsonValue value,`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`protected void serializeArrayContents(JsonArray values,`
`106`		`- JsonGenerator g, SerializerProvider provider)`
	`106`	`+ JsonGenerator g, SerializationContext ctxt)`
`107`	`107`	`throws JacksonException`
`108`	`108`	`{`
`109`	`109`	`if (!values.isEmpty()) {`
`110`	`110`	`for (JsonValue value : values) {`
`111`		`- serialize(value, g, provider);`
	`111`	`+ serialize(value, g, ctxt);`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`protected void serializeObjectContents(JsonObject ob,`
`117`		`- JsonGenerator g, SerializerProvider provider)`
	`117`	`+ JsonGenerator g, SerializationContext ctxt)`
`118`	`118`	`throws JacksonException`
`119`	`119`	`{`
`120`	`120`	`if (!ob.isEmpty()) {`
`121`	`121`	`for (Map.Entry<String, JsonValue> entry : ob.entrySet()) {`
`122`	`122`	`g.writeName(entry.getKey());`
`123`		`- serialize(entry.getValue(), g, provider);`
	`123`	`+ serialize(entry.getValue(), g, ctxt);`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`import tools.jackson.core.JacksonException;`
`20`	`20`	`import tools.jackson.core.JsonGenerator;`
`21`	`21`
`22`		`-import tools.jackson.databind.SerializerProvider;`
	`22`	`+import tools.jackson.databind.SerializationContext;`
`23`	`23`	`import tools.jackson.databind.ser.std.StdScalarSerializer;`
`24`	`24`
`25`	`25`	`import jakarta.mail.internet.InternetAddress;`
`@@ -34,7 +34,7 @@ public JakartaInternetAddressSerializer() {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Override`
`37`		`- public void serialize(InternetAddress value, JsonGenerator gen, SerializerProvider provider)`
	`37`	`+ public void serialize(InternetAddress value, JsonGenerator gen, SerializationContext ctxt)`
`38`	`38`	`throws JacksonException`
`39`	`39`	`{`
`40`	`40`	`gen.writeString(value.toString());`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`import tools.jackson.core.JacksonException;`
`6`	`6`	`import tools.jackson.core.JsonGenerator;`
`7`	`7`
`8`		`-import tools.jackson.databind.SerializerProvider;`
	`8`	`+import tools.jackson.databind.SerializationContext;`
`9`	`9`
`10`	`10`	`public class CurrencyUnitSerializer extends JodaMoneySerializerBase<CurrencyUnit>`
`11`	`11`	`{`
`@@ -15,7 +15,7 @@ public CurrencyUnitSerializer() {`
`15`	`15`
`16`	`16`	`@Override`
`17`	`17`	`public void serialize(final CurrencyUnit currencyUnit,`
`18`		`- final JsonGenerator g, final SerializerProvider ctxt)`
	`18`	`+ final JsonGenerator g, final SerializationContext ctxt)`
`19`	`19`	`throws JacksonException`
`20`	`20`	`{`
`21`	`21`	`g.writeString(currencyUnit.getCode());`
Original file line number	Diff line number	Diff line change
`@@ -19,21 +19,21 @@ public JSONArraySerializer()`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Override`
`22`		`- public boolean isEmpty(SerializerProvider provider, JSONArray value) {`
	`22`	`+ public boolean isEmpty(SerializationContext ctxt, JSONArray value) {`
`23`	`23`	`return (value == null) \|\| value.length() == 0;`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@Override`
`27`		`- public void serialize(JSONArray value, JsonGenerator g, SerializerProvider provider)`
	`27`	`+ public void serialize(JSONArray value, JsonGenerator g, SerializationContext ctxt)`
`28`	`28`	`throws JacksonException`
`29`	`29`	`{`
`30`	`30`	`g.writeStartArray();`
`31`		`- serializeContents(value, g, provider);`
	`31`	`+ serializeContents(value, g, ctxt);`
`32`	`32`	`g.writeEndArray();`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`
`36`		`- public void serializeWithType(JSONArray value, JsonGenerator g, SerializerProvider ctxt,`
	`36`	`+ public void serializeWithType(JSONArray value, JsonGenerator g, SerializationContext ctxt,`
`37`	`37`	`TypeSerializer typeSer)`
`38`	`38`	`throws JacksonException`
`39`	`39`	`{`
`@@ -44,7 +44,7 @@ public void serializeWithType(JSONArray value, JsonGenerator g, SerializerProvid`
`44`	`44`	`typeSer.writeTypeSuffix(g, ctxt, typeIdDef);`
`45`	`45`	`}`
`46`	`46`
`47`		`- protected void serializeContents(JSONArray value, JsonGenerator g, SerializerProvider provider)`
	`47`	`+ protected void serializeContents(JSONArray value, JsonGenerator g, SerializationContext ctxt)`
`48`	`48`	`throws JacksonException`
`49`	`49`	`{`
`50`	`50`	`for (int i = 0, len = value.length(); i < len; ++i) {`
`@@ -55,9 +55,9 @@ protected void serializeContents(JSONArray value, JsonGenerator g, SerializerPro`
`55`	`55`	`}`
`56`	`56`	`Class<?> cls = ob.getClass();`
`57`	`57`	`if (cls == JSONObject.class) {`
`58`		`- JSONObjectSerializer.instance.serialize((JSONObject) ob, g, provider);`
	`58`	`+ JSONObjectSerializer.instance.serialize((JSONObject) ob, g, ctxt);`
`59`	`59`	`} else if (cls == JSONArray.class) {`
`60`		`- serialize((JSONArray) ob, g, provider);`
	`60`	`+ serialize((JSONArray) ob, g, ctxt);`
`61`	`61`	`} else if (cls == String.class) {`
`62`	`62`	`g.writeString((String) ob);`
`63`	`63`	`} else if (cls == Integer.class) {`
`@@ -69,11 +69,11 @@ protected void serializeContents(JSONArray value, JsonGenerator g, SerializerPro`
`69`	`69`	`} else if (cls == Double.class) {`
`70`	`70`	`g.writeNumber(((Double) ob).doubleValue());`
`71`	`71`	`} else if (JSONObject.class.isAssignableFrom(cls)) { // sub-class`
`72`		`- JSONObjectSerializer.instance.serialize((JSONObject) ob, g, provider);`
	`72`	`+ JSONObjectSerializer.instance.serialize((JSONObject) ob, g, ctxt);`
`73`	`73`	`} else if (JSONArray.class.isAssignableFrom(cls)) { // sub-class`
`74`		`- serialize((JSONArray) ob, g, provider);`
	`74`	`+ serialize((JSONArray) ob, g, ctxt);`
`75`	`75`	`} else {`
`76`		`- provider.writeValue(g, ob);`
	`76`	`+ ctxt.writeValue(g, ob);`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,21 +20,21 @@ public JSONObjectSerializer()`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`@Override`
`23`		`- public boolean isEmpty(SerializerProvider provider, JSONObject value) {`
	`23`	`+ public boolean isEmpty(SerializationContext provider, JSONObject value) {`
`24`	`24`	`return (value == null) \|\| value.length() == 0;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`@Override`
`28`		`- public void serialize(JSONObject value, JsonGenerator g, SerializerProvider provider)`
	`28`	`+ public void serialize(JSONObject value, JsonGenerator g, SerializationContext ctxt)`
`29`	`29`	`throws JacksonException`
`30`	`30`	`{`
`31`	`31`	`g.writeStartObject(value);`
`32`		`- serializeContents(value, g, provider);`
	`32`	`+ serializeContents(value, g, ctxt);`
`33`	`33`	`g.writeEndObject();`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Override`
`37`		`- public void serializeWithType(JSONObject value, JsonGenerator g, SerializerProvider ctxt,`
	`37`	`+ public void serializeWithType(JSONObject value, JsonGenerator g, SerializationContext ctxt,`
`38`	`38`	`TypeSerializer typeSer)`
`39`	`39`	`throws JacksonException`
`40`	`40`	`{`
`@@ -46,7 +46,7 @@ public void serializeWithType(JSONObject value, JsonGenerator g, SerializerProvi`
`46`	`46`
`47`	`47`	`}`
`48`	`48`
`49`		`- protected void serializeContents(JSONObject value, JsonGenerator g, SerializerProvider provider)`
	`49`	`+ protected void serializeContents(JSONObject value, JsonGenerator g, SerializationContext ctxt)`
`50`	`50`	`throws JacksonException`
`51`	`51`	`{`
`52`	`52`	`Iterator<?> it = value.keys();`
`@@ -61,9 +61,9 @@ protected void serializeContents(JSONObject value, JsonGenerator g, SerializerPr`
`61`	`61`	`g.writeName(key);`
`62`	`62`	`Class<?> cls = ob.getClass();`
`63`	`63`	`if (cls == JSONObject.class) {`
`64`		`- serialize((JSONObject) ob, g, provider);`
	`64`	`+ serialize((JSONObject) ob, g, ctxt);`
`65`	`65`	`} else if (cls == JSONArray.class) {`
`66`		`- JSONArraySerializer.instance.serialize((JSONArray) ob, g, provider);`
	`66`	`+ JSONArraySerializer.instance.serialize((JSONArray) ob, g, ctxt);`
`67`	`67`	`} else if (cls == String.class) {`
`68`	`68`	`g.writeString((String) ob);`
`69`	`69`	`} else if (cls == Integer.class) {`
`@@ -75,11 +75,11 @@ protected void serializeContents(JSONObject value, JsonGenerator g, SerializerPr`
`75`	`75`	`} else if (cls == Double.class) {`
`76`	`76`	`g.writeNumber(((Double) ob).doubleValue());`
`77`	`77`	`} else if (JSONObject.class.isAssignableFrom(cls)) { // sub-class`
`78`		`- serialize((JSONObject) ob, g, provider);`
	`78`	`+ serialize((JSONObject) ob, g, ctxt);`
`79`	`79`	`} else if (JSONArray.class.isAssignableFrom(cls)) { // sub-class`
`80`		`- JSONArraySerializer.instance.serialize((JSONArray) ob, g, provider);`
	`80`	`+ JSONArraySerializer.instance.serialize((JSONArray) ob, g, ctxt);`
`81`	`81`	`} else {`
`82`		`- provider.writeValue(g, ob);`
	`82`	`+ ctxt.writeValue(g, ob);`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`import tools.jackson.core.*;`
`8`	`8`	`import tools.jackson.core.type.WritableTypeId;`
`9`		`-import tools.jackson.databind.SerializerProvider;`
	`9`	`+import tools.jackson.databind.SerializationContext;`
`10`	`10`	`import tools.jackson.databind.jsontype.TypeSerializer;`
`11`	`11`	`import tools.jackson.databind.ser.std.StdSerializer;`
`12`	`12`
`@@ -23,27 +23,27 @@ public JsonValueSerializer() {`
`23`	`23`	`*/`
`24`	`24`
`25`	`25`	`@Override`
`26`		`- public void serialize(JsonValue value, JsonGenerator g, SerializerProvider provider)`
	`26`	`+ public void serialize(JsonValue value, JsonGenerator g, SerializationContext ctxt)`
`27`	`27`	`throws JacksonException`
`28`	`28`	`{`
`29`	`29`	`switch (value.getValueType()) {`
`30`	`30`	`case ARRAY:`
`31`	`31`	`g.writeStartArray();`
`32`		`- serializeArrayContents((JsonArray) value, g, provider);`
	`32`	`+ serializeArrayContents((JsonArray) value, g, ctxt);`
`33`	`33`	`g.writeEndArray();`
`34`	`34`	`break;`
`35`	`35`	`case OBJECT:`
`36`	`36`	`g.writeStartObject(value);`
`37`		`- serializeObjectContents((JsonObject) value, g, provider);`
	`37`	`+ serializeObjectContents((JsonObject) value, g, ctxt);`
`38`	`38`	`g.writeEndObject();`
`39`	`39`	`break;`
`40`	`40`	`default: // value type of some kind (scalar)`
`41`		`- serializeScalar(value, g, provider);`
	`41`	`+ serializeScalar(value, g, ctxt);`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`
`46`		`- public void serializeWithType(JsonValue value, JsonGenerator g, SerializerProvider ctxt,`
	`46`	`+ public void serializeWithType(JsonValue value, JsonGenerator g, SerializationContext ctxt,`
`47`	`47`	`TypeSerializer typeSer)`
`48`	`48`	`throws JacksonException`
`49`	`49`	`{`
`@@ -67,7 +67,7 @@ public void serializeWithType(JsonValue value, JsonGenerator g, SerializerProvid`
`67`	`67`	`*/`
`68`	`68`
`69`	`69`	`protected void serializeScalar(JsonValue value,`
`70`		`- JsonGenerator g, SerializerProvider provider)`
	`70`	`+ JsonGenerator g, SerializationContext ctxt)`
`71`	`71`	`throws JacksonException`
`72`	`72`	`{`
`73`	`73`	`switch (value.getValueType()) {`
`@@ -103,24 +103,24 @@ protected void serializeScalar(JsonValue value,`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`protected void serializeArrayContents(JsonArray values,`
`106`		`- JsonGenerator g, SerializerProvider provider)`
	`106`	`+ JsonGenerator g, SerializationContext ctxt)`
`107`	`107`	`throws JacksonException`
`108`	`108`	`{`
`109`	`109`	`if (!values.isEmpty()) {`
`110`	`110`	`for (JsonValue value : values) {`
`111`		`- serialize(value, g, provider);`
	`111`	`+ serialize(value, g, ctxt);`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`protected void serializeObjectContents(JsonObject ob,`
`117`		`- JsonGenerator g, SerializerProvider provider)`
	`117`	`+ JsonGenerator g, SerializationContext ctxt)`
`118`	`118`	`throws JacksonException`
`119`	`119`	`{`
`120`	`120`	`if (!ob.isEmpty()) {`
`121`	`121`	`for (Map.Entry<String, JsonValue> entry : ob.entrySet()) {`
`122`	`122`	`g.writeName(entry.getKey());`
`123`		`- serialize(entry.getValue(), g, provider);`
	`123`	`+ serialize(entry.getValue(), g, ctxt);`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`	`}`