Skip to content

Commit 7028720

Browse files
cowtowncodercowtowncoder
committed
Minor renaming
1 parent 04b87e5 commit 7028720

File tree

9 files changed

+34
-32
lines changed

9 files changed

+34
-32
lines changed

‎src/main/java/tools/jackson/databind/ValueSerializer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ public abstract void serialize(T value, JsonGenerator gen, SerializationContext
235235
*<pre>
236236
* // note: method to call depends on whether this type is serialized as JSON scalar, object or Array!
237237
* typeSer.writeTypePrefixForScalar(value, gen);
238-
* serialize(value, gen, provider);
238+
* serialize(value, gen, ctxt);
239239
* typeSer.writeTypeSuffixForScalar(value, gen);
240240
*</pre>
241241
* and implementations for type serialized as JSON Arrays or Objects would differ slightly,

‎src/main/java/tools/jackson/databind/ext/jdk8/OptionalLongSerializer.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public OptionalLongSerializer() {
2020
}
2121

2222
@Override
23-
public boolean isEmpty(SerializationContext provider, OptionalLong value) {
23+
public boolean isEmpty(SerializationContext ctxt, OptionalLong value) {
2424
return (value == null) || !value.isPresent();
2525
}
2626

@@ -36,13 +36,13 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor,
3636
}
3737

3838
@Override
39-
public void serialize(OptionalLong value, JsonGenerator jgen, SerializationContext provider)
39+
public void serialize(OptionalLong value, JsonGenerator g, SerializationContext ctxt)
4040
throws JacksonException
4141
{
4242
if (value.isPresent()) {
43-
jgen.writeNumber(value.getAsLong());
43+
g.writeNumber(value.getAsLong());
4444
} else { // should we get here?
45-
jgen.writeNull();
45+
g.writeNull();
4646
}
4747
}
4848
}

‎src/main/java/tools/jackson/databind/node/BaseJsonNode.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,15 +615,15 @@ protected String _asString() {
615615
* Method called to serialize node instances using given generator.
616616
*/
617617
@Override
618-
public abstract void serialize(JsonGenerator jgen, SerializationContext ctxt)
618+
public abstract void serialize(JsonGenerator g, SerializationContext ctxt)
619619
throws JacksonException;
620620

621621
/**
622622
* Type information is needed, even if JsonNode instances are "plain" JSON,
623623
* since they may be mixed with other types.
624624
*/
625625
@Override
626-
public abstract void serializeWithType(JsonGenerator jgen, SerializationContext ctxt,
626+
public abstract void serializeWithType(JsonGenerator g, SerializationContext ctxt,
627627
TypeSerializer typeSer)
628628
throws JacksonException;
629629

‎src/main/java/tools/jackson/databind/ser/impl/AttributePropertyWriter.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ public VirtualBeanPropertyWriter withConfig(MapperConfig<?> config,
7575
*/
7676

7777
@Override
78-
protected Object value(Object bean, JsonGenerator jgen, SerializationContext prov) throws Exception {
79-
return prov.getAttribute(_attrName);
78+
protected Object value(Object bean, JsonGenerator g, SerializationContext ctxt)
79+
throws Exception
80+
{
81+
return ctxt.getAttribute(_attrName);
8082
}
8183
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ public class TokenBufferSerializer
2323
public TokenBufferSerializer() { super(TokenBuffer.class); }
2424

2525
@Override
26-
public void serialize(TokenBuffer value, JsonGenerator jgen, SerializationContext provider)
26+
public void serialize(TokenBuffer value, JsonGenerator g, SerializationContext ctxt)
2727
throws JacksonException
2828
{
29-
value.serialize(jgen);
29+
value.serialize(g);
3030
}
3131

3232
/**
@@ -40,8 +40,8 @@ public void serialize(TokenBuffer value, JsonGenerator jgen, SerializationContex
4040
* than doing introspection on both serialization and deserialization.
4141
*/
4242
@Override
43-
public final void serializeWithType(TokenBuffer value, JsonGenerator g, SerializationContext ctxt,
44-
TypeSerializer typeSer)
43+
public final void serializeWithType(TokenBuffer value, JsonGenerator g,
44+
SerializationContext ctxt, TypeSerializer typeSer)
4545
throws JacksonException
4646
{
4747
// 28-Jun-2017, tatu: As per javadoc, not sure what to report as likely shape. Could

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class InetSocketAddressSerializer
1919
public InetSocketAddressSerializer() { super(InetSocketAddress.class); }
2020

2121
@Override
22-
public void serialize(InetSocketAddress value, JsonGenerator jgen, SerializationContext provider)
22+
public void serialize(InetSocketAddress value, JsonGenerator g, SerializationContext ctxt)
2323
throws JacksonException
2424
{
2525
InetAddress addr = value.getAddress();
@@ -36,7 +36,7 @@ public void serialize(InetSocketAddress value, JsonGenerator jgen, Serialization
3636
}
3737
}
3838

39-
jgen.writeString(str + ":" + value.getPort());
39+
g.writeString(str + ":" + value.getPort());
4040
}
4141

4242
@Override

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,12 @@ public final void serializeWithType(T value, JsonGenerator g, SerializationConte
163163
typeSer.writeTypeSuffix(g, ctxt, typeIdDef);
164164
}
165165

166-
protected abstract void serializeContents(T value, JsonGenerator jgen, SerializationContext provider)
166+
protected abstract void serializeContents(T value, JsonGenerator g, SerializationContext ctxt)
167167
throws JacksonException;
168168

169-
protected final boolean _shouldUnwrapSingle(SerializationContext provider) {
169+
protected final boolean _shouldUnwrapSingle(SerializationContext ctxt) {
170170
if (_unwrapSingle == null) {
171-
return provider.isEnabled(SerializationFeature.WRITE_SINGLE_ELEM_ARRAYS_UNWRAPPED);
171+
return ctxt.isEnabled(SerializationFeature.WRITE_SINGLE_ELEM_ARRAYS_UNWRAPPED);
172172
}
173173
return _unwrapSingle.booleanValue();
174174
}

‎src/main/java/tools/jackson/databind/util/JSONPObject.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,23 +51,23 @@ public JSONPObject(String function, Object value, JavaType asType)
5151
*/
5252

5353
@Override
54-
public void serializeWithType(JsonGenerator gen, SerializationContext provider, TypeSerializer typeSer)
54+
public void serializeWithType(JsonGenerator gen, SerializationContext ctxt, TypeSerializer typeSer)
5555
throws JacksonException
5656
{
5757
// No type for JSONP wrapping: value serializer will handle typing for value:
58-
serialize(gen, provider);
58+
serialize(gen, ctxt);
5959
}
6060

6161
@Override
62-
public void serialize(JsonGenerator gen, SerializationContext provider)
62+
public void serialize(JsonGenerator gen, SerializationContext ctxt)
6363
throws JacksonException
6464
{
6565
// First, wrapping:
6666
gen.writeRaw(_function);
6767
gen.writeRaw('(');
6868

6969
if (_value == null) {
70-
provider.defaultSerializeNullValue(gen);
70+
ctxt.defaultSerializeNullValue(gen);
7171
} else {
7272
// NOTE: Escape line-separator characters that break JSONP only if no custom character escapes are set.
7373
// If custom escapes are in place JSONP-breaking characters will not be escaped and it is recommended to
@@ -79,9 +79,9 @@ public void serialize(JsonGenerator gen, SerializationContext provider)
7979

8080
try {
8181
if (_serializationType != null) {
82-
provider.findTypedValueSerializer(_serializationType, true).serialize(_value, gen, provider);
82+
ctxt.findTypedValueSerializer(_serializationType, true).serialize(_value, gen, ctxt);
8383
} else {
84-
provider.findTypedValueSerializer(_value.getClass(), true).serialize(_value, gen, provider);
84+
ctxt.findTypedValueSerializer(_value.getClass(), true).serialize(_value, gen, ctxt);
8585
}
8686
} finally {
8787
if (override) {

‎src/main/java/tools/jackson/databind/util/JSONWrappedObject.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,27 +63,27 @@ public JSONWrappedObject(String prefix, String suffix, Object value, JavaType as
6363
*/
6464

6565
@Override
66-
public void serializeWithType(JsonGenerator g, SerializationContext provider, TypeSerializer typeSer)
66+
public void serializeWithType(JsonGenerator g, SerializationContext ctxt, TypeSerializer typeSer)
6767
throws JacksonException
6868
{
6969
// No type for JSONP wrapping: value serializer will handle typing for value:
70-
serialize(g, provider);
70+
serialize(g, ctxt);
7171
}
7272

7373
@Override
74-
public void serialize(JsonGenerator g, SerializationContext provider)
74+
public void serialize(JsonGenerator g, SerializationContext ctxt)
7575
throws JacksonException
7676
{
7777
// First, wrapping:
7878
if (_prefix != null) g.writeRaw(_prefix);
7979
if (_value == null) {
80-
provider.defaultSerializeNullValue(g);
80+
ctxt.defaultSerializeNullValue(g);
8181
} else if (_serializationType != null) {
82-
provider.findTypedValueSerializer(_serializationType, true)
83-
.serialize(_value, g, provider);
82+
ctxt.findTypedValueSerializer(_serializationType, true)
83+
.serialize(_value, g, ctxt);
8484
} else {
85-
provider.findTypedValueSerializer(_value.getClass(), true)
86-
.serialize(_value, g, provider);
85+
ctxt.findTypedValueSerializer(_value.getClass(), true)
86+
.serialize(_value, g, ctxt);
8787
}
8888
if (_suffix != null) g.writeRaw(_suffix);
8989
}

0 commit comments

Comments
 (0)