Skip to content

Commit 5f1ddb7

Browse files
cowtowncodercowtowncoder
committed
Second part of changes wrt databind/3044 (JsonSerializer->ValueSerializer)
1 parent ad2d742 commit 5f1ddb7

File tree

19 files changed

+109
-109
lines changed

19 files changed

+109
-109
lines changed

‎eclipse-collections/src/main/java/com/fasterxml/jackson/datatype/eclipsecollections/EclipseCollectionsSerializers.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.fasterxml.jackson.annotation.JsonFormat;
66
import com.fasterxml.jackson.databind.BeanDescription;
77
import com.fasterxml.jackson.databind.JavaType;
8-
import com.fasterxml.jackson.databind.JsonSerializer;
8+
import com.fasterxml.jackson.databind.ValueSerializer;
99
import com.fasterxml.jackson.databind.SerializationConfig;
1010
import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
1111
import com.fasterxml.jackson.databind.ser.Serializers;
@@ -56,13 +56,13 @@
5656

5757
public final class EclipseCollectionsSerializers extends Serializers.Base {
5858
@Override
59-
public JsonSerializer<?> findCollectionLikeSerializer(
59+
public ValueSerializer<?> findCollectionLikeSerializer(
6060
SerializationConfig config,
6161
CollectionLikeType type,
6262
BeanDescription beanDesc,
6363
JsonFormat.Value formatOverrides,
6464
TypeSerializer elementTypeSerializer,
65-
JsonSerializer<Object> elementValueSerializer
65+
ValueSerializer<Object> elementValueSerializer
6666
) {
6767
if (ImmutableCollection.class.isAssignableFrom(type.getRawClass())) {
6868
return new CollectionSerializer(
@@ -76,7 +76,7 @@ public JsonSerializer<?> findCollectionLikeSerializer(
7676
}
7777

7878
@Override
79-
public JsonSerializer<?> findSerializer(SerializationConfig config,
79+
public ValueSerializer<?> findSerializer(SerializationConfig config,
8080
JavaType type, BeanDescription beanDesc, JsonFormat.Value formatOverrides)
8181
{
8282
Class<?> rawClass = type.getRawClass();

‎eclipse-collections/src/main/java/com/fasterxml/jackson/datatype/eclipsecollections/ser/map/RefRefMapIterableSerializer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.fasterxml.jackson.databind.BeanProperty;
44
import com.fasterxml.jackson.databind.JavaType;
5-
import com.fasterxml.jackson.databind.JsonSerializer;
5+
import com.fasterxml.jackson.databind.ValueSerializer;
66
import com.fasterxml.jackson.databind.SerializerProvider;
77
import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
88
import com.fasterxml.jackson.databind.ser.std.StdContainerSerializer;
@@ -19,15 +19,15 @@ public final class RefRefMapIterableSerializer extends RefRefMapSerializer<MapIt
1919
{
2020
public RefRefMapIterableSerializer(
2121
JavaType type,
22-
JsonSerializer<Object> keySerializer, TypeSerializer vts, JsonSerializer<Object> valueSerializer,
22+
ValueSerializer<Object> keySerializer, TypeSerializer vts, ValueSerializer<Object> valueSerializer,
2323
Set<String> ignoredEntries
2424
) {
2525
super(type, MapIterable.class, keySerializer, vts, valueSerializer, ignoredEntries);
2626
}
2727

2828
protected RefRefMapIterableSerializer(
2929
RefRefMapIterableSerializer src, BeanProperty property,
30-
JsonSerializer<?> keySerializer, TypeSerializer vts, JsonSerializer<?> valueSerializer,
30+
ValueSerializer<?> keySerializer, TypeSerializer vts, ValueSerializer<?> valueSerializer,
3131
Set<String> ignoredEntries
3232
) {
3333
super(src, property, keySerializer, vts, valueSerializer, ignoredEntries);
@@ -36,7 +36,7 @@ protected RefRefMapIterableSerializer(
3636
@Override
3737
protected RefRefMapIterableSerializer withResolved(
3838
BeanProperty property,
39-
JsonSerializer<?> keySer, TypeSerializer vts, JsonSerializer<?> valueSer,
39+
ValueSerializer<?> keySer, TypeSerializer vts, ValueSerializer<?> valueSer,
4040
Set<String> ignored
4141
) {
4242
return new RefRefMapIterableSerializer(this, property, keySer, vts, valueSer, ignored);

‎eclipse-collections/src/main/javaTemplates/com/fasterxml/jackson/datatype/eclipsecollections/ser/map/PrimitiveRefMapSerializers.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ private PrimitiveRefMapSerializers() {
2020

2121
public static class Char<V> extends PrimitiveRefMapSerializer<CharObjectMap<V>, V>
2222
{
23-
public Char(JavaType type, BeanProperty property, TypeSerializer vts, JsonSerializer<Object> valueSerializer) {
23+
public Char(JavaType type, BeanProperty property, TypeSerializer vts, ValueSerializer<Object> valueSerializer) {
2424
super(type, property, vts, valueSerializer);
2525
}
2626

@@ -37,7 +37,7 @@ protected void serializeEntries(CharObjectMap<V> value, JsonGenerator g, Seriali
3737
protected PrimitiveRefMapSerializer<CharObjectMap<V>, V> withResolved(
3838
TypeSerializer vts,
3939
BeanProperty property,
40-
JsonSerializer<Object> valueSerializer
40+
ValueSerializer<Object> valueSerializer
4141
) {
4242
return new Char<>(_type, property, vts, valueSerializer);
4343
}

‎eclipse-collections/src/main/javaTemplates/com/fasterxml/jackson/datatype/eclipsecollections/ser/map/RefPrimitiveMapSerializers.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import com.fasterxml.jackson.databind.BeanProperty;
66
import com.fasterxml.jackson.databind.JavaType;
7-
import com.fasterxml.jackson.databind.JsonSerializer;
7+
import com.fasterxml.jackson.databind.ValueSerializer;
88
import com.fasterxml.jackson.databind.SerializerProvider;
99

1010
import com.fasterxml.jackson.datatype.primitive_collections_base.ser.map.RefPrimitiveMapSerializer;
@@ -24,13 +24,13 @@ private RefPrimitiveMapSerializers() {
2424

2525
public static final class Char<K> extends RefPrimitiveMapSerializer<ObjectCharMap<K>, K>
2626
{
27-
public Char(JavaType type, BeanProperty property, JsonSerializer<Object> keySerializer) {
27+
public Char(JavaType type, BeanProperty property, ValueSerializer<Object> keySerializer) {
2828
super(type, property, keySerializer);
2929
}
3030

3131
@Override
3232
protected RefPrimitiveMapSerializer<ObjectCharMap<K>, K> withResolved(
33-
BeanProperty property, JsonSerializer<Object> keySerializer
33+
BeanProperty property, ValueSerializer<Object> keySerializer
3434
) {
3535
return new Char<>(_type, property, keySerializer);
3636
}

‎guava/src/main/java/com/fasterxml/jackson/datatype/guava/GuavaSerializers.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ public Iterable<?> convert(Object value) {
4848
}
4949

5050
@Override
51-
public JsonSerializer<?> findReferenceSerializer(SerializationConfig config,
51+
public ValueSerializer<?> findReferenceSerializer(SerializationConfig config,
5252
ReferenceType refType, BeanDescription beanDesc, JsonFormat.Value formatOverrides,
53-
TypeSerializer contentTypeSerializer, JsonSerializer<Object> contentValueSerializer)
53+
TypeSerializer contentTypeSerializer, ValueSerializer<Object> contentValueSerializer)
5454
{
5555
final Class<?> raw = refType.getRawClass();
5656
if (Optional.class.isAssignableFrom(raw)) {
@@ -63,7 +63,7 @@ public JsonSerializer<?> findReferenceSerializer(SerializationConfig config,
6363
}
6464

6565
@Override
66-
public JsonSerializer<?> findSerializer(SerializationConfig config, JavaType type,
66+
public ValueSerializer<?> findSerializer(SerializationConfig config, JavaType type,
6767
BeanDescription beanDesc, JsonFormat.Value formatOverrides)
6868
{
6969
Class<?> raw = type.getRawClass();
@@ -97,10 +97,10 @@ public JsonSerializer<?> findSerializer(SerializationConfig config, JavaType typ
9797
}
9898

9999
@Override
100-
public JsonSerializer<?> findMapLikeSerializer(SerializationConfig config,
100+
public ValueSerializer<?> findMapLikeSerializer(SerializationConfig config,
101101
MapLikeType type, BeanDescription beanDesc, JsonFormat.Value formatOverrides,
102-
JsonSerializer<Object> keySerializer,
103-
TypeSerializer elementTypeSerializer, JsonSerializer<Object> elementValueSerializer)
102+
ValueSerializer<Object> keySerializer,
103+
TypeSerializer elementTypeSerializer, ValueSerializer<Object> elementValueSerializer)
104104
{
105105
if (Multimap.class.isAssignableFrom(type.getRawClass())) {
106106
final AnnotationIntrospector intr = config.getAnnotationIntrospector();

‎guava/src/main/java/com/fasterxml/jackson/datatype/guava/ser/GuavaOptionalSerializer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ public class GuavaOptionalSerializer
1818
*/
1919

2020
public GuavaOptionalSerializer(ReferenceType fullType, boolean staticTyping,
21-
TypeSerializer vts, JsonSerializer<Object> ser)
21+
TypeSerializer vts, ValueSerializer<Object> ser)
2222
{
2323
super(fullType, staticTyping, vts, ser);
2424
}
2525

2626
public GuavaOptionalSerializer(GuavaOptionalSerializer base, BeanProperty property,
27-
TypeSerializer vts, JsonSerializer<?> valueSer, NameTransformer unwrapper,
27+
TypeSerializer vts, ValueSerializer<?> valueSer, NameTransformer unwrapper,
2828
Object suppressableValue, boolean suppressNulls)
2929
{
3030
super(base, property, vts, valueSer, unwrapper,
@@ -34,7 +34,7 @@ public GuavaOptionalSerializer(GuavaOptionalSerializer base, BeanProperty proper
3434

3535
@Override
3636
protected ReferenceTypeSerializer<Optional<?>> withResolved(BeanProperty prop,
37-
TypeSerializer vts, JsonSerializer<?> valueSer,
37+
TypeSerializer vts, ValueSerializer<?> valueSer,
3838
NameTransformer unwrapper)
3939
{
4040
if ((_property == prop)

‎guava/src/main/java/com/fasterxml/jackson/datatype/guava/ser/MultimapSerializer.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ public class MultimapSerializer
4242
extends StdContainerSerializer<Multimap<?, ?>>
4343
{
4444
private final MapLikeType _type;
45-
private final JsonSerializer<Object> _keySerializer;
45+
private final ValueSerializer<Object> _keySerializer;
4646
private final TypeSerializer _valueTypeSerializer;
47-
private final JsonSerializer<Object> _valueSerializer;
47+
private final ValueSerializer<Object> _valueSerializer;
4848

4949
/**
5050
* Set of entries to omit during serialization, if any
@@ -65,8 +65,8 @@ public class MultimapSerializer
6565
protected final boolean _sortKeys;
6666

6767
public MultimapSerializer(MapLikeType type, BeanDescription beanDesc,
68-
JsonSerializer<Object> keySerializer, TypeSerializer vts,
69-
JsonSerializer<Object> valueSerializer,
68+
ValueSerializer<Object> keySerializer, TypeSerializer vts,
69+
ValueSerializer<Object> valueSerializer,
7070
Set<String> ignoredEntries, Object filterId)
7171
{
7272
super(type, null);
@@ -81,21 +81,21 @@ public MultimapSerializer(MapLikeType type, BeanDescription beanDesc,
8181

8282
@SuppressWarnings("unchecked")
8383
protected MultimapSerializer(MultimapSerializer src, BeanProperty property,
84-
JsonSerializer<?> keySerializer, TypeSerializer vts, JsonSerializer<?> valueSerializer,
84+
ValueSerializer<?> keySerializer, TypeSerializer vts, ValueSerializer<?> valueSerializer,
8585
Set<String> ignoredEntries, Object filterId, boolean sortKeys)
8686
{
8787
super(src, property);
8888
_type = src._type;
89-
_keySerializer = (JsonSerializer<Object>) keySerializer;
89+
_keySerializer = (ValueSerializer<Object>) keySerializer;
9090
_valueTypeSerializer = vts;
91-
_valueSerializer = (JsonSerializer<Object>) valueSerializer;
91+
_valueSerializer = (ValueSerializer<Object>) valueSerializer;
9292
_ignoredEntries = ignoredEntries;
9393
_filterId = filterId;
9494
_sortKeys = sortKeys;
9595
}
9696

9797
protected MultimapSerializer withResolved(BeanProperty property,
98-
JsonSerializer<?> keySer, TypeSerializer vts, JsonSerializer<?> valueSer,
98+
ValueSerializer<?> keySer, TypeSerializer vts, ValueSerializer<?> valueSer,
9999
Set<String> ignored, Object filterId, boolean sortKeys)
100100
{
101101
return new MultimapSerializer(this, property, keySer, vts, valueSer,
@@ -115,10 +115,10 @@ protected StdContainerSerializer<?> _withValueTypeSerializer(TypeSerializer type
115115
*/
116116

117117
@Override
118-
public JsonSerializer<?> createContextual(SerializerProvider ctxt,
118+
public ValueSerializer<?> createContextual(SerializerProvider ctxt,
119119
BeanProperty property)
120120
{
121-
JsonSerializer<?> valueSer = _valueSerializer;
121+
ValueSerializer<?> valueSer = _valueSerializer;
122122
if (valueSer == null) { // if type is final, can actually resolve:
123123
JavaType valueType = _type.getContentType();
124124
if (valueType.isFinal()) {
@@ -131,7 +131,7 @@ public JsonSerializer<?> createContextual(SerializerProvider ctxt,
131131
final SerializationConfig config = ctxt.getConfig();
132132
final AnnotationIntrospector intr = config.getAnnotationIntrospector();
133133
final AnnotatedMember propertyAcc = (property == null) ? null : property.getMember();
134-
JsonSerializer<?> keySer = null;
134+
ValueSerializer<?> keySer = null;
135135
Object filterId = _filterId;
136136

137137
// First: if we have a property, may have property-annotation overrides
@@ -212,7 +212,7 @@ public JsonSerializer<?> createContextual(SerializerProvider ctxt,
212212
*/
213213

214214
@Override
215-
public JsonSerializer<?> getContentSerializer() {
215+
public ValueSerializer<?> getContentSerializer() {
216216
return _valueSerializer;
217217
}
218218

@@ -307,7 +307,7 @@ private final void serializeFields(Multimap<?, ?> mmap, JsonGenerator
307307
provider.defaultSerializeNullValue(gen);
308308
continue;
309309
}
310-
JsonSerializer<Object> valueSer = _valueSerializer;
310+
ValueSerializer<Object> valueSer = _valueSerializer;
311311
if (valueSer == null) {
312312
Class<?> cc = vv.getClass();
313313
valueSer = _dynamicValueSerializers.serializerFor(cc);
@@ -338,7 +338,7 @@ private final void serializeFilteredFields(Multimap<?, ?> mmap, JsonGenerator ge
338338
continue;
339339
}
340340
Collection<?> value = entry.getValue();
341-
JsonSerializer<Object> valueSer;
341+
ValueSerializer<Object> valueSer;
342342
if (value == null) {
343343
// !!! TODO: null suppression?
344344
valueSer = provider.getDefaultNullValueSerializer();
@@ -367,13 +367,13 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
367367
JsonMapFormatVisitor v2 = (visitor == null) ? null : visitor.expectMapFormat(typeHint);
368368
if (v2 != null) {
369369
v2.keyFormat(_keySerializer, _type.getKeyType());
370-
JsonSerializer<?> valueSer = _valueSerializer;
370+
ValueSerializer<?> valueSer = _valueSerializer;
371371
final JavaType vt = _type.getContentType();
372372
final SerializerProvider prov = visitor.getProvider();
373373
if (valueSer == null) {
374374
valueSer = _findAndAddDynamic(prov, vt);
375375
}
376-
final JsonSerializer<?> valueSer2 = valueSer;
376+
final ValueSerializer<?> valueSer2 = valueSer;
377377
v2.valueFormat(new JsonFormatVisitable() {
378378
final JavaType arrayType = prov.getTypeFactory().constructArrayType(vt);
379379
@Override

‎guava/src/main/java/com/fasterxml/jackson/datatype/guava/ser/RangeSerializer.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class RangeSerializer extends StdSerializer<Range<?>>
2020
{
2121
protected final JavaType _rangeType;
2222

23-
protected final JsonSerializer<Object> _endpointSerializer;
23+
protected final ValueSerializer<Object> _endpointSerializer;
2424

2525
private final RangeHelper.RangeProperties _fieldNames;
2626

@@ -35,12 +35,12 @@ public RangeSerializer(JavaType type) {
3535
}
3636

3737
@SuppressWarnings("unchecked")
38-
protected RangeSerializer(JavaType type, JsonSerializer<?> endpointSer,
38+
protected RangeSerializer(JavaType type, ValueSerializer<?> endpointSer,
3939
RangeHelper.RangeProperties fieldNames)
4040
{
4141
super(type);
4242
_rangeType = type;
43-
_endpointSerializer = (JsonSerializer<Object>) endpointSer;
43+
_endpointSerializer = (ValueSerializer<Object>) endpointSer;
4444
_fieldNames = fieldNames;
4545
}
4646

@@ -50,12 +50,12 @@ public boolean isEmpty(SerializerProvider prov, Range<?> value) {
5050
}
5151

5252
@Override
53-
public JsonSerializer<?> createContextual(SerializerProvider prov,
53+
public ValueSerializer<?> createContextual(SerializerProvider prov,
5454
BeanProperty property)
5555
{
5656
final RangeHelper.RangeProperties fieldNames = RangeHelper.getPropertyNames(prov.getConfig(),
5757
prov.getConfig().getPropertyNamingStrategy());
58-
JsonSerializer<?> endpointSer = _endpointSerializer;
58+
ValueSerializer<?> endpointSer = _endpointSerializer;
5959
if (endpointSer == null) {
6060
JavaType endpointType = _rangeType.containedTypeOrUnknown(0);
6161
// let's not consider "untyped" (java.lang.Object) to be meaningful here...
@@ -135,7 +135,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
135135
JavaType endpointType = _rangeType.containedType(0);
136136
JavaType btType = visitor.getProvider().constructType(BoundType.class);
137137
// should probably keep track of `property`...
138-
JsonSerializer<?> btSer = visitor.getProvider()
138+
ValueSerializer<?> btSer = visitor.getProvider()
139139
.findContentValueSerializer(btType, null);
140140
objectVisitor.property(_fieldNames.lowerEndpoint, _endpointSerializer, endpointType);
141141
objectVisitor.property(_fieldNames.lowerBoundType, btSer, btType);

‎guava/src/main/java/com/fasterxml/jackson/datatype/guava/ser/RangeSetSerializer.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
import com.fasterxml.jackson.core.JsonGenerator;
77

88
import com.fasterxml.jackson.databind.BeanProperty;
9-
import com.fasterxml.jackson.databind.JsonSerializer;
9+
import com.fasterxml.jackson.databind.ValueSerializer;
1010
import com.fasterxml.jackson.databind.SerializerProvider;
1111
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
1212

1313
import com.google.common.collect.RangeSet;
1414

1515
public class RangeSetSerializer extends StdSerializer<RangeSet<Comparable<?>>>
1616
{
17-
private final JsonSerializer<Object> _serializer;
17+
private final ValueSerializer<Object> _serializer;
1818

1919
public RangeSetSerializer() {
2020
super(RangeSet.class);
2121
_serializer = null;
2222
}
2323

24-
protected RangeSetSerializer(RangeSetSerializer base, JsonSerializer<Object> ser) {
24+
protected RangeSetSerializer(RangeSetSerializer base, ValueSerializer<Object> ser) {
2525
super(base);
2626
_serializer = ser;
2727
}
@@ -38,13 +38,13 @@ public void serialize(RangeSet<Comparable<?>> value, JsonGenerator g,
3838
}
3939

4040
@Override
41-
public JsonSerializer<?> createContextual(SerializerProvider ctxt, BeanProperty property)
41+
public ValueSerializer<?> createContextual(SerializerProvider ctxt, BeanProperty property)
4242
{
4343
// 23-Jan-2021, tatu: Should really improve upon this to handle more complex
4444
// values, but this simplified version passes existing unit tests so has to do.
4545

4646

47-
JsonSerializer<Object> ser = ctxt.findContentValueSerializer(List.class, property);
47+
ValueSerializer<Object> ser = ctxt.findContentValueSerializer(List.class, property);
4848
return new RangeSetSerializer(this, ser);
4949

5050
// Old (Jackson 2.x) implementation was along lines of

0 commit comments

Comments
 (0)