Skip to content

Commit db69efd

Browse files
cowtowncodercowtowncoder
committed
minor trimming, renaming
1 parent cbca4d8 commit db69efd

18 files changed

+90
-117
lines changed

‎src/main/java/com/fasterxml/jackson/databind/SerializerProvider.java

+64-91
Large diffs are not rendered by default.

‎src/main/java/com/fasterxml/jackson/databind/node/NullNode.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public JsonNodeType getNodeType() {
4848
public final void serialize(JsonGenerator g, SerializerProvider provider)
4949
throws IOException
5050
{
51-
provider.defaultSerializeNull(g);
51+
provider.defaultSerializeNullValue(g);
5252
}
5353

5454
@Override

‎src/main/java/com/fasterxml/jackson/databind/node/POJONode.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public double asDouble(double defaultValue)
108108
public final void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException
109109
{
110110
if (_value == null) {
111-
serializers.defaultSerializeNull(gen);
111+
serializers.defaultSerializeNullValue(gen);
112112
} else if (_value instanceof JsonSerializable) {
113113
((JsonSerializable) _value).serialize(gen, serializers);
114114
} else {

‎src/main/java/com/fasterxml/jackson/databind/ser/impl/IndexedListSerializer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void serializeContents(Object value0, JsonGenerator g, SerializerProvider
104104
for (; i < len; ++i) {
105105
Object elem = value.get(i);
106106
if (elem == null) {
107-
provider.defaultSerializeNull(g);
107+
provider.defaultSerializeNullValue(g);
108108
} else {
109109
Class<?> cc = elem.getClass();
110110
JsonSerializer<Object> serializer = serializers.serializerFor(cc);
@@ -139,7 +139,7 @@ public void serializeContentsUsing(List<?> value, JsonGenerator jgen, Serializer
139139
Object elem = value.get(i);
140140
try {
141141
if (elem == null) {
142-
provider.defaultSerializeNull(jgen);
142+
provider.defaultSerializeNullValue(jgen);
143143
} else if (typeSer == null) {
144144
ser.serialize(elem, jgen, provider);
145145
} else {
@@ -166,7 +166,7 @@ public void serializeTypedContents(List<?> value, JsonGenerator jgen, Serializer
166166
for (; i < len; ++i) {
167167
Object elem = value.get(i);
168168
if (elem == null) {
169-
provider.defaultSerializeNull(jgen);
169+
provider.defaultSerializeNullValue(jgen);
170170
} else {
171171
Class<?> cc = elem.getClass();
172172
JsonSerializer<Object> serializer = serializers.serializerFor(cc);

‎src/main/java/com/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private final void serializeContents(List<String> value, JsonGenerator g,
9898
for (; i < len; ++i) {
9999
String str = value.get(i);
100100
if (str == null) {
101-
provider.defaultSerializeNull(g);
101+
provider.defaultSerializeNullValue(g);
102102
} else {
103103
g.writeString(str);
104104
}

‎src/main/java/com/fasterxml/jackson/databind/ser/impl/IteratorSerializer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void serializeContents(Iterator<?> value, JsonGenerator g,
8484
do {
8585
Object elem = value.next();
8686
if (elem == null) {
87-
provider.defaultSerializeNull(g);
87+
provider.defaultSerializeNullValue(g);
8888
} else if (typeSer == null) {
8989
serializer.serialize(elem, g, provider);
9090
} else {
@@ -102,7 +102,7 @@ protected void _serializeDynamicContents(Iterator<?> value, JsonGenerator g,
102102
do {
103103
Object elem = value.next();
104104
if (elem == null) {
105-
provider.defaultSerializeNull(g);
105+
provider.defaultSerializeNullValue(g);
106106
continue;
107107
}
108108
Class<?> cc = elem.getClass();

‎src/main/java/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ private void serializeContentsSlow(String[] value, JsonGenerator gen, Serializer
196196
for (int i = 0, len = value.length; i < len; ++i) {
197197
String str = value[i];
198198
if (str == null) {
199-
provider.defaultSerializeNull(gen);
199+
provider.defaultSerializeNullValue(gen);
200200
} else {
201201
ser.serialize(value[i], gen, provider);
202202
}

‎src/main/java/com/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private final void serializeContents(Collection<String> value, JsonGenerator g,
103103
try {
104104
for (String str : value) {
105105
if (str == null) {
106-
provider.defaultSerializeNull(g);
106+
provider.defaultSerializeNullValue(g);
107107
} else {
108108
g.writeString(str);
109109
}

‎src/main/java/com/fasterxml/jackson/databind/ser/std/CollectionSerializer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void serializeContents(Collection<?> value, JsonGenerator g, SerializerPr
114114
do {
115115
Object elem = it.next();
116116
if (elem == null) {
117-
provider.defaultSerializeNull(g);
117+
provider.defaultSerializeNullValue(g);
118118
} else {
119119
Class<?> cc = elem.getClass();
120120
JsonSerializer<Object> serializer = serializers.serializerFor(cc);
@@ -151,7 +151,7 @@ public void serializeContentsUsing(Collection<?> value, JsonGenerator g, Seriali
151151
Object elem = it.next();
152152
try {
153153
if (elem == null) {
154-
provider.defaultSerializeNull(g);
154+
provider.defaultSerializeNullValue(g);
155155
} else {
156156
if (typeSer == null) {
157157
ser.serialize(elem, g, provider);

‎src/main/java/com/fasterxml/jackson/databind/ser/std/IterableSerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void serializeContents(Iterable<?> value, JsonGenerator jgen,
8888
do {
8989
Object elem = it.next();
9090
if (elem == null) {
91-
provider.defaultSerializeNull(jgen);
91+
provider.defaultSerializeNullValue(jgen);
9292
continue;
9393
}
9494
JsonSerializer<Object> currSerializer = _elementSerializer;

‎src/main/java/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public void serialize(Object bean, JsonGenerator gen, SerializerProvider prov) t
157157
try {
158158
Object value = _accessor.getValue(bean);
159159
if (value == null) {
160-
prov.defaultSerializeNull(gen);
160+
prov.defaultSerializeNullValue(gen);
161161
return;
162162
}
163163
JsonSerializer<Object> ser = _valueSerializer;
@@ -186,7 +186,7 @@ public void serializeWithType(Object bean, JsonGenerator gen, SerializerProvider
186186
value = _accessor.getValue(bean);
187187
// and if we got null, can also just write it directly
188188
if (value == null) {
189-
provider.defaultSerializeNull(gen);
189+
provider.defaultSerializeNullValue(gen);
190190
return;
191191
}
192192
JsonSerializer<Object> ser = _valueSerializer;

‎src/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ public void serializeFields(Map<?,?> value, JsonGenerator gen, SerializerProvide
655655
}
656656
// And then value
657657
if (valueElem == null) {
658-
provider.defaultSerializeNull(gen);
658+
provider.defaultSerializeNullValue(gen);
659659
continue;
660660
}
661661
JsonSerializer<Object> serializer = _valueSerializer;
@@ -753,7 +753,7 @@ public void serializeFieldsUsing(Map<?,?> value, JsonGenerator gen, SerializerPr
753753
}
754754
final Object valueElem = entry.getValue();
755755
if (valueElem == null) {
756-
provider.defaultSerializeNull(gen);
756+
provider.defaultSerializeNullValue(gen);
757757
} else {
758758
try {
759759
if (typeSer == null) {

‎src/main/java/com/fasterxml/jackson/databind/ser/std/ObjectArraySerializer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ public void serializeContents(Object[] value, JsonGenerator gen, SerializerProvi
231231
for (; i < len; ++i) {
232232
elem = value[i];
233233
if (elem == null) {
234-
provider.defaultSerializeNull(gen);
234+
provider.defaultSerializeNullValue(gen);
235235
continue;
236236
}
237237
Class<?> cc = elem.getClass();
@@ -263,7 +263,7 @@ public void serializeContentsUsing(Object[] value, JsonGenerator jgen, Serialize
263263
for (; i < len; ++i) {
264264
elem = value[i];
265265
if (elem == null) {
266-
provider.defaultSerializeNull(jgen);
266+
provider.defaultSerializeNullValue(jgen);
267267
continue;
268268
}
269269
if (typeSer == null) {
@@ -288,7 +288,7 @@ public void serializeTypedContents(Object[] value, JsonGenerator jgen, Serialize
288288
for (; i < len; ++i) {
289289
elem = value[i];
290290
if (elem == null) {
291-
provider.defaultSerializeNull(jgen);
291+
provider.defaultSerializeNullValue(jgen);
292292
continue;
293293
}
294294
Class<?> cc = elem.getClass();

‎src/main/java/com/fasterxml/jackson/databind/ser/std/ReferenceTypeSerializer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ public void serialize(T ref, JsonGenerator g, SerializerProvider provider)
360360
Object value = _getReferencedIfPresent(ref);
361361
if (value == null) {
362362
if (_unwrapper == null) {
363-
provider.defaultSerializeNull(g);
363+
provider.defaultSerializeNullValue(g);
364364
}
365365
return;
366366
}
@@ -383,7 +383,7 @@ public void serializeWithType(T ref,
383383
Object value = _getReferencedIfPresent(ref);
384384
if (value == null) {
385385
if (_unwrapper == null) {
386-
provider.defaultSerializeNull(g);
386+
provider.defaultSerializeNullValue(g);
387387
}
388388
return;
389389
}

‎src/main/java/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public void serialize(Object value, JsonGenerator gen, SerializerProvider provid
147147
Object delegateValue = convertValue(value);
148148
// should we accept nulls?
149149
if (delegateValue == null) {
150-
provider.defaultSerializeNull(gen);
150+
provider.defaultSerializeNullValue(gen);
151151
return;
152152
}
153153
// 02-Apr-2015, tatu: As per [databind#731] may need to do dynamic lookup

‎src/main/java/com/fasterxml/jackson/databind/util/JSONPObject.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void serialize(JsonGenerator gen, SerializerProvider provider)
6969
gen.writeRaw('(');
7070

7171
if (_value == null) {
72-
provider.defaultSerializeNull(gen);
72+
provider.defaultSerializeNullValue(gen);
7373
} else {
7474
// NOTE: Escape line-separator characters that break JSONP only if no custom character escapes are set.
7575
// If custom escapes are in place JSONP-breaking characters will not be escaped and it is recommended to

‎src/main/java/com/fasterxml/jackson/databind/util/JSONWrappedObject.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void serialize(JsonGenerator jgen, SerializerProvider provider)
8080
// First, wrapping:
8181
if (_prefix != null) jgen.writeRaw(_prefix);
8282
if (_value == null) {
83-
provider.defaultSerializeNull(jgen);
83+
provider.defaultSerializeNullValue(jgen);
8484
} else if (_serializationType != null) {
8585
provider.findTypedValueSerializer(_serializationType, true, null).serialize(_value, jgen, provider);
8686
} else {

‎src/test/java/com/fasterxml/jackson/databind/ser/TestSerializerProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void testFindExplicit() throws JsonMappingException
2626

2727
// Should have working default key and null key serializers
2828
assertNotNull(prov.findKeySerializer(mapper.constructType(String.class), null));
29-
assertNotNull(prov.getDefaultNullKeySerializer());
29+
// assertNotNull(prov.getDefaultNullKeySerializer());
3030
assertNotNull(prov.getDefaultNullValueSerializer());
3131
// as well as 'unknown type' one (throws exception)
3232
assertNotNull(prov.getUnknownTypeSerializer(getClass()));

0 commit comments

Comments
 (0)