Skip to content

Commit 1e0aa7c

Browse files
cowtowncodercowtowncoder
committed
Sync with changes from [core#1378] (JsonParser.getText() -> getString())
1 parent 10c2109 commit 1e0aa7c

File tree

53 files changed

+147
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+147
-147
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1550,7 +1550,7 @@ public Object handleUnexpectedToken(JavaType targetType, JsonToken t,
15501550
}
15511551
// 18-Jun-2020, tatu: to resolve [databind#2770], force access to `getText()` for scalars
15521552
if ((t != null) && t.isScalarValue()) {
1553-
p.getText();
1553+
p.getString();
15541554
}
15551555
reportInputMismatch(targetType, msg);
15561556
return null; // never gets here

‎src/main/java/tools/jackson/databind/deser/AbstractDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ protected Object _deserializeIfNatural(JsonParser p, DeserializationContext ctxt
273273
switch (p.currentTokenId()) {
274274
case JsonTokenId.ID_STRING:
275275
if (_acceptString) {
276-
return p.getText();
276+
return p.getString();
277277
}
278278
break;
279279
case JsonTokenId.ID_NUMBER_INT:

‎src/main/java/tools/jackson/databind/deser/impl/ExternalTypeHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public boolean handleTypePropertyValue(JsonParser p, DeserializationContext ctxt
8585
if (ob == null) {
8686
return false;
8787
}
88-
final String typeId = p.getText();
88+
final String typeId = p.getString();
8989
// 28-Nov-2016, tatu: For [databind#291], need separate handling
9090
if (ob instanceof List<?>) {
9191
boolean result = false;
@@ -147,7 +147,7 @@ public boolean handlePropertyValue(JsonParser p, DeserializationContext ctxt,
147147
// For now, let's assume it's same type (either type id OR value)
148148
// for all mappings, so we'll only check first one
149149
if (prop.hasTypePropertyName(propName)) {
150-
String typeId = p.getText();
150+
String typeId = p.getString();
151151
p.skipChildren();
152152
_typeIds[index] = typeId;
153153
while (it.hasNext()) {

‎src/main/java/tools/jackson/databind/deser/jackson/BaseNodeDeserializer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ protected final JsonNode updateObject(JsonParser p, DeserializationContext ctxt,
262262
stack, nodeFactory.arrayNode());
263263
break;
264264
case JsonTokenId.ID_STRING:
265-
value = nodeFactory.textNode(p.getText());
265+
value = nodeFactory.textNode(p.getString());
266266
break;
267267
case JsonTokenId.ID_NUMBER_INT:
268268
value = _fromInt(p, ctxt, nodeFactory);
@@ -345,7 +345,7 @@ protected final ContainerNode<?> _deserializeContainerNoRecursion(JsonParser p,
345345
}
346346
continue outer_loop;
347347
case JsonTokenId.ID_STRING:
348-
value = nodeFactory.textNode(p.getText());
348+
value = nodeFactory.textNode(p.getString());
349349
break;
350350
case JsonTokenId.ID_NUMBER_INT:
351351
value = _fromInt(p, intCoercionFeats, nodeFactory);
@@ -400,7 +400,7 @@ protected final ContainerNode<?> _deserializeContainerNoRecursion(JsonParser p,
400400
case JsonTokenId.ID_END_ARRAY:
401401
break arrayLoop;
402402
case JsonTokenId.ID_STRING:
403-
currArray.add(nodeFactory.textNode(p.getText()));
403+
currArray.add(nodeFactory.textNode(p.getString()));
404404
continue arrayLoop;
405405
case JsonTokenId.ID_NUMBER_INT:
406406
currArray.add(_fromInt(p, intCoercionFeats, nodeFactory));
@@ -440,7 +440,7 @@ protected final JsonNode _deserializeAnyScalar(JsonParser p, DeserializationCont
440440
case JsonTokenId.ID_END_OBJECT:
441441
return nodeF.objectNode();
442442
case JsonTokenId.ID_STRING:
443-
return nodeF.textNode(p.getText());
443+
return nodeF.textNode(p.getString());
444444
case JsonTokenId.ID_NUMBER_INT:
445445
return _fromInt(p, ctxt, nodeF);
446446
case JsonTokenId.ID_NUMBER_FLOAT:

‎src/main/java/tools/jackson/databind/deser/jdk/CollectionDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ public Collection<Object> deserialize(JsonParser p, DeserializationContext ctxt)
241241
// there is also possibility of "auto-wrapping" of single-element arrays.
242242
// Hence we only accept empty String here.
243243
if (p.hasToken(JsonToken.VALUE_STRING)) {
244-
return _deserializeFromString(p, ctxt, p.getText());
244+
return _deserializeFromString(p, ctxt, p.getString());
245245
}
246246
return handleNonArray(p, ctxt, createDefaultInstance(ctxt));
247247
}

‎src/main/java/tools/jackson/databind/deser/jdk/DateBasedDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ protected java.util.Date _parseDate(JsonParser p, DeserializationContext ctxt)
134134
{
135135
if (_customFormat != null) {
136136
if (p.hasToken(JsonToken.VALUE_STRING)) {
137-
String str = p.getText().trim();
137+
String str = p.getString().trim();
138138
if (str.isEmpty()) {
139139
final CoercionAction act = _checkFromStringCoercion(ctxt, str);
140140
switch (act) { // note: Fail handled above

‎src/main/java/tools/jackson/databind/deser/jdk/EnumDeserializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt)
181181
// 04-Sep-2020, tatu: for 2.11.3 / 2.12.0, removed "FIELD_NAME" as allowed;
182182
// did not work and gave odd error message.
183183
if (p.hasToken(JsonToken.VALUE_STRING)) {
184-
return _fromString(p, ctxt, p.getText());
184+
return _fromString(p, ctxt, p.getString());
185185
}
186186

187187
// But let's consider int acceptable as well (if within ordinal range)
@@ -191,7 +191,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt)
191191
if (_isFromIntValue) {
192192
// ... whether to rely on "getText()" returning String, or get number, convert?
193193
// For now assume all format backends can produce String:
194-
return _fromString(p, ctxt, p.getText());
194+
return _fromString(p, ctxt, p.getString());
195195
}
196196
return _fromInteger(p, ctxt, p.getIntValue());
197197
}

‎src/main/java/tools/jackson/databind/deser/jdk/NumberDeserializers.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ protected Byte _parseByte(JsonParser p, DeserializationContext ctxt)
268268

269269
switch (p.currentTokenId()) {
270270
case JsonTokenId.ID_STRING: // let's do implicit re-parse
271-
text = p.getText();
271+
text = p.getString();
272272
break;
273273
case JsonTokenId.ID_NUMBER_FLOAT:
274274
final CoercionAction act = _checkFloatToIntCoercion(p, ctxt, _valueClass);
@@ -354,7 +354,7 @@ protected Short _parseShort(JsonParser p, DeserializationContext ctxt)
354354
String text;
355355
switch (p.currentTokenId()) {
356356
case JsonTokenId.ID_STRING: // let's do implicit re-parse
357-
text = p.getText();
357+
text = p.getString();
358358
break;
359359
case JsonTokenId.ID_NUMBER_FLOAT:
360360
final CoercionAction act = _checkFloatToIntCoercion(p, ctxt, _valueClass);
@@ -431,14 +431,14 @@ public Character deserialize(JsonParser p, DeserializationContext ctxt)
431431
// 23-Jun-2020, tatu: Unlike real numeric types, Character/char does not
432432
// have canonical shape in JSON, and String in particular does not need
433433
// coercion -- as long as it has length of 1.
434-
text = p.getText();
434+
text = p.getString();
435435
break;
436436
case JsonTokenId.ID_NUMBER_INT: // ok iff Unicode value
437437
CoercionAction act = ctxt.findCoercionAction(logicalType(), _valueClass, CoercionInputShape.Integer);
438438
switch (act) {
439439
case Fail:
440440
_checkCoercionFail(ctxt, act, _valueClass, p.getNumberValue(),
441-
"Integer value ("+p.getText()+")");
441+
"Integer value ("+p.getString()+")");
442442
// fall-through in unlikely case of returning
443443
case AsNull:
444444
return getNullValue(ctxt);
@@ -582,7 +582,7 @@ protected final Float _parseFloat(JsonParser p, DeserializationContext ctxt)
582582
String text;
583583
switch (p.currentTokenId()) {
584584
case JsonTokenId.ID_STRING:
585-
text = p.getText();
585+
text = p.getString();
586586
break;
587587
case JsonTokenId.ID_NULL: // null fine for non-primitive
588588
return (Float) getNullValue(ctxt);
@@ -681,7 +681,7 @@ protected final Double _parseDouble(JsonParser p, DeserializationContext ctxt) t
681681
String text;
682682
switch (p.currentTokenId()) {
683683
case JsonTokenId.ID_STRING:
684-
text = p.getText();
684+
text = p.getString();
685685
break;
686686
case JsonTokenId.ID_NULL: // null fine for non-primitive
687687
return (Double) getNullValue(ctxt);
@@ -772,7 +772,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws Jack
772772
String text;
773773
switch (p.currentTokenId()) {
774774
case JsonTokenId.ID_STRING:
775-
text = p.getText();
775+
text = p.getString();
776776
break;
777777
case JsonTokenId.ID_NUMBER_INT:
778778
if (ctxt.hasSomeOfFeatures(F_MASK_INT_COERCIONS)) {
@@ -909,7 +909,7 @@ public BigInteger deserialize(JsonParser p, DeserializationContext ctxt) throws
909909
String text;
910910
switch (p.currentTokenId()) {
911911
case JsonTokenId.ID_STRING: // let's do implicit re-parse
912-
text = p.getText();
912+
text = p.getString();
913913
break;
914914
case JsonTokenId.ID_NUMBER_FLOAT:
915915
final CoercionAction act = _checkFloatToIntCoercion(p, ctxt, _valueClass);
@@ -992,7 +992,7 @@ public BigDecimal deserialize(JsonParser p, DeserializationContext ctxt)
992992
case JsonTokenId.ID_NUMBER_FLOAT:
993993
return p.getDecimalValue();
994994
case JsonTokenId.ID_STRING:
995-
text = p.getText();
995+
text = p.getString();
996996
break;
997997
// 29-Jun-2020, tatu: New! "Scalar from Object" (mostly for XML)
998998
case JsonTokenId.ID_START_OBJECT:

‎src/main/java/tools/jackson/databind/deser/jdk/ObjectArrayDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ protected Object handleNonArray(JsonParser p, DeserializationContext ctxt)
349349
value = _nullProvider.getNullValue(ctxt);
350350
} else {
351351
if (p.hasToken(JsonToken.VALUE_STRING)) {
352-
String textValue = p.getText();
352+
String textValue = p.getString();
353353
// https://github.com/FasterXML/jackson-dataformat-xml/issues/513
354354
if (textValue.isEmpty()) {
355355
final CoercionAction act = ctxt.findCoercionAction(logicalType(), handledType(),

‎src/main/java/tools/jackson/databind/deser/jdk/PrimitiveArrayDeserializers.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,9 @@ public char[] deserialize(JsonParser p, DeserializationContext ctxt) throws Jack
261261
JsonToken t = p.currentToken();
262262
if (t == JsonToken.VALUE_STRING) {
263263
// note: can NOT return shared internal buffer, must copy:
264-
char[] buffer = p.getTextCharacters();
265-
int offset = p.getTextOffset();
266-
int len = p.getTextLength();
264+
char[] buffer = p.getStringCharacters();
265+
int offset = p.getStringOffset();
266+
int len = p.getStringLength();
267267

268268
return Arrays.copyOfRange(buffer, offset, offset + len);
269269
}
@@ -273,7 +273,7 @@ public char[] deserialize(JsonParser p, DeserializationContext ctxt) throws Jack
273273
while ((t = p.nextToken()) != JsonToken.END_ARRAY) {
274274
String str;
275275
if (t == JsonToken.VALUE_STRING) {
276-
str = p.getText();
276+
str = p.getString();
277277
} else if (t == JsonToken.VALUE_NULL) {
278278
if (_nuller != null) {
279279
_nuller.getNullValue(ctxt);
@@ -460,7 +460,7 @@ public byte[] deserialize(JsonParser p, DeserializationContext ctxt) throws Jack
460460
String msg = e.getOriginalMessage();
461461
if (msg.contains("base64")) {
462462
return (byte[]) ctxt.handleWeirdStringValue(byte[].class,
463-
p.getText(), msg);
463+
p.getString(), msg);
464464
}
465465
}
466466
}

‎src/main/java/tools/jackson/databind/deser/jdk/StringArrayDeserializer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public String[] deserialize(JsonParser p, DeserializationContext ctxt) throws Ja
142142

143143
try {
144144
while (true) {
145-
String value = p.nextTextValue();
145+
String value = p.nextStringValue();
146146
if (value == null) {
147147
JsonToken t = p.currentToken();
148148
if (t == JsonToken.END_ARRAY) {
@@ -199,7 +199,7 @@ protected final String[] _deserializeCustom(JsonParser p, DeserializationContext
199199
* assume that's what we use due to custom deserializer
200200
*/
201201
String value;
202-
if (p.nextTextValue() == null) {
202+
if (p.nextStringValue() == null) {
203203
JsonToken t = p.currentToken();
204204
if (t == JsonToken.END_ARRAY) {
205205
break;
@@ -261,7 +261,7 @@ public String[] deserialize(JsonParser p, DeserializationContext ctxt,
261261

262262
try {
263263
while (true) {
264-
String value = p.nextTextValue();
264+
String value = p.nextStringValue();
265265
if (value == null) {
266266
JsonToken t = p.currentToken();
267267
if (t == JsonToken.END_ARRAY) {
@@ -303,7 +303,7 @@ private final String[] handleNonArray(JsonParser p, DeserializationContext ctxt)
303303
value = (String) _nullProvider.getNullValue(ctxt);
304304
} else {
305305
if (p.hasToken(JsonToken.VALUE_STRING)) {
306-
String textValue = p.getText();
306+
String textValue = p.getString();
307307
// https://github.com/FasterXML/jackson-dataformat-xml/issues/513
308308
if (textValue.isEmpty()) {
309309
final CoercionAction act = ctxt.findCoercionAction(logicalType(), handledType(),

‎src/main/java/tools/jackson/databind/deser/jdk/StringCollectionDeserializer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public Collection<String> deserialize(JsonParser p, DeserializationContext ctxt,
195195
try {
196196
while (true) {
197197
// First the common case:
198-
String value = p.nextTextValue();
198+
String value = p.nextStringValue();
199199
if (value != null) {
200200
result.add(value);
201201
continue;
@@ -231,7 +231,7 @@ private Collection<String> deserializeUsingCustom(JsonParser p, DeserializationC
231231
* assume that's what we use due to custom deserializer
232232
*/
233233
String value;
234-
if (p.nextTextValue() == null) {
234+
if (p.nextStringValue() == null) {
235235
JsonToken t = p.currentToken();
236236
if (t == JsonToken.END_ARRAY) {
237237
break;
@@ -295,7 +295,7 @@ private final Collection<String> handleNonArray(JsonParser p, DeserializationCon
295295
value = (String) _nullProvider.getNullValue(ctxt);
296296
} else {
297297
if (p.hasToken(JsonToken.VALUE_STRING)) {
298-
String textValue = p.getText();
298+
String textValue = p.getString();
299299
// https://github.com/FasterXML/jackson-dataformat-xml/issues/513
300300
if (textValue.isEmpty()) {
301301
final CoercionAction act = ctxt.findCoercionAction(logicalType(), handledType(),

‎src/main/java/tools/jackson/databind/deser/jdk/StringDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public String deserialize(JsonParser p, DeserializationContext ctxt) throws Jack
3838
{
3939
// The critical path: ensure we handle the common case first.
4040
if (p.hasToken(JsonToken.VALUE_STRING)) {
41-
return p.getText();
41+
return p.getString();
4242
}
4343
// [databind#381]
4444
if (p.hasToken(JsonToken.START_ARRAY)) {

‎src/main/java/tools/jackson/databind/deser/jdk/UntypedObjectDeserializer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws Jack
278278
if (_stringDeserializer != null) {
279279
return _stringDeserializer.deserialize(p, ctxt);
280280
}
281-
return p.getText();
281+
return p.getString();
282282

283283
case JsonTokenId.ID_NUMBER_INT:
284284
if (_numberDeserializer != null) {
@@ -331,7 +331,7 @@ public Object deserializeWithType(JsonParser p, DeserializationContext ctxt,
331331
if (_stringDeserializer != null) {
332332
return _stringDeserializer.deserialize(p, ctxt);
333333
}
334-
return p.getText();
334+
return p.getString();
335335

336336
case JsonTokenId.ID_NUMBER_INT:
337337
if (_numberDeserializer != null) {
@@ -400,7 +400,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt, Object into
400400
if (_stringDeserializer != null) {
401401
return _stringDeserializer.deserialize(p, ctxt, intoValue);
402402
}
403-
return p.getText();
403+
return p.getString();
404404

405405
case JsonTokenId.ID_NUMBER_INT:
406406
if (_numberDeserializer != null) {

‎src/main/java/tools/jackson/databind/deser/jdk/UntypedObjectDeserializerNR.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws Jack
6565
return _deserializeNR(p, ctxt, Scope.rootArrayScope());
6666

6767
case JsonTokenId.ID_STRING:
68-
return p.getText();
68+
return p.getString();
6969
case JsonTokenId.ID_NUMBER_INT:
7070
if (ctxt.hasSomeOfFeatures(F_MASK_INT_COERCIONS)) {
7171
return _coerceIntegral(p, ctxt);
@@ -226,7 +226,7 @@ private Object _deserializeNR(JsonParser p, DeserializationContext ctxt,
226226
// but for arrays need to go to main loop
227227
continue outer_loop;
228228
case JsonTokenId.ID_STRING:
229-
value = p.getText();
229+
value = p.getString();
230230
break;
231231
case JsonTokenId.ID_NUMBER_INT:
232232
value = intCoercions ? _coerceIntegral(p, ctxt) : p.getNumberValue();
@@ -279,7 +279,7 @@ private Object _deserializeNR(JsonParser p, DeserializationContext ctxt,
279279
currScope = currScope.finishBranchArray(useJavaArray);
280280
break arrayLoop;
281281
case JsonTokenId.ID_STRING:
282-
value = p.getText();
282+
value = p.getString();
283283
break;
284284
case JsonTokenId.ID_NUMBER_INT:
285285
value = intCoercions ? _coerceIntegral(p, ctxt) : p.getNumberValue();
@@ -314,7 +314,7 @@ private Object _deserializeAnyScalar(JsonParser p, DeserializationContext ctxt,
314314
{
315315
switch (tokenType) {
316316
case JsonTokenId.ID_STRING:
317-
return p.getText();
317+
return p.getString();
318318
case JsonTokenId.ID_NUMBER_INT:
319319
if (ctxt.isEnabled(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS)) {
320320
return p.getBigIntegerValue();

0 commit comments

Comments
 (0)