wip

pjfanning · pjfanning · commit 49ee2f38b8a5 · 2025-10-18T00:24:21.000+01:00
diff --git a/hibernate4/src/main/java/tools/jackson/datatype/hibernate4/Hibernate4Module.java b/hibernate4/src/main/java/tools/jackson/datatype/hibernate4/Hibernate4Module.java
@@ -178,7 +178,7 @@ public void setupModule(SetupContext context)
             context.appendAnnotationIntrospector(ai);
         }
         context.addSerializers(new HibernateSerializers(_mapping, _moduleFeatures));
-        context.addValueSerializerModifier(new HibernateSerializerModifier(_moduleFeatures, _sessionFactory));
+        context.addSerializerModifier(new HibernateSerializerModifier(_moduleFeatures, _sessionFactory));
     }
 
     /**
diff --git a/hibernate4/src/main/java/tools/jackson/datatype/hibernate4/HibernateProxySerializer.java b/hibernate4/src/main/java/tools/jackson/datatype/hibernate4/HibernateProxySerializer.java
@@ -175,7 +175,7 @@ public void serialize(HibernateProxy value, JsonGenerator jgen, SerializationCon
         Object proxiedValue = findProxied(value);
         // TODO: figure out how to suppress nulls, if necessary? (too late for that here)
         if (proxiedValue == null) {
-            provider.defaultSerializeNull(jgen);
+            provider.defaultSerializeNullValue(jgen);
             return;
         }
         findSerializer(provider, proxiedValue).serialize(proxiedValue, jgen, provider);
@@ -188,7 +188,7 @@ public void serializeWithType(HibernateProxy value, JsonGenerator jgen, Serializ
     {
         Object proxiedValue = findProxied(value);
         if (proxiedValue == null) {
-            provider.defaultSerializeNull(jgen);
+            provider.defaultSerializeNullValue(jgen);
             return;
         }
         /* This isn't exactly right, since type serializer really refers to proxy
@@ -203,7 +203,7 @@ public void serializeWithType(HibernateProxy value, JsonGenerator jgen, Serializ
     public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
         throws DatabindException
     {
-        SerializationContext prov = visitor.getProvider();
+        SerializationContext prov = visitor.getContext();
         if ((prov == null) || (_property == null)) {
             super.acceptJsonFormatVisitor(visitor, typeHint);
         } else {
diff --git a/hibernate4/src/main/java/tools/jackson/datatype/hibernate4/HibernateSerializerModifier.java b/hibernate4/src/main/java/tools/jackson/datatype/hibernate4/HibernateSerializerModifier.java
@@ -23,20 +23,20 @@ public HibernateSerializerModifier(int features, SessionFactory sessionFactory)
     /*
     @Override
     public ValueSerializer<?> modifySerializer(SerializationConfig config,
-            BeanDescription beanDesc, ValueSerializer<?> serializer) {
+            BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {
         return serializer;
     }
     */
 
     @Override
     public ValueSerializer<?> modifyCollectionSerializer(SerializationConfig config,
-            CollectionType valueType, BeanDescription beanDesc, ValueSerializer<?> serializer) {
+            CollectionType valueType, BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {
         return new PersistentCollectionSerializer(valueType, serializer, _features, _sessionFactory);
     }
 
     @Override
     public ValueSerializer<?> modifyMapSerializer(SerializationConfig config,
-            MapType valueType, BeanDescription beanDesc, ValueSerializer<?> serializer) {
+            MapType valueType, BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {
         return new PersistentCollectionSerializer(valueType, serializer, _features, _sessionFactory);
     }
 }
diff --git a/hibernate4/src/main/java/tools/jackson/datatype/hibernate4/HibernateSerializers.java b/hibernate4/src/main/java/tools/jackson/datatype/hibernate4/HibernateSerializers.java
@@ -32,7 +32,7 @@ public HibernateSerializers(Mapping mapping, int features)
 
     @Override
     public ValueSerializer<?> findSerializer(SerializationConfig config,
-            JavaType type, BeanDescription beanDesc)
+            JavaType type, BeanDescription.Supplier beanDesc)
     {
         Class<?> raw = type.getRawClass();
         if (HibernateProxy.class.isAssignableFrom(raw)) {
diff --git a/hibernate4/src/main/java/tools/jackson/datatype/hibernate4/PersistentCollectionSerializer.java b/hibernate4/src/main/java/tools/jackson/datatype/hibernate4/PersistentCollectionSerializer.java
@@ -237,7 +237,7 @@ public void serialize(Object value, JsonGenerator jgen, SerializationContext pro
         if (value instanceof PersistentCollection) {
             value = findLazyValue((PersistentCollection) value);
             if (value == null) {
-                provider.defaultSerializeNull(jgen);
+                provider.defaultSerializeNullValue(jgen);
                 return;
             }
         }
@@ -260,7 +260,7 @@ public void serializeWithType(Object value, JsonGenerator jgen, SerializationCon
         if (value instanceof PersistentCollection) {
             value = findLazyValue((PersistentCollection) value);
             if (value == null) {
-                provider.defaultSerializeNull(jgen);
+                provider.defaultSerializeNullValue(jgen);
                 return;
             }
         }
diff --git a/hibernate5-jakarta/src/main/java/tools/jackson/datatype/hibernate5/jakarta/Hibernate5JProxySerializer.java b/hibernate5-jakarta/src/main/java/tools/jackson/datatype/hibernate5/jakarta/Hibernate5JProxySerializer.java
@@ -135,7 +135,7 @@ public void serialize(HibernateProxy value, JsonGenerator g, SerializationContex
         Object proxiedValue = findProxied(value);
         // TODO: figure out how to suppress nulls, if necessary? (too late for that here)
         if (proxiedValue == null) {
-            provider.defaultSerializeNull(g);
+            provider.defaultSerializeNullValue(g);
             return;
         }
         findSerializer(provider, proxiedValue).serialize(proxiedValue, g, provider);
@@ -148,7 +148,7 @@ public void serializeWithType(HibernateProxy value, JsonGenerator g, Serializati
     {
         Object proxiedValue = findProxied(value);
         if (proxiedValue == null) {
-            provider.defaultSerializeNull(g);
+            provider.defaultSerializeNullValue(g);
             return;
         }
         /* This isn't exactly right, since type serializer really refers to proxy
@@ -163,7 +163,7 @@ public void serializeWithType(HibernateProxy value, JsonGenerator g, Serializati
     public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
         throws DatabindException
     {
-        SerializationContext prov = visitor.getProvider();
+        SerializationContext prov = visitor.getContext();
         if ((prov == null) || (_property == null)) {
             super.acceptJsonFormatVisitor(visitor, typeHint);
         } else {
diff --git a/hibernate5-jakarta/src/main/java/tools/jackson/datatype/hibernate5/jakarta/Hibernate5JSerializerModifier.java b/hibernate5-jakarta/src/main/java/tools/jackson/datatype/hibernate5/jakarta/Hibernate5JSerializerModifier.java
@@ -23,20 +23,20 @@ public Hibernate5JSerializerModifier(int features, SessionFactory sessionFactory
     /*
     @Override
     public ValueSerializer<?> modifySerializer(SerializationConfig config,
-            BeanDescription beanDesc, ValueSerializer<?> serializer) {
+            BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {
         return serializer;
     }
     */
 
     @Override
     public ValueSerializer<?> modifyCollectionSerializer(SerializationConfig config,
-            CollectionType valueType, BeanDescription beanDesc, ValueSerializer<?> serializer) {
+            CollectionType valueType, BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {
         return new PersistentCollectionSerializer(valueType, serializer, _features, _sessionFactory);
     }
 
     @Override
     public ValueSerializer<?> modifyMapSerializer(SerializationConfig config,
-            MapType valueType, BeanDescription beanDesc, ValueSerializer<?> serializer) {
+            MapType valueType, BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {
         return new PersistentCollectionSerializer(valueType, serializer, _features, _sessionFactory);
     }
 }
diff --git a/hibernate5-jakarta/src/main/java/tools/jackson/datatype/hibernate5/jakarta/Hibernate5JSerializers.java b/hibernate5-jakarta/src/main/java/tools/jackson/datatype/hibernate5/jakarta/Hibernate5JSerializers.java
@@ -31,7 +31,7 @@ public Hibernate5JSerializers(Mapping mapping, int features)
 
     @Override
     public ValueSerializer<?> findSerializer(SerializationConfig config,
-            JavaType type, BeanDescription beanDesc)
+            JavaType type, BeanDescription.Supplier beanDesc)
     {
         Class<?> raw = type.getRawClass();
         if (HibernateProxy.class.isAssignableFrom(raw)) {
diff --git a/hibernate5-jakarta/src/main/java/tools/jackson/datatype/hibernate5/jakarta/Hibernate5JakartaModule.java b/hibernate5-jakarta/src/main/java/tools/jackson/datatype/hibernate5/jakarta/Hibernate5JakartaModule.java
@@ -180,7 +180,7 @@ public void setupModule(SetupContext context)
             context.appendAnnotationIntrospector(ai);
         }
         context.addSerializers(new Hibernate5JSerializers(_mapping, _moduleFeatures));
-        context.addValueSerializerModifier(new Hibernate5JSerializerModifier(_moduleFeatures, _sessionFactory));
+        context.addSerializerModifier(new Hibernate5JSerializerModifier(_moduleFeatures, _sessionFactory));
     }
 
     /**
diff --git a/hibernate5-jakarta/src/main/java/tools/jackson/datatype/hibernate5/jakarta/PersistentCollectionSerializer.java b/hibernate5-jakarta/src/main/java/tools/jackson/datatype/hibernate5/jakarta/PersistentCollectionSerializer.java
@@ -226,7 +226,7 @@ public void serialize(Object value, JsonGenerator g, SerializationContext provid
         if (value instanceof PersistentCollection) {
             value = findLazyValue((PersistentCollection) value);
             if (value == null) {
-                provider.defaultSerializeNull(g);
+                provider.defaultSerializeNullValue(g);
                 return;
             }
         }
@@ -247,7 +247,7 @@ public void serializeWithType(Object value, JsonGenerator g, SerializationContex
         if (value instanceof PersistentCollection) {
             value = findLazyValue((PersistentCollection) value);
             if (value == null) {
-                provider.defaultSerializeNull(g);
+                provider.defaultSerializeNullValue(g);
                 return;
             }
         }
diff --git a/hibernate5/src/main/java/tools/jackson/datatype/hibernate5/Hibernate5Module.java b/hibernate5/src/main/java/tools/jackson/datatype/hibernate5/Hibernate5Module.java
@@ -180,7 +180,7 @@ public void setupModule(SetupContext context)
             context.appendAnnotationIntrospector(ai);
         }
         context.addSerializers(new HibernateSerializers(_mapping, _moduleFeatures));
-        context.addValueSerializerModifier(new HibernateSerializerModifier(_moduleFeatures, _sessionFactory));
+        context.addSerializerModifier(new HibernateSerializerModifier(_moduleFeatures, _sessionFactory));
     }
 
     /**
diff --git a/hibernate5/src/main/java/tools/jackson/datatype/hibernate5/HibernateProxySerializer.java b/hibernate5/src/main/java/tools/jackson/datatype/hibernate5/HibernateProxySerializer.java
@@ -176,7 +176,7 @@ public void serialize(HibernateProxy value, JsonGenerator g, SerializationContex
         Object proxiedValue = findProxied(value);
         // TODO: figure out how to suppress nulls, if necessary? (too late for that here)
         if (proxiedValue == null) {
-            provider.defaultSerializeNull(g);
+            provider.defaultSerializeNullValue(g);
             return;
         }
         findSerializer(provider, proxiedValue).serialize(proxiedValue, g, provider);
@@ -189,7 +189,7 @@ public void serializeWithType(HibernateProxy value, JsonGenerator g, Serializati
     {
         Object proxiedValue = findProxied(value);
         if (proxiedValue == null) {
-            provider.defaultSerializeNull(g);
+            provider.defaultSerializeNullValue(g);
             return;
         }
         /* This isn't exactly right, since type serializer really refers to proxy
@@ -204,7 +204,7 @@ public void serializeWithType(HibernateProxy value, JsonGenerator g, Serializati
     public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
         throws DatabindException
     {
-        SerializationContext prov = visitor.getProvider();
+        SerializationContext prov = visitor.getContext();
         if ((prov == null) || (_property == null)) {
             super.acceptJsonFormatVisitor(visitor, typeHint);
         } else {
diff --git a/hibernate5/src/main/java/tools/jackson/datatype/hibernate5/HibernateSerializerModifier.java b/hibernate5/src/main/java/tools/jackson/datatype/hibernate5/HibernateSerializerModifier.java
@@ -23,20 +23,20 @@ public HibernateSerializerModifier(int features, SessionFactory sessionFactory)
     /*
     @Override
     public ValueSerializer<?> modifySerializer(SerializationConfig config,
-            BeanDescription beanDesc, ValueSerializer<?> serializer) {
+            BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {
         return serializer;
     }
     */
 
     @Override
     public ValueSerializer<?> modifyCollectionSerializer(SerializationConfig config,
-            CollectionType valueType, BeanDescription beanDesc, ValueSerializer<?> serializer) {
+            CollectionType valueType, BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {
         return new PersistentCollectionSerializer(valueType, serializer, _features, _sessionFactory);
     }
 
     @Override
     public ValueSerializer<?> modifyMapSerializer(SerializationConfig config,
-            MapType valueType, BeanDescription beanDesc, ValueSerializer<?> serializer) {
+            MapType valueType, BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {
         return new PersistentCollectionSerializer(valueType, serializer, _features, _sessionFactory);
     }
 }
diff --git a/hibernate5/src/main/java/tools/jackson/datatype/hibernate5/HibernateSerializers.java b/hibernate5/src/main/java/tools/jackson/datatype/hibernate5/HibernateSerializers.java
@@ -31,7 +31,7 @@ public HibernateSerializers(Mapping mapping, int features)
 
     @Override
     public ValueSerializer<?> findSerializer(SerializationConfig config,
-            JavaType type, BeanDescription beanDesc)
+            JavaType type, BeanDescription.Supplier beanDesc)
     {
         Class<?> raw = type.getRawClass();
         if (HibernateProxy.class.isAssignableFrom(raw)) {
diff --git a/hibernate5/src/main/java/tools/jackson/datatype/hibernate5/PersistentCollectionSerializer.java b/hibernate5/src/main/java/tools/jackson/datatype/hibernate5/PersistentCollectionSerializer.java
@@ -227,7 +227,7 @@ public void serialize(Object value, JsonGenerator g, SerializationContext provid
         if (value instanceof PersistentCollection) {
             value = findLazyValue((PersistentCollection) value);
             if (value == null) {
-                provider.defaultSerializeNull(g);
+                provider.defaultSerializeNullValue(g);
                 return;
             }
         }
@@ -248,7 +248,7 @@ public void serializeWithType(Object value, JsonGenerator g, SerializationContex
         if (value instanceof PersistentCollection) {
             value = findLazyValue((PersistentCollection) value);
             if (value == null) {
-                provider.defaultSerializeNull(g);
+                provider.defaultSerializeNullValue(g);
                 return;
             }
         }
diff --git a/hibernate6/src/main/java/tools/jackson/datatype/hibernate6/Hibernate6Module.java b/hibernate6/src/main/java/tools/jackson/datatype/hibernate6/Hibernate6Module.java
@@ -180,7 +180,7 @@ public void setupModule(SetupContext context)
             context.appendAnnotationIntrospector(ai);
         }
         context.addSerializers(new Hibernate6Serializers(_mapping, _moduleFeatures));
-        context.addValueSerializerModifier(new Hibernate6SerializerModifier(_moduleFeatures, _sessionFactory));
+        context.addSerializerModifier(new Hibernate6SerializerModifier(_moduleFeatures, _sessionFactory));
     }
 
     /**
diff --git a/hibernate6/src/main/java/tools/jackson/datatype/hibernate6/Hibernate6ProxySerializer.java b/hibernate6/src/main/java/tools/jackson/datatype/hibernate6/Hibernate6ProxySerializer.java
@@ -135,7 +135,7 @@ public void serialize(HibernateProxy value, JsonGenerator g, SerializationContex
         Object proxiedValue = findProxied(value);
         // TODO: figure out how to suppress nulls, if necessary? (too late for that here)
         if (proxiedValue == null) {
-            provider.defaultSerializeNull(g);
+            provider.defaultSerializeNullValue(g);
             return;
         }
         findSerializer(provider, proxiedValue).serialize(proxiedValue, g, provider);
@@ -148,7 +148,7 @@ public void serializeWithType(HibernateProxy value, JsonGenerator g, Serializati
     {
         Object proxiedValue = findProxied(value);
         if (proxiedValue == null) {
-            provider.defaultSerializeNull(g);
+            provider.defaultSerializeNullValue(g);
             return;
         }
         /* This isn't exactly right, since type serializer really refers to proxy
@@ -163,7 +163,7 @@ public void serializeWithType(HibernateProxy value, JsonGenerator g, Serializati
     public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
         throws DatabindException
     {
-        SerializationContext prov = visitor.getProvider();
+        SerializationContext prov = visitor.getContext();
         if ((prov == null) || (_property == null)) {
             super.acceptJsonFormatVisitor(visitor, typeHint);
         } else {
diff --git a/hibernate6/src/main/java/tools/jackson/datatype/hibernate6/Hibernate6SerializerModifier.java b/hibernate6/src/main/java/tools/jackson/datatype/hibernate6/Hibernate6SerializerModifier.java
@@ -23,20 +23,20 @@ public Hibernate6SerializerModifier(int features, SessionFactory sessionFactory)
     /*
     @Override
     public ValueSerializer<?> modifySerializer(SerializationConfig config,
-            BeanDescription beanDesc, ValueSerializer<?> serializer) {
+            BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {
         return serializer;
     }
     */
 
     @Override
     public ValueSerializer<?> modifyCollectionSerializer(SerializationConfig config,
-            CollectionType valueType, BeanDescription beanDesc, ValueSerializer<?> serializer) {
+            CollectionType valueType, BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {
         return new PersistentCollectionSerializer(valueType, serializer, _features, _sessionFactory);
     }
 
     @Override
     public ValueSerializer<?> modifyMapSerializer(SerializationConfig config,
-            MapType valueType, BeanDescription beanDesc, ValueSerializer<?> serializer) {
+            MapType valueType, BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {
         return new PersistentCollectionSerializer(valueType, serializer, _features, _sessionFactory);
     }
 }
diff --git a/hibernate6/src/main/java/tools/jackson/datatype/hibernate6/Hibernate6Serializers.java b/hibernate6/src/main/java/tools/jackson/datatype/hibernate6/Hibernate6Serializers.java
@@ -31,7 +31,7 @@ public Hibernate6Serializers(Mapping mapping, int features)
 
     @Override
     public ValueSerializer<?> findSerializer(SerializationConfig config,
-            JavaType type, BeanDescription beanDesc)
+            JavaType type, BeanDescription.Supplier beanDesc)
     {
         Class<?> raw = type.getRawClass();
         if (HibernateProxy.class.isAssignableFrom(raw)) {
diff --git a/hibernate6/src/main/java/tools/jackson/datatype/hibernate6/PersistentCollectionSerializer.java b/hibernate6/src/main/java/tools/jackson/datatype/hibernate6/PersistentCollectionSerializer.java
@@ -225,7 +225,7 @@ public void serialize(Object value, JsonGenerator g, SerializationContext provid
         if (value instanceof PersistentCollection) {
             value = findLazyValue((PersistentCollection) value);
             if (value == null) {
-                provider.defaultSerializeNull(g);
+                provider.defaultSerializeNullValue(g);
                 return;
             }
         }
@@ -246,7 +246,7 @@ public void serializeWithType(Object value, JsonGenerator g, SerializationContex
         if (value instanceof PersistentCollection) {
             value = findLazyValue((PersistentCollection) value);
             if (value == null) {
-                provider.defaultSerializeNull(g);
+                provider.defaultSerializeNullValue(g);
                 return;
             }
         }
diff --git a/hibernate7/src/main/java/tools/jackson/datatype/hibernate7/Hibernate7Module.java b/hibernate7/src/main/java/tools/jackson/datatype/hibernate7/Hibernate7Module.java
@@ -180,7 +180,7 @@ public void setupModule(SetupContext context)
             context.appendAnnotationIntrospector(ai);
         }
         context.addSerializers(new Hibernate7Serializers(_mapping, _moduleFeatures));
-        context.addValueSerializerModifier(new Hibernate7SerializerModifier(_moduleFeatures, _sessionFactory));
+        context.addSerializerModifier(new Hibernate7SerializerModifier(_moduleFeatures, _sessionFactory));
     }
 
     /**
diff --git a/hibernate7/src/main/java/tools/jackson/datatype/hibernate7/Hibernate7ProxySerializer.java b/hibernate7/src/main/java/tools/jackson/datatype/hibernate7/Hibernate7ProxySerializer.java
diff --git a/hibernate7/src/main/java/tools/jackson/datatype/hibernate7/Hibernate7SerializerModifier.java b/hibernate7/src/main/java/tools/jackson/datatype/hibernate7/Hibernate7SerializerModifier.java
diff --git a/hibernate7/src/main/java/tools/jackson/datatype/hibernate7/Hibernate7Serializers.java b/hibernate7/src/main/java/tools/jackson/datatype/hibernate7/Hibernate7Serializers.java
diff --git a/hibernate7/src/main/java/tools/jackson/datatype/hibernate7/PersistentCollectionSerializer.java b/hibernate7/src/main/java/tools/jackson/datatype/hibernate7/PersistentCollectionSerializer.java

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ public void setupModule(SetupContext context)`
`178`	`178`	`context.appendAnnotationIntrospector(ai);`
`179`	`179`	`}`
`180`	`180`	`context.addSerializers(new HibernateSerializers(_mapping, _moduleFeatures));`
`181`		`- context.addValueSerializerModifier(new HibernateSerializerModifier(_moduleFeatures, _sessionFactory));`
	`181`	`+ context.addSerializerModifier(new HibernateSerializerModifier(_moduleFeatures, _sessionFactory));`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -23,20 +23,20 @@ public HibernateSerializerModifier(int features, SessionFactory sessionFactory)`
`23`	`23`	`/*`
`24`	`24`	`@Override`
`25`	`25`	`public ValueSerializer<?> modifySerializer(SerializationConfig config,`
`26`		`- BeanDescription beanDesc, ValueSerializer<?> serializer) {`
	`26`	`+ BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {`
`27`	`27`	`return serializer;`
`28`	`28`	`}`
`29`	`29`	`*/`
`30`	`30`
`31`	`31`	`@Override`
`32`	`32`	`public ValueSerializer<?> modifyCollectionSerializer(SerializationConfig config,`
`33`		`- CollectionType valueType, BeanDescription beanDesc, ValueSerializer<?> serializer) {`
	`33`	`+ CollectionType valueType, BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {`
`34`	`34`	`return new PersistentCollectionSerializer(valueType, serializer, _features, _sessionFactory);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@Override`
`38`	`38`	`public ValueSerializer<?> modifyMapSerializer(SerializationConfig config,`
`39`		`- MapType valueType, BeanDescription beanDesc, ValueSerializer<?> serializer) {`
	`39`	`+ MapType valueType, BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {`
`40`	`40`	`return new PersistentCollectionSerializer(valueType, serializer, _features, _sessionFactory);`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public HibernateSerializers(Mapping mapping, int features)`
`32`	`32`
`33`	`33`	`@Override`
`34`	`34`	`public ValueSerializer<?> findSerializer(SerializationConfig config,`
`35`		`- JavaType type, BeanDescription beanDesc)`
	`35`	`+ JavaType type, BeanDescription.Supplier beanDesc)`
`36`	`36`	`{`
`37`	`37`	`Class<?> raw = type.getRawClass();`
`38`	`38`	`if (HibernateProxy.class.isAssignableFrom(raw)) {`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ public void serialize(Object value, JsonGenerator jgen, SerializationContext pro`
`237`	`237`	`if (value instanceof PersistentCollection) {`
`238`	`238`	`value = findLazyValue((PersistentCollection) value);`
`239`	`239`	`if (value == null) {`
`240`		`- provider.defaultSerializeNull(jgen);`
	`240`	`+ provider.defaultSerializeNullValue(jgen);`
`241`	`241`	`return;`
`242`	`242`	`}`
`243`	`243`	`}`
`@@ -260,7 +260,7 @@ public void serializeWithType(Object value, JsonGenerator jgen, SerializationCon`
`260`	`260`	`if (value instanceof PersistentCollection) {`
`261`	`261`	`value = findLazyValue((PersistentCollection) value);`
`262`	`262`	`if (value == null) {`
`263`		`- provider.defaultSerializeNull(jgen);`
	`263`	`+ provider.defaultSerializeNullValue(jgen);`
`264`	`264`	`return;`
`265`	`265`	`}`
`266`	`266`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,20 +23,20 @@ public Hibernate5JSerializerModifier(int features, SessionFactory sessionFactory`
`23`	`23`	`/*`
`24`	`24`	`@Override`
`25`	`25`	`public ValueSerializer<?> modifySerializer(SerializationConfig config,`
`26`		`- BeanDescription beanDesc, ValueSerializer<?> serializer) {`
	`26`	`+ BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {`
`27`	`27`	`return serializer;`
`28`	`28`	`}`
`29`	`29`	`*/`
`30`	`30`
`31`	`31`	`@Override`
`32`	`32`	`public ValueSerializer<?> modifyCollectionSerializer(SerializationConfig config,`
`33`		`- CollectionType valueType, BeanDescription beanDesc, ValueSerializer<?> serializer) {`
	`33`	`+ CollectionType valueType, BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {`
`34`	`34`	`return new PersistentCollectionSerializer(valueType, serializer, _features, _sessionFactory);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@Override`
`38`	`38`	`public ValueSerializer<?> modifyMapSerializer(SerializationConfig config,`
`39`		`- MapType valueType, BeanDescription beanDesc, ValueSerializer<?> serializer) {`
	`39`	`+ MapType valueType, BeanDescription.Supplier beanDesc, ValueSerializer<?> serializer) {`
`40`	`40`	`return new PersistentCollectionSerializer(valueType, serializer, _features, _sessionFactory);`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public Hibernate5JSerializers(Mapping mapping, int features)`
`31`	`31`
`32`	`32`	`@Override`
`33`	`33`	`public ValueSerializer<?> findSerializer(SerializationConfig config,`
`34`		`- JavaType type, BeanDescription beanDesc)`
	`34`	`+ JavaType type, BeanDescription.Supplier beanDesc)`
`35`	`35`	`{`
`36`	`36`	`Class<?> raw = type.getRawClass();`
`37`	`37`	`if (HibernateProxy.class.isAssignableFrom(raw)) {`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public void setupModule(SetupContext context)`
`180`	`180`	`context.appendAnnotationIntrospector(ai);`
`181`	`181`	`}`
`182`	`182`	`context.addSerializers(new Hibernate5JSerializers(_mapping, _moduleFeatures));`
`183`		`- context.addValueSerializerModifier(new Hibernate5JSerializerModifier(_moduleFeatures, _sessionFactory));`
	`183`	`+ context.addSerializerModifier(new Hibernate5JSerializerModifier(_moduleFeatures, _sessionFactory));`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ public void serialize(Object value, JsonGenerator g, SerializationContext provid`
`226`	`226`	`if (value instanceof PersistentCollection) {`
`227`	`227`	`value = findLazyValue((PersistentCollection) value);`
`228`	`228`	`if (value == null) {`
`229`		`- provider.defaultSerializeNull(g);`
	`229`	`+ provider.defaultSerializeNullValue(g);`
`230`	`230`	`return;`
`231`	`231`	`}`
`232`	`232`	`}`
`@@ -247,7 +247,7 @@ public void serializeWithType(Object value, JsonGenerator g, SerializationContex`
`247`	`247`	`if (value instanceof PersistentCollection) {`
`248`	`248`	`value = findLazyValue((PersistentCollection) value);`
`249`	`249`	`if (value == null) {`
`250`		`- provider.defaultSerializeNull(g);`
	`250`	`+ provider.defaultSerializeNullValue(g);`
`251`	`251`	`return;`
`252`	`252`	`}`
`253`	`253`	`}`