Skip to content

Commit 6262dd7

Browse files
committed
Last refactoring wr #706, to make new base class public for other uses too
1 parent bf59bfb commit 6262dd7

File tree

2 files changed

+4
-90
lines changed

2 files changed

+4
-90
lines changed

src/main/java/com/fasterxml/jackson/databind/ser/impl/JsonFormatVisitorNullWrapper.java

Lines changed: 0 additions & 87 deletions
This file was deleted.

src/main/java/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanPropertyWriter.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.fasterxml.jackson.databind.JsonNode;
1111
import com.fasterxml.jackson.databind.JsonSerializer;
1212
import com.fasterxml.jackson.databind.SerializerProvider;
13+
import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
1314
import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonObjectFormatVisitor;
1415
import com.fasterxml.jackson.databind.node.ObjectNode;
1516
import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
@@ -143,9 +144,9 @@ public void depositSchemaProperty(final JsonObjectFormatVisitor visitor)
143144
JsonSerializer<Object> ser = provider
144145
.findValueSerializer(this.getType(), this)
145146
.unwrappingSerializer(_nameTransformer);
146-
147+
147148
if (ser.isUnwrappingSerializer()) {
148-
ser.acceptJsonFormatVisitor(new JsonFormatVisitorNullWrapper(provider) {
149+
ser.acceptJsonFormatVisitor(new JsonFormatVisitorWrapper.Base(provider) {
149150
// an unwrapping serializer will always expect ObjectFormat,
150151
// hence, the other cases do not have to be implemented
151152
@Override
@@ -158,7 +159,7 @@ public JsonObjectFormatVisitor expectObjectFormat(JavaType type)
158159
super.depositSchemaProperty(visitor);
159160
}
160161
}
161-
162+
162163
// Override needed to support legacy JSON Schema generator
163164
@Override
164165
protected void _depositSchemaProperty(ObjectNode propertiesNode, JsonNode schemaNode)

0 commit comments

Comments
 (0)