minor trimming, renaming

cowtowncoder · cowtowncoder · commit db69efde6cbb · 2018-03-16T08:02:49.000-07:00
diff --git a/src/main/java/com/fasterxml/jackson/databind/SerializerProvider.java b/src/main/java/com/fasterxml/jackson/databind/SerializerProvider.java
diff --git a/src/main/java/com/fasterxml/jackson/databind/node/NullNode.java b/src/main/java/com/fasterxml/jackson/databind/node/NullNode.java
@@ -48,7 +48,7 @@ public JsonNodeType getNodeType() {
     public final void serialize(JsonGenerator g, SerializerProvider provider)
         throws IOException
     {
-        provider.defaultSerializeNull(g);
+        provider.defaultSerializeNullValue(g);
     }
 
     @Override
diff --git a/src/main/java/com/fasterxml/jackson/databind/node/POJONode.java b/src/main/java/com/fasterxml/jackson/databind/node/POJONode.java
@@ -108,7 +108,7 @@ public double asDouble(double defaultValue)
     public final void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException
     {
         if (_value == null) {
-            serializers.defaultSerializeNull(gen);
+            serializers.defaultSerializeNullValue(gen);
         } else if (_value instanceof JsonSerializable) {
             ((JsonSerializable) _value).serialize(gen, serializers);
         } else {
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/IndexedListSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/IndexedListSerializer.java
@@ -104,7 +104,7 @@ public void serializeContents(Object value0, JsonGenerator g, SerializerProvider
             for (; i < len; ++i) {
                 Object elem = value.get(i);
                 if (elem == null) {
-                    provider.defaultSerializeNull(g);
+                    provider.defaultSerializeNullValue(g);
                 } else {
                     Class<?> cc = elem.getClass();
                     JsonSerializer<Object> serializer = serializers.serializerFor(cc);
@@ -139,7 +139,7 @@ public void serializeContentsUsing(List<?> value, JsonGenerator jgen, Serializer
             Object elem = value.get(i);
             try {
                 if (elem == null) {
-                    provider.defaultSerializeNull(jgen);
+                    provider.defaultSerializeNullValue(jgen);
                 } else if (typeSer == null) {
                     ser.serialize(elem, jgen, provider);
                 } else {
@@ -166,7 +166,7 @@ public void serializeTypedContents(List<?> value, JsonGenerator jgen, Serializer
             for (; i < len; ++i) {
                 Object elem = value.get(i);
                 if (elem == null) {
-                    provider.defaultSerializeNull(jgen);
+                    provider.defaultSerializeNullValue(jgen);
                 } else {
                     Class<?> cc = elem.getClass();
                     JsonSerializer<Object> serializer = serializers.serializerFor(cc);
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer.java
@@ -98,7 +98,7 @@ private final void serializeContents(List<String> value, JsonGenerator g,
             for (; i < len; ++i) {
                 String str = value.get(i);
                 if (str == null) {
-                    provider.defaultSerializeNull(g);
+                    provider.defaultSerializeNullValue(g);
                 } else {
                     g.writeString(str);
                 }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/IteratorSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/IteratorSerializer.java
@@ -84,7 +84,7 @@ public void serializeContents(Iterator<?> value, JsonGenerator g,
         do {
             Object elem = value.next();
             if (elem == null) {
-                provider.defaultSerializeNull(g);
+                provider.defaultSerializeNullValue(g);
             } else if (typeSer == null) {
                 serializer.serialize(elem, g, provider);
             } else {
@@ -102,7 +102,7 @@ protected void _serializeDynamicContents(Iterator<?> value, JsonGenerator g,
         do {
             Object elem = value.next();
             if (elem == null) {
-                provider.defaultSerializeNull(g);
+                provider.defaultSerializeNullValue(g);
                 continue;
             }
             Class<?> cc = elem.getClass();
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.java
@@ -196,7 +196,7 @@ private void serializeContentsSlow(String[] value, JsonGenerator gen, Serializer
         for (int i = 0, len = value.length; i < len; ++i) {
             String str = value[i];
             if (str == null) {
-                provider.defaultSerializeNull(gen);
+                provider.defaultSerializeNullValue(gen);
             } else {
                 ser.serialize(value[i], gen, provider);
             }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer.java
@@ -103,7 +103,7 @@ private final void serializeContents(Collection<String> value, JsonGenerator g,
         try {
             for (String str : value) {
                 if (str == null) {
-                    provider.defaultSerializeNull(g);
+                    provider.defaultSerializeNullValue(g);
                 } else {
                     g.writeString(str);
                 }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/CollectionSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/CollectionSerializer.java
@@ -114,7 +114,7 @@ public void serializeContents(Collection<?> value, JsonGenerator g, SerializerPr
             do {
                 Object elem = it.next();
                 if (elem == null) {
-                    provider.defaultSerializeNull(g);
+                    provider.defaultSerializeNullValue(g);
                 } else {
                     Class<?> cc = elem.getClass();
                     JsonSerializer<Object> serializer = serializers.serializerFor(cc);
@@ -151,7 +151,7 @@ public void serializeContentsUsing(Collection<?> value, JsonGenerator g, Seriali
                 Object elem = it.next();
                 try {
                     if (elem == null) {
-                        provider.defaultSerializeNull(g);
+                        provider.defaultSerializeNullValue(g);
                     } else {
                         if (typeSer == null) {
                             ser.serialize(elem, g, provider);
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/IterableSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/IterableSerializer.java
@@ -88,7 +88,7 @@ public void serializeContents(Iterable<?> value, JsonGenerator jgen,
             do {
                 Object elem = it.next();
                 if (elem == null) {
-                    provider.defaultSerializeNull(jgen);
+                    provider.defaultSerializeNullValue(jgen);
                     continue;
                 }
                 JsonSerializer<Object> currSerializer = _elementSerializer;
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.java
@@ -157,7 +157,7 @@ public void serialize(Object bean, JsonGenerator gen, SerializerProvider prov) t
         try {
             Object value = _accessor.getValue(bean);
             if (value == null) {
-                prov.defaultSerializeNull(gen);
+                prov.defaultSerializeNullValue(gen);
                 return;
             }
             JsonSerializer<Object> ser = _valueSerializer;
@@ -186,7 +186,7 @@ public void serializeWithType(Object bean, JsonGenerator gen, SerializerProvider
             value = _accessor.getValue(bean);
             // and if we got null, can also just write it directly
             if (value == null) {
-                provider.defaultSerializeNull(gen);
+                provider.defaultSerializeNullValue(gen);
                 return;
             }
             JsonSerializer<Object> ser = _valueSerializer;
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java
@@ -655,7 +655,7 @@ public void serializeFields(Map<?,?> value, JsonGenerator gen, SerializerProvide
                 }
                 // And then value
                 if (valueElem == null) {
-                    provider.defaultSerializeNull(gen);
+                    provider.defaultSerializeNullValue(gen);
                     continue;
                 }
                 JsonSerializer<Object> serializer = _valueSerializer;
@@ -753,7 +753,7 @@ public void serializeFieldsUsing(Map<?,?> value, JsonGenerator gen, SerializerPr
             }
             final Object valueElem = entry.getValue();
             if (valueElem == null) {
-                provider.defaultSerializeNull(gen);
+                provider.defaultSerializeNullValue(gen);
             } else {
                 try {
                     if (typeSer == null) {
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/ObjectArraySerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/ObjectArraySerializer.java
@@ -231,7 +231,7 @@ public void serializeContents(Object[] value, JsonGenerator gen, SerializerProvi
             for (; i < len; ++i) {
                 elem = value[i];
                 if (elem == null) {
-                    provider.defaultSerializeNull(gen);
+                    provider.defaultSerializeNullValue(gen);
                     continue;
                 }
                 Class<?> cc = elem.getClass();
@@ -263,7 +263,7 @@ public void serializeContentsUsing(Object[] value, JsonGenerator jgen, Serialize
             for (; i < len; ++i) {
                 elem = value[i];
                 if (elem == null) {
-                    provider.defaultSerializeNull(jgen);
+                    provider.defaultSerializeNullValue(jgen);
                     continue;
                 }
                 if (typeSer == null) {
@@ -288,7 +288,7 @@ public void serializeTypedContents(Object[] value, JsonGenerator jgen, Serialize
             for (; i < len; ++i) {
                 elem = value[i];
                 if (elem == null) {
-                    provider.defaultSerializeNull(jgen);
+                    provider.defaultSerializeNullValue(jgen);
                     continue;
                 }
                 Class<?> cc = elem.getClass();
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/ReferenceTypeSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/ReferenceTypeSerializer.java
@@ -360,7 +360,7 @@ public void serialize(T ref, JsonGenerator g, SerializerProvider provider)
         Object value = _getReferencedIfPresent(ref);
         if (value == null) {
             if (_unwrapper == null) {
-                provider.defaultSerializeNull(g);
+                provider.defaultSerializeNullValue(g);
             }
             return;
         }
@@ -383,7 +383,7 @@ public void serializeWithType(T ref,
         Object value = _getReferencedIfPresent(ref);
         if (value == null) {
             if (_unwrapper == null) {
-                provider.defaultSerializeNull(g);
+                provider.defaultSerializeNullValue(g);
             }
             return;
         }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java
@@ -147,7 +147,7 @@ public void serialize(Object value, JsonGenerator gen, SerializerProvider provid
         Object delegateValue = convertValue(value);
         // should we accept nulls?
         if (delegateValue == null) {
-            provider.defaultSerializeNull(gen);
+            provider.defaultSerializeNullValue(gen);
             return;
         }
         // 02-Apr-2015, tatu: As per [databind#731] may need to do dynamic lookup
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/JSONPObject.java b/src/main/java/com/fasterxml/jackson/databind/util/JSONPObject.java
@@ -69,7 +69,7 @@ public void serialize(JsonGenerator gen, SerializerProvider provider)
         gen.writeRaw('(');
 
         if (_value == null) {
-            provider.defaultSerializeNull(gen);
+            provider.defaultSerializeNullValue(gen);
         } else {
             // NOTE: Escape line-separator characters that break JSONP only if no custom character escapes are set.
             // If custom escapes are in place JSONP-breaking characters will not be escaped and it is recommended to
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/JSONWrappedObject.java b/src/main/java/com/fasterxml/jackson/databind/util/JSONWrappedObject.java
@@ -80,7 +80,7 @@ public void serialize(JsonGenerator jgen, SerializerProvider provider)
         // First, wrapping:
     	if (_prefix != null) jgen.writeRaw(_prefix);
         if (_value == null) {
-            provider.defaultSerializeNull(jgen);
+            provider.defaultSerializeNullValue(jgen);
         } else if (_serializationType != null) {
             provider.findTypedValueSerializer(_serializationType, true, null).serialize(_value, jgen, provider);
         } else {
diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/TestSerializerProvider.java b/src/test/java/com/fasterxml/jackson/databind/ser/TestSerializerProvider.java
@@ -26,7 +26,7 @@ public void testFindExplicit() throws JsonMappingException
 
         // Should have working default key and null key serializers
         assertNotNull(prov.findKeySerializer(mapper.constructType(String.class), null));
-        assertNotNull(prov.getDefaultNullKeySerializer());
+//        assertNotNull(prov.getDefaultNullKeySerializer());
         assertNotNull(prov.getDefaultNullValueSerializer());
         // as well as 'unknown type' one (throws exception)
         assertNotNull(prov.getUnknownTypeSerializer(getClass()));

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public JsonNodeType getNodeType() {`
`48`	`48`	`public final void serialize(JsonGenerator g, SerializerProvider provider)`
`49`	`49`	`throws IOException`
`50`	`50`	`{`
`51`		`- provider.defaultSerializeNull(g);`
	`51`	`+ provider.defaultSerializeNullValue(g);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public double asDouble(double defaultValue)`
`108`	`108`	`public final void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException`
`109`	`109`	`{`
`110`	`110`	`if (_value == null) {`
`111`		`- serializers.defaultSerializeNull(gen);`
	`111`	`+ serializers.defaultSerializeNullValue(gen);`
`112`	`112`	`} else if (_value instanceof JsonSerializable) {`
`113`	`113`	`((JsonSerializable) _value).serialize(gen, serializers);`
`114`	`114`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ private final void serializeContents(List<String> value, JsonGenerator g,`
`98`	`98`	`for (; i < len; ++i) {`
`99`	`99`	`String str = value.get(i);`
`100`	`100`	`if (str == null) {`
`101`		`- provider.defaultSerializeNull(g);`
	`101`	`+ provider.defaultSerializeNullValue(g);`
`102`	`102`	`} else {`
`103`	`103`	`g.writeString(str);`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ private void serializeContentsSlow(String[] value, JsonGenerator gen, Serializer`
`196`	`196`	`for (int i = 0, len = value.length; i < len; ++i) {`
`197`	`197`	`String str = value[i];`
`198`	`198`	`if (str == null) {`
`199`		`- provider.defaultSerializeNull(gen);`
	`199`	`+ provider.defaultSerializeNullValue(gen);`
`200`	`200`	`} else {`
`201`	`201`	`ser.serialize(value[i], gen, provider);`
`202`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ private final void serializeContents(Collection<String> value, JsonGenerator g,`
`103`	`103`	`try {`
`104`	`104`	`for (String str : value) {`
`105`	`105`	`if (str == null) {`
`106`		`- provider.defaultSerializeNull(g);`
	`106`	`+ provider.defaultSerializeNullValue(g);`
`107`	`107`	`} else {`
`108`	`108`	`g.writeString(str);`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public void serializeContents(Iterable<?> value, JsonGenerator jgen,`
`88`	`88`	`do {`
`89`	`89`	`Object elem = it.next();`
`90`	`90`	`if (elem == null) {`
`91`		`- provider.defaultSerializeNull(jgen);`
	`91`	`+ provider.defaultSerializeNullValue(jgen);`
`92`	`92`	`continue;`
`93`	`93`	`}`
`94`	`94`	`JsonSerializer<Object> currSerializer = _elementSerializer;`