Skip to content

Commit 0afc822

Browse files
cowtowncodercowtowncoder
committed
Replace JsonParser.getCurrentToken[Id] with .currentToken[Id] (migrating towards 3.0)
1 parent d051497 commit 0afc822

14 files changed

+85
-85
lines changed

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1145,7 +1145,7 @@ public Object handleInstantiationProblem(Class<?> instClass, Object argument,
11451145
public Object handleUnexpectedToken(Class<?> instClass, JsonParser p)
11461146
throws IOException
11471147
{
1148-
return handleUnexpectedToken(constructType(instClass), p.getCurrentToken(), p, null);
1148+
return handleUnexpectedToken(constructType(instClass), p.currentToken(), p, null);
11491149
}
11501150

11511151
/**
@@ -1187,7 +1187,7 @@ public Object handleUnexpectedToken(Class<?> instClass, JsonToken t,
11871187
public Object handleUnexpectedToken(JavaType targetType, JsonParser p)
11881188
throws IOException
11891189
{
1190-
return handleUnexpectedToken(targetType, p.getCurrentToken(), p, null);
1190+
return handleUnexpectedToken(targetType, p.currentToken(), p, null);
11911191
}
11921192

11931193
/**
@@ -1642,7 +1642,7 @@ public JsonMappingException wrongTokenException(JsonParser p, JavaType targetTyp
16421642
JsonToken expToken, String extra)
16431643
{
16441644
String msg = String.format("Unexpected token (%s), expected %s",
1645-
p.getCurrentToken(), expToken);
1645+
p.currentToken(), expToken);
16461646
msg = _colonConcat(msg, extra);
16471647
return MismatchedInputException.from(p, targetType, msg);
16481648
}
@@ -1651,7 +1651,7 @@ public JsonMappingException wrongTokenException(JsonParser p, Class<?> targetTyp
16511651
JsonToken expToken, String extra)
16521652
{
16531653
String msg = String.format("Unexpected token (%s), expected %s",
1654-
p.getCurrentToken(), expToken);
1654+
p.currentToken(), expToken);
16551655
msg = _colonConcat(msg, extra);
16561656
return MismatchedInputException.from(p, targetType, msg);
16571657
}
@@ -1887,7 +1887,7 @@ public JsonMappingException mappingException(String msg, Object... msgArgs) {
18871887
*/
18881888
@Deprecated
18891889
public JsonMappingException mappingException(Class<?> targetClass) {
1890-
return mappingException(targetClass, _parser.getCurrentToken());
1890+
return mappingException(targetClass, _parser.currentToken());
18911891
}
18921892

18931893
/**

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -2795,7 +2795,7 @@ public <T extends TreeNode> T readTree(JsonParser p)
27952795
_assertNotNull("p", p);
27962796
// Must check for EOF here before calling readValue(), since that'll choke on it otherwise
27972797
DeserializationConfig cfg = getDeserializationConfig();
2798-
JsonToken t = p.getCurrentToken();
2798+
JsonToken t = p.currentToken();
27992799
if (t == null) {
28002800
t = p.nextToken();
28012801
if (t == null) {
@@ -4506,7 +4506,7 @@ protected JsonNode _readTreeAndClose(JsonParser p0) throws IOException
45064506
// special requirements by tree reading (no fail on eof)
45074507

45084508
cfg.initialize(p); // since 2.5
4509-
JsonToken t = p.getCurrentToken();
4509+
JsonToken t = p.currentToken();
45104510
if (t == null) {
45114511
t = p.nextToken();
45124512
if (t == null) {
@@ -4551,15 +4551,15 @@ protected Object _unwrapAndDeserialize(JsonParser p, DeserializationContext ctxt
45514551
PropertyName expRootName = config.findRootName(rootType);
45524552
// 12-Jun-2015, tatu: Should try to support namespaces etc but...
45534553
String expSimpleName = expRootName.getSimpleName();
4554-
if (p.getCurrentToken() != JsonToken.START_OBJECT) {
4554+
if (p.currentToken() != JsonToken.START_OBJECT) {
45554555
ctxt.reportWrongTokenException(rootType, JsonToken.START_OBJECT,
45564556
"Current token not START_OBJECT (needed to unwrap root name '%s'), but %s",
4557-
expSimpleName, p.getCurrentToken());
4557+
expSimpleName, p.currentToken());
45584558
}
45594559
if (p.nextToken() != JsonToken.FIELD_NAME) {
45604560
ctxt.reportWrongTokenException(rootType, JsonToken.FIELD_NAME,
45614561
"Current token not FIELD_NAME (to contain expected root name '%s'), but %s",
4562-
expSimpleName, p.getCurrentToken());
4562+
expSimpleName, p.currentToken());
45634563
}
45644564
String actualName = p.getCurrentName();
45654565
if (!expSimpleName.equals(actualName)) {
@@ -4574,7 +4574,7 @@ protected Object _unwrapAndDeserialize(JsonParser p, DeserializationContext ctxt
45744574
if (p.nextToken() != JsonToken.END_OBJECT) {
45754575
ctxt.reportWrongTokenException(rootType, JsonToken.END_OBJECT,
45764576
"Current token not END_OBJECT (to match wrapper object with root name '%s'), but %s",
4577-
expSimpleName, p.getCurrentToken());
4577+
expSimpleName, p.currentToken());
45784578
}
45794579
if (config.isEnabled(DeserializationFeature.FAIL_ON_TRAILING_TOKENS)) {
45804580
_verifyNoTrailingTokens(p, ctxt, rootType);
@@ -4614,7 +4614,7 @@ protected JsonToken _initForReading(JsonParser p, JavaType targetType) throws IO
46144614
// First: must point to a token; if not pointing to one, advance.
46154615
// This occurs before first read from JsonParser, as well as
46164616
// after clearing of current token.
4617-
JsonToken t = p.getCurrentToken();
4617+
JsonToken t = p.currentToken();
46184618
if (t == null) {
46194619
// and then we must get something...
46204620
t = p.nextToken();

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ protected JsonToken _initForReading(DeserializationContext ctxt, JsonParser p)
352352
* This occurs before first read from JsonParser, as well as
353353
* after clearing of current token.
354354
*/
355-
JsonToken t = p.getCurrentToken();
355+
JsonToken t = p.currentToken();
356356
if (t == null) { // and then we must get something...
357357
t = p.nextToken();
358358
if (t == null) {
@@ -2082,7 +2082,7 @@ protected final JsonNode _bindAsTree(JsonParser p) throws IOException
20822082
p.setSchema(_schema);
20832083
}
20842084

2085-
JsonToken t = p.getCurrentToken();
2085+
JsonToken t = p.currentToken();
20862086
if (t == null) {
20872087
t = p.nextToken();
20882088
if (t == null) {
@@ -2124,7 +2124,7 @@ protected final JsonNode _bindAsTreeOrNull(JsonParser p) throws IOException
21242124
if (_schema != null) {
21252125
p.setSchema(_schema);
21262126
}
2127-
JsonToken t = p.getCurrentToken();
2127+
JsonToken t = p.currentToken();
21282128
if (t == null) {
21292129
t = p.nextToken();
21302130
if (t == null) {
@@ -2173,15 +2173,15 @@ protected Object _unwrapAndDeserialize(JsonParser p, DeserializationContext ctxt
21732173
// 12-Jun-2015, tatu: Should try to support namespaces etc but...
21742174
String expSimpleName = expRootName.getSimpleName();
21752175

2176-
if (p.getCurrentToken() != JsonToken.START_OBJECT) {
2176+
if (p.currentToken() != JsonToken.START_OBJECT) {
21772177
ctxt.reportWrongTokenException(rootType, JsonToken.START_OBJECT,
21782178
"Current token not START_OBJECT (needed to unwrap root name '%s'), but %s",
2179-
expSimpleName, p.getCurrentToken());
2179+
expSimpleName, p.currentToken());
21802180
}
21812181
if (p.nextToken() != JsonToken.FIELD_NAME) {
21822182
ctxt.reportWrongTokenException(rootType, JsonToken.FIELD_NAME,
21832183
"Current token not FIELD_NAME (to contain expected root name '%s'), but %s",
2184-
expSimpleName, p.getCurrentToken());
2184+
expSimpleName, p.currentToken());
21852185
}
21862186
String actualName = p.getCurrentName();
21872187
if (!expSimpleName.equals(actualName)) {
@@ -2202,7 +2202,7 @@ protected Object _unwrapAndDeserialize(JsonParser p, DeserializationContext ctxt
22022202
if (p.nextToken() != JsonToken.END_OBJECT) {
22032203
ctxt.reportWrongTokenException(rootType, JsonToken.END_OBJECT,
22042204
"Current token not END_OBJECT (to match wrapper object with root name '%s'), but %s",
2205-
expSimpleName, p.getCurrentToken());
2205+
expSimpleName, p.currentToken());
22062206
}
22072207
if (_config.isEnabled(DeserializationFeature.FAIL_ON_TRAILING_TOKENS)) {
22082208
_verifyNoTrailingTokens(p, ctxt, _valueType);

‎src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
163163
}
164164
return deserializeFromObject(p, ctxt);
165165
}
166-
return _deserializeOther(p, ctxt, p.getCurrentToken());
166+
return _deserializeOther(p, ctxt, p.currentToken());
167167
}
168168

169169
protected final Object _deserializeOther(JsonParser p, DeserializationContext ctxt,
@@ -398,7 +398,7 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
398398
TokenBuffer unknown = null;
399399
final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
400400

401-
JsonToken t = p.getCurrentToken();
401+
JsonToken t = p.currentToken();
402402
List<BeanReferring> referrings = null;
403403
for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) {
404404
String propName = p.getCurrentName();
@@ -721,7 +721,7 @@ protected Object deserializeWithUnwrapped(JsonParser p, DeserializationContext c
721721
Object bean)
722722
throws IOException
723723
{
724-
JsonToken t = p.getCurrentToken();
724+
JsonToken t = p.currentToken();
725725
if (t == JsonToken.START_OBJECT) {
726726
t = p.nextToken();
727727
}
@@ -788,7 +788,7 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p, Deseri
788788
TokenBuffer tokens = new TokenBuffer(p, ctxt);
789789
tokens.writeStartObject();
790790

791-
JsonToken t = p.getCurrentToken();
791+
JsonToken t = p.currentToken();
792792
for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) {
793793
String propName = p.getCurrentName();
794794
p.nextToken(); // to point to value
@@ -914,7 +914,7 @@ protected Object deserializeWithExternalTypeId(JsonParser p, DeserializationCont
914914
final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
915915
final ExternalTypeHandler ext = _externalTypeIdHandler.start();
916916

917-
for (JsonToken t = p.getCurrentToken(); t == JsonToken.FIELD_NAME; t = p.nextToken()) {
917+
for (JsonToken t = p.currentToken(); t == JsonToken.FIELD_NAME; t = p.nextToken()) {
918918
String propName = p.getCurrentName();
919919
t = p.nextToken();
920920
SettableBeanProperty prop = _beanProperties.find(propName);
@@ -970,7 +970,7 @@ protected Object deserializeUsingPropertyBasedWithExternalTypeId(JsonParser p, D
970970
TokenBuffer tokens = new TokenBuffer(p, ctxt);
971971
tokens.writeStartObject();
972972

973-
JsonToken t = p.getCurrentToken();
973+
JsonToken t = p.currentToken();
974974
for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) {
975975
String propName = p.getCurrentName();
976976
p.nextToken(); // to point to value

‎src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1189,7 +1189,7 @@ public Object deserializeWithType(JsonParser p, DeserializationContext ctxt,
11891189
}
11901190
}
11911191
// or, Object Ids Jackson explicitly sets
1192-
JsonToken t = p.getCurrentToken();
1192+
JsonToken t = p.currentToken();
11931193
if (t != null) {
11941194
// Most commonly, a scalar (int id, uuid String, ...)
11951195
if (t.isScalarValue()) {
@@ -1457,7 +1457,7 @@ public Object deserializeFromBoolean(JsonParser p, DeserializationContext ctxt)
14571457
return bean;
14581458
}
14591459
}
1460-
boolean value = (p.getCurrentToken() == JsonToken.VALUE_TRUE);
1460+
boolean value = (p.currentToken() == JsonToken.VALUE_TRUE);
14611461
return _valueInstantiator.createFromBoolean(ctxt, value);
14621462
}
14631463

‎src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt)
200200
return finishBuild(ctxt, deserializeFromObject(p, ctxt));
201201
}
202202
// and then others, generally requiring use of @JsonCreator
203-
switch (p.getCurrentTokenId()) {
203+
switch (p.currentTokenId()) {
204204
case JsonTokenId.ID_STRING:
205205
return finishBuild(ctxt, deserializeFromString(p, ctxt));
206206
case JsonTokenId.ID_NUMBER_INT:
@@ -264,7 +264,7 @@ private final Object vanillaDeserialize(JsonParser p,
264264
throws IOException
265265
{
266266
Object bean = _valueInstantiator.createUsingDefault(ctxt);
267-
for (; p.getCurrentToken() == JsonToken.FIELD_NAME; p.nextToken()) {
267+
for (; p.currentToken() == JsonToken.FIELD_NAME; p.nextToken()) {
268268
String propName = p.getCurrentName();
269269
// Skip field name:
270270
p.nextToken();
@@ -309,7 +309,7 @@ public Object deserializeFromObject(JsonParser p, DeserializationContext ctxt)
309309
return deserializeWithView(p, ctxt, bean, view);
310310
}
311311
}
312-
for (; p.getCurrentToken() == JsonToken.FIELD_NAME; p.nextToken()) {
312+
for (; p.currentToken() == JsonToken.FIELD_NAME; p.nextToken()) {
313313
String propName = p.getCurrentName();
314314
// Skip field name:
315315
p.nextToken();
@@ -350,7 +350,7 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p,
350350
// 04-Jan-2010, tatu: May need to collect unknown properties for polymorphic cases
351351
TokenBuffer unknown = null;
352352

353-
JsonToken t = p.getCurrentToken();
353+
JsonToken t = p.currentToken();
354354
for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) {
355355
String propName = p.getCurrentName();
356356
p.nextToken(); // to point to value
@@ -454,7 +454,7 @@ protected final Object _deserialize(JsonParser p,
454454
return deserializeWithView(p, ctxt, builder, view);
455455
}
456456
}
457-
JsonToken t = p.getCurrentToken();
457+
JsonToken t = p.currentToken();
458458
// 23-Mar-2010, tatu: In some cases, we start with full JSON object too...
459459
if (t == JsonToken.START_OBJECT) {
460460
t = p.nextToken();
@@ -523,7 +523,7 @@ protected final Object deserializeWithView(JsonParser p, DeserializationContext
523523
Object bean, Class<?> activeView)
524524
throws IOException
525525
{
526-
JsonToken t = p.getCurrentToken();
526+
JsonToken t = p.currentToken();
527527
for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) {
528528
String propName = p.getCurrentName();
529529
// Skip field name:
@@ -575,7 +575,7 @@ protected Object deserializeWithUnwrapped(JsonParser p, DeserializationContext c
575575
}
576576

577577
final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
578-
for (; p.getCurrentToken() == JsonToken.FIELD_NAME; p.nextToken()) {
578+
for (; p.currentToken() == JsonToken.FIELD_NAME; p.nextToken()) {
579579
String propName = p.getCurrentName();
580580
p.nextToken();
581581
SettableBeanProperty prop = _beanProperties.find(propName);
@@ -625,7 +625,7 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p,
625625
tokens.writeStartObject();
626626
Object builder = null;
627627

628-
JsonToken t = p.getCurrentToken();
628+
JsonToken t = p.currentToken();
629629
for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) {
630630
String propName = p.getCurrentName();
631631
p.nextToken(); // to point to value
@@ -687,7 +687,7 @@ protected Object deserializeWithUnwrapped(JsonParser p,
687687
throws IOException
688688
{
689689
final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
690-
for (JsonToken t = p.getCurrentToken(); t == JsonToken.FIELD_NAME; t = p.nextToken()) {
690+
for (JsonToken t = p.currentToken(); t == JsonToken.FIELD_NAME; t = p.nextToken()) {
691691
String propName = p.getCurrentName();
692692
SettableBeanProperty prop = _beanProperties.find(propName);
693693
p.nextToken();
@@ -742,7 +742,7 @@ protected Object deserializeWithExternalTypeId(JsonParser p,
742742
final Class<?> activeView = _needViewProcesing ? ctxt.getActiveView() : null;
743743
final ExternalTypeHandler ext = _externalTypeIdHandler.start();
744744

745-
for (JsonToken t = p.getCurrentToken(); t == JsonToken.FIELD_NAME; t = p.nextToken()) {
745+
for (JsonToken t = p.currentToken(); t == JsonToken.FIELD_NAME; t = p.nextToken()) {
746746
String propName = p.getCurrentName();
747747
t = p.nextToken();
748748
SettableBeanProperty prop = _beanProperties.find(propName);

‎src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayBuilderDeserializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ protected Object _deserializeFromNonArray(JsonParser p, DeserializationContext c
350350
// Let's start with failure
351351
String message = "Cannot deserialize a POJO (of type %s) from non-Array representation (token: %s): "
352352
+ "type/property designed to be serialized as JSON Array";
353-
return ctxt.handleUnexpectedToken(getValueType(ctxt), p.getCurrentToken(), p, message, _beanType.getRawClass().getName(), p.getCurrentToken());
353+
return ctxt.handleUnexpectedToken(getValueType(ctxt), p.currentToken(), p, message, _beanType.getRawClass().getName(), p.currentToken());
354354
// in future, may allow use of "standard" POJO serialization as well; if so, do:
355355
//return _delegate.deserialize(p, ctxt);
356356
}

‎src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayDeserializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ protected Object _deserializeFromNonArray(JsonParser p, DeserializationContext c
370370
{
371371
String message = "Cannot deserialize a POJO (of type %s) from non-Array representation (token: %s): "
372372
+"type/property designed to be serialized as JSON Array";
373-
return ctxt.handleUnexpectedToken(getValueType(ctxt), p.getCurrentToken(), p, message, _beanType.getRawClass().getName(), p.getCurrentToken());
373+
return ctxt.handleUnexpectedToken(getValueType(ctxt), p.currentToken(), p, message, _beanType.getRawClass().getName(), p.currentToken());
374374
// in future, may allow use of "standard" POJO serialization as well; if so, do:
375375
//return _delegate.deserialize(p, ctxt);
376376
}

‎src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ public Map<Object,Object> deserialize(JsonParser p, DeserializationContext ctxt)
350350
"no default constructor found");
351351
}
352352
// Ok: must point to START_OBJECT, FIELD_NAME or END_OBJECT
353-
JsonToken t = p.getCurrentToken();
353+
JsonToken t = p.currentToken();
354354
if (t != JsonToken.START_OBJECT && t != JsonToken.FIELD_NAME && t != JsonToken.END_OBJECT) {
355355
// (empty) String may be ok however; or single-String-arg ctor
356356
if (t == JsonToken.VALUE_STRING) {
@@ -378,7 +378,7 @@ public Map<Object,Object> deserialize(JsonParser p, DeserializationContext ctxt,
378378
p.setCurrentValue(result);
379379

380380
// Ok: must point to START_OBJECT or FIELD_NAME
381-
JsonToken t = p.getCurrentToken();
381+
JsonToken t = p.currentToken();
382382
if (t != JsonToken.START_OBJECT && t != JsonToken.FIELD_NAME) {
383383
return (Map<Object,Object>) ctxt.handleUnexpectedToken(getMapClass(), p);
384384
}
@@ -435,7 +435,7 @@ protected final void _readAndBind(JsonParser p, DeserializationContext ctxt,
435435
if (p.isExpectedStartObjectToken()) {
436436
keyStr = p.nextFieldName();
437437
} else {
438-
JsonToken t = p.getCurrentToken();
438+
JsonToken t = p.currentToken();
439439
if (t != JsonToken.FIELD_NAME) {
440440
if (t == JsonToken.END_OBJECT) {
441441
return;
@@ -499,7 +499,7 @@ protected final void _readAndBindStringKeyMap(JsonParser p, DeserializationConte
499499
if (p.isExpectedStartObjectToken()) {
500500
key = p.nextFieldName();
501501
} else {
502-
JsonToken t = p.getCurrentToken();
502+
JsonToken t = p.currentToken();
503503
if (t == JsonToken.END_OBJECT) {
504504
return;
505505
}
@@ -638,7 +638,7 @@ protected final void _readAndUpdate(JsonParser p, DeserializationContext ctxt,
638638
if (p.isExpectedStartObjectToken()) {
639639
keyStr = p.nextFieldName();
640640
} else {
641-
JsonToken t = p.getCurrentToken();
641+
JsonToken t = p.currentToken();
642642
if (t == JsonToken.END_OBJECT) {
643643
return;
644644
}
@@ -707,7 +707,7 @@ protected final void _readAndUpdateStringKeyMap(JsonParser p, DeserializationCon
707707
if (p.isExpectedStartObjectToken()) {
708708
key = p.nextFieldName();
709709
} else {
710-
JsonToken t = p.getCurrentToken();
710+
JsonToken t = p.currentToken();
711711
if (t == JsonToken.END_OBJECT) {
712712
return;
713713
}

0 commit comments

Comments
 (0)