Skip to content

Commit 8e91802

Browse files
cowtowncodercowtowncoder
committed
Follow-up to #3043 wrt JsonFormatVisitor naming of SerializationContext accessors
1 parent 8ba0e8a commit 8e91802

16 files changed

+33
-33
lines changed

‎src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonArrayFormatVisitor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ public Base() { }
3434
public Base(SerializationContext p) { _provider = p; }
3535

3636
@Override
37-
public SerializationContext getProvider() { return _provider; }
37+
public SerializationContext getContext() { return _provider; }
3838

3939
@Override
40-
public void setProvider(SerializationContext p) { _provider = p; }
40+
public void setContext(SerializationContext p) { _provider = p; }
4141

4242
@Override
4343
public void itemsFormat(JsonFormatVisitable handler, JavaType elementType) { }

‎src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWithSerializationContext.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
* @author jphelan
1010
*/
1111
public interface JsonFormatVisitorWithSerializationContext {
12-
public SerializationContext getProvider();
13-
public abstract void setProvider(SerializationContext provider);
12+
public SerializationContext getContext();
13+
public abstract void setContext(SerializationContext provider);
1414
}

‎src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonFormatVisitorWrapper.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -62,29 +62,29 @@ public interface JsonFormatVisitorWrapper extends JsonFormatVisitorWithSerializa
6262

6363
/**
6464
* Empty "no-op" implementation of {@link JsonFormatVisitorWrapper}, suitable for
65-
* sub-classing. Does implement {@link #setProvider(SerializationContext)} and
66-
* {@link #getProvider()} as expected; other methods simply return null
65+
* sub-classing. Does implement {@link #setContext(SerializationContext)} and
66+
* {@link #getContext()} as expected; other methods simply return null
6767
* and do nothing.
6868
*
6969
* @since 2.5
7070
*/
7171
public static class Base implements JsonFormatVisitorWrapper {
72-
protected SerializationContext _provider;
72+
protected SerializationContext _context;
7373

7474
public Base() { }
7575

7676
public Base(SerializationContext p) {
77-
_provider = p;
77+
_context = p;
7878
}
7979

8080
@Override
81-
public SerializationContext getProvider() {
82-
return _provider;
81+
public SerializationContext getContext() {
82+
return _context;
8383
}
8484

8585
@Override
86-
public void setProvider(SerializationContext p) {
87-
_provider = p;
86+
public void setContext(SerializationContext p) {
87+
_context = p;
8888
}
8989

9090
@Override

‎src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonMapFormatVisitor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ public Base() { }
3131
public Base(SerializationContext p) { _provider = p; }
3232

3333
@Override
34-
public SerializationContext getProvider() { return _provider; }
34+
public SerializationContext getContext() { return _provider; }
3535

3636
@Override
37-
public void setProvider(SerializationContext p) { _provider = p; }
37+
public void setContext(SerializationContext p) { _provider = p; }
3838

3939
@Override
4040
public void keyFormat(JsonFormatVisitable handler, JavaType keyType) { }

‎src/main/java/tools/jackson/databind/jsonFormatVisitors/JsonObjectFormatVisitor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ public Base() { }
4141
public Base(SerializationContext p) { _provider = p; }
4242

4343
@Override
44-
public SerializationContext getProvider() { return _provider; }
44+
public SerializationContext getContext() { return _provider; }
4545

4646
@Override
47-
public void setProvider(SerializationContext p) { _provider = p; }
47+
public void setContext(SerializationContext p) { _provider = p; }
4848

4949
@Override
5050
public void property(BeanProperty prop) { }

‎src/main/java/tools/jackson/databind/ser/SerializationContextExt.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ public void acceptJsonFormatVisitor(JavaType javaType, JsonFormatVisitorWrapper
482482
Objects.requireNonNull(javaType);
483483
// no need for embedded type information for JSON schema generation (all
484484
// type information it needs is accessible via "untyped" serializer)
485-
visitor.setProvider(this);
485+
visitor.setContext(this);
486486
findRootValueSerializer(javaType).acceptJsonFormatVisitor(visitor, javaType);
487487
}
488488

‎src/main/java/tools/jackson/databind/ser/bean/BeanSerializerBase.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -937,9 +937,9 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
937937
if (objectVisitor == null) {
938938
return;
939939
}
940-
final SerializationContext provider = visitor.getProvider();
940+
final SerializationContext provider = visitor.getContext();
941941
if (_propertyFilterId != null) {
942-
PropertyFilter filter = findPropertyFilter(visitor.getProvider(),
942+
PropertyFilter filter = findPropertyFilter(visitor.getContext(),
943943
_propertyFilterId, null);
944944
for (int i = 0, end = _props.length; i < end; ++i) {
945945
filter.depositSchemaProperty(_props[i], objectVisitor, provider);

‎src/main/java/tools/jackson/databind/ser/jackson/JsonValueSerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
334334
}
335335
ValueSerializer<Object> ser = _valueSerializer;
336336
if (ser == null) {
337-
ser = visitor.getProvider().findPrimaryPropertySerializer(type, _property);
337+
ser = visitor.getContext().findPrimaryPropertySerializer(type, _property);
338338
if (ser == null) { // can this ever occur?
339339
visitor.expectAnyFormat(typeHint);
340340
return;

‎src/main/java/tools/jackson/databind/ser/jdk/DateTimeSerializerBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public boolean isEmpty(SerializationContext serializers, T value) {
147147
@Override
148148
public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
149149
{
150-
_acceptJsonFormatVisitor(visitor, typeHint, _asTimestamp(visitor.getProvider()));
150+
_acceptJsonFormatVisitor(visitor, typeHint, _asTimestamp(visitor.getContext()));
151151
}
152152

153153
/*

‎src/main/java/tools/jackson/databind/ser/jdk/EnumSerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public final void serialize(Enum<?> en, JsonGenerator g, SerializationContext ct
153153
@Override
154154
public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
155155
{
156-
SerializationContext serializers = visitor.getProvider();
156+
SerializationContext serializers = visitor.getContext();
157157
if (_serializeAsIndex(serializers)) {
158158
visitIntFormat(visitor, typeHint, JsonParser.NumberType.INT);
159159
return;

‎src/main/java/tools/jackson/databind/ser/jdk/MapSerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
965965
v2.keyFormat(_keySerializer, _keyType);
966966
ValueSerializer<?> valueSer = _valueSerializer;
967967
if (valueSer == null) {
968-
valueSer = _findAndAddDynamic(visitor.getProvider(), _valueType);
968+
valueSer = _findAndAddDynamic(visitor.getContext(), _valueType);
969969
}
970970
v2.valueFormat(valueSer, _valueType);
971971
}

‎src/main/java/tools/jackson/databind/ser/jdk/ObjectArraySerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
298298
JavaType contentType = _elementType;
299299
ValueSerializer<?> valueSer = _elementSerializer;
300300
if (valueSer == null) {
301-
valueSer = visitor.getProvider().findContentValueSerializer(contentType, _property);
301+
valueSer = visitor.getContext().findContentValueSerializer(contentType, _property);
302302
}
303303
arrayVisitor.itemsFormat(valueSer, contentType);
304304
}

‎src/main/java/tools/jackson/databind/ser/std/AsArraySerializerBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
233233
// 19-Oct-2016, tatu: Apparently we get null for untyped/raw `EnumSet`s... not 100%
234234
// sure what'd be the clean way but let's try this for now:
235235
if (_elementType != null) {
236-
valueSer = visitor.getProvider().findContentValueSerializer(_elementType, _property);
236+
valueSer = visitor.getContext().findContentValueSerializer(_elementType, _property);
237237
}
238238
}
239239
visitArrayFormat(visitor, typeHint, valueSer, _elementType);

‎src/main/java/tools/jackson/databind/ser/std/ReferenceTypeSerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
379379
{
380380
ValueSerializer<?> ser = _valueSerializer;
381381
if (ser == null) {
382-
ser = _findSerializer(visitor.getProvider(), _referredType, _property);
382+
ser = _findSerializer(visitor.getContext(), _referredType, _property);
383383
if (_unwrapper != null) {
384384
ser = ser.unwrappingSerializer(_unwrapper);
385385
}

‎src/test/java/tools/jackson/databind/ext/jdk8/OptionalUnwrappedTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void testPropogatePrefixToSchema() throws Exception {
7979
BeanSerializerFactory.instance, new SerializerCache())) {
8080
@Override
8181
public JsonObjectFormatVisitor expectObjectFormat(JavaType type) {
82-
return new JsonObjectFormatVisitor.Base(getProvider()) {
82+
return new JsonObjectFormatVisitor.Base(getContext()) {
8383
@Override
8484
public void optionalProperty(BeanProperty prop) {
8585
propertyName.set(prop.getName());

‎src/test/java/tools/jackson/databind/jsonschema/NewSchemaTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ static class BogusJsonFormatVisitorWrapper
118118

119119
@Override
120120
public JsonObjectFormatVisitor expectObjectFormat(JavaType type) {
121-
return new JsonObjectFormatVisitor.Base(getProvider()) {
121+
return new JsonObjectFormatVisitor.Base(getContext()) {
122122
@Override
123123
public void property(BeanProperty prop) {
124124
_visit(prop);
@@ -144,22 +144,22 @@ private void _visit(BeanProperty prop)
144144
}
145145
BeanPropertyWriter bpw = (BeanPropertyWriter) prop;
146146
ValueSerializer<?> ser = bpw.getSerializer();
147-
final SerializationContext prov = getProvider();
147+
final SerializationContext prov = getContext();
148148
if (ser == null) {
149149
if (prov == null) {
150150
throw new Error("SerializationContext missing");
151151
}
152152
ser = prov.findPrimaryPropertySerializer(prop.getType(), prop);
153153
}
154-
JsonFormatVisitorWrapper visitor = new JsonFormatVisitorWrapper.Base(getProvider());
154+
JsonFormatVisitorWrapper visitor = new JsonFormatVisitorWrapper.Base(getContext());
155155
ser.acceptJsonFormatVisitor(visitor, prop.getType());
156156
}
157157
};
158158
}
159159

160160
@Override
161161
public JsonArrayFormatVisitor expectArrayFormat(JavaType type) {
162-
return new JsonArrayFormatVisitor.Base(getProvider());
162+
return new JsonArrayFormatVisitor.Base(getContext());
163163
}
164164

165165
@Override
@@ -305,7 +305,7 @@ public void testSimpleNumbers() throws Exception
305305
new JsonFormatVisitorWrapper.Base() {
306306
@Override
307307
public JsonObjectFormatVisitor expectObjectFormat(final JavaType type) {
308-
return new JsonObjectFormatVisitor.Base(getProvider()) {
308+
return new JsonObjectFormatVisitor.Base(getContext()) {
309309
@Override
310310
public void optionalProperty(BeanProperty prop) {
311311
sb.append("[optProp ").append(prop.getName()).append("(");
@@ -314,7 +314,7 @@ public void optionalProperty(BeanProperty prop) {
314314
BeanPropertyWriter bpw = (BeanPropertyWriter) prop;
315315
ser = bpw.getSerializer();
316316
}
317-
final SerializationContext prov = getProvider();
317+
final SerializationContext prov = getContext();
318318
if (ser == null) {
319319
ser = prov.findPrimaryPropertySerializer(prop.getType(), prop);
320320
}

0 commit comments

Comments
 (0)