Skip to content

Commit bfa51c3

Browse files
cowtowncodercowtowncoder
committed
Changed wrt [core#1378]
1 parent 1c63c80 commit bfa51c3

File tree

21 files changed

+70
-70
lines changed

21 files changed

+70
-70
lines changed

‎afterburner/src/main/java/tools/jackson/module/afterburner/deser/SettableStringFieldProperty.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void deserializeAndSet(JsonParser p, DeserializationContext ctxt, Object
4040
delegate.deserializeAndSet(p, ctxt, bean);
4141
return;
4242
}
43-
final String text = p.getText();
43+
final String text = p.getString();
4444
try {
4545
_propertyMutator.stringField(ctxt, bean, _optimizedIndex, text);
4646
} catch (Throwable e) {
@@ -53,7 +53,7 @@ public Object deserializeSetAndReturn(JsonParser p, DeserializationContext ctxt,
5353
throws JacksonException
5454
{
5555
if (p.hasToken(JsonToken.VALUE_STRING)) {
56-
return setAndReturn(ctxt, instance, p.getText());
56+
return setAndReturn(ctxt, instance, p.getString());
5757
}
5858
return delegate.deserializeSetAndReturn(p, ctxt, instance);
5959
}

‎afterburner/src/main/java/tools/jackson/module/afterburner/deser/SettableStringMethodProperty.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void deserializeAndSet(JsonParser p, DeserializationContext ctxt, Object
4040
delegate.deserializeAndSet(p, ctxt, bean);
4141
return;
4242
}
43-
final String text = p.getText();
43+
final String text = p.getString();
4444
try {
4545
_propertyMutator.stringSetter(ctxt, bean, _optimizedIndex, text);
4646
} catch (Throwable e) {
@@ -53,7 +53,7 @@ public Object deserializeSetAndReturn(JsonParser p, DeserializationContext ctxt,
5353
throws JacksonException
5454
{
5555
if (p.hasToken(JsonToken.VALUE_STRING)) {
56-
return setAndReturn(ctxt, instance, p.getText());
56+
return setAndReturn(ctxt, instance, p.getString());
5757
}
5858
return delegate.deserializeSetAndReturn(p, ctxt, instance);
5959
}

‎afterburner/src/test/java/perftest/MediaItem.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,10 @@ public static Photo deserialize(JsonParser jp) throws IOException
169169
if (I != null) {
170170
switch (I.intValue()) {
171171
case F_URI:
172-
photo.setUri(jp.getText());
172+
photo.setUri(jp.getString());
173173
continue;
174174
case F_TITLE:
175-
photo.setTitle(jp.getText());
175+
photo.setTitle(jp.getString());
176176
continue;
177177
case F_WIDTH:
178178
photo.setWidth(jp.getIntValue());
@@ -181,7 +181,7 @@ public static Photo deserialize(JsonParser jp) throws IOException
181181
photo.setHeight(jp.getIntValue());
182182
continue;
183183
case F_SIZE:
184-
photo.setSize(findSize(jp.getText()));
184+
photo.setSize(findSize(jp.getString()));
185185
continue;
186186
}
187187
}
@@ -307,12 +307,12 @@ public static Content deserialize(JsonParser jp) throws IOException
307307
if (I != null) {
308308
switch (I.intValue()) {
309309
case F_PLAYER:
310-
content.setPlayer(findPlayer(jp.getText()));
310+
content.setPlayer(findPlayer(jp.getString()));
311311
case F_URI:
312-
content.setUri(jp.getText());
312+
content.setUri(jp.getString());
313313
continue;
314314
case F_TITLE:
315-
content.setTitle(jp.getText());
315+
content.setTitle(jp.getString());
316316
continue;
317317
case F_WIDTH:
318318
content.setWidth(jp.getIntValue());
@@ -321,7 +321,7 @@ public static Content deserialize(JsonParser jp) throws IOException
321321
content.setHeight(jp.getIntValue());
322322
continue;
323323
case F_FORMAT:
324-
content.setCopyright(jp.getText());
324+
content.setCopyright(jp.getString());
325325
continue;
326326
case F_DURATION:
327327
content.setDuration(jp.getLongValue());
@@ -336,7 +336,7 @@ public static Content deserialize(JsonParser jp) throws IOException
336336
content.setPersons(deserializePersons(jp));
337337
continue;
338338
case F_COPYRIGHT:
339-
content.setCopyright(jp.getText());
339+
content.setCopyright(jp.getString());
340340
continue;
341341
}
342342
}
@@ -355,7 +355,7 @@ private static List<String> deserializePersons(JsonParser jp) throws IOException
355355
}
356356
ArrayList<String> persons = new ArrayList<String>(4);
357357
while (jp.nextToken() == JsonToken.VALUE_STRING) {
358-
persons.add(jp.getText());
358+
persons.add(jp.getString());
359359
}
360360
if (jp.currentToken() != JsonToken.END_ARRAY) {
361361
throw new IOException("Need END_ARRAY to complete List of Persons");

‎afterburner/src/test/java/tools/jackson/module/afterburner/AfterburnerTestBase.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,10 @@ protected void assertType(Object ob, Class<?> expType)
260260
protected String getAndVerifyText(JsonParser p) throws IOException
261261
{
262262
// Ok, let's verify other accessors
263-
int actLen = p.getTextLength();
264-
char[] ch = p.getTextCharacters();
265-
String str2 = new String(ch, p.getTextOffset(), actLen);
266-
String str = p.getText();
263+
int actLen = p.getStringLength();
264+
char[] ch = p.getStringCharacters();
265+
String str2 = new String(ch, p.getStringOffset(), actLen);
266+
String str = p.getString();
267267

268268
if (str.length() != actLen) {
269269
fail("Internal problem (jp.token == "+p.currentToken()+"): jp.getText().length() ['"+str+"'] == "+str.length()+"; jp.getTextLength() == "+actLen);
@@ -276,15 +276,15 @@ protected String getAndVerifyText(JsonParser p) throws IOException
276276
protected void verifyFieldName(JsonParser p, String expName)
277277
throws IOException
278278
{
279-
assertEquals(expName, p.getText());
279+
assertEquals(expName, p.getString());
280280
assertEquals(expName, p.currentName());
281281
}
282282

283283
protected void verifyIntValue(JsonParser jp, long expValue)
284284
throws IOException
285285
{
286286
// First, via textual
287-
assertEquals(String.valueOf(expValue), jp.getText());
287+
assertEquals(String.valueOf(expValue), jp.getString());
288288
}
289289

290290
protected void verifyException(Throwable e, String... matches)

‎afterburner/src/test/java/tools/jackson/module/afterburner/deser/TestCreators2.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static class BytesDeserializer extends ValueDeserializer<byte[]>
4747
@Override
4848
public byte[] deserialize(JsonParser p, DeserializationContext ctxt)
4949
{
50-
String str = p.getText();
50+
String str = p.getString();
5151
try {
5252
return str.getBytes("UTF-8");
5353
} catch (IOException e) {

‎afterburner/src/test/java/tools/jackson/module/afterburner/deser/TestStdDeserializerOverrides.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ static class MyStringDeserializer extends StdDeserializer<String>
2626

2727
@Override
2828
public String deserialize(JsonParser p, DeserializationContext ctxt) {
29-
return "Foo:"+p.getText();
29+
return "Foo:"+p.getString();
3030
}
3131
}
3232

@@ -41,7 +41,7 @@ static class DeAmpDeserializer extends StdDeserializer<String>
4141

4242
@Override
4343
public String deserialize(JsonParser p, DeserializationContext ctxt) {
44-
return p.getText().replaceAll("&amp;", "&");
44+
return p.getString().replaceAll("&amp;", "&");
4545
}
4646
}
4747

‎afterburner/src/test/java/tools/jackson/module/afterburner/deser/convert/CoerceJDKScalarsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ private void _verifyStringCoerceFail(JsonParser p,
238238
assertSame(p, e.processor());
239239

240240
assertToken(JsonToken.VALUE_STRING, p.currentToken());
241-
assertEquals(unquotedValue, p.getText());
241+
assertEquals(unquotedValue, p.getString());
242242
}
243243
}
244244
}

‎afterburner/src/test/java/tools/jackson/module/afterburner/deser/convert/CoerceToBooleanTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ private void _verifyStringCoerceFail(ObjectMapper nonCoercingMapper,
170170
assertSame(p, e.processor());
171171

172172
assertToken(JsonToken.VALUE_STRING, p.currentToken());
173-
assertEquals(unquotedValue, p.getText());
173+
assertEquals(unquotedValue, p.getString());
174174
}
175175
}
176176

@@ -401,7 +401,7 @@ private void _verifyBooleanCoerceFailReason(MismatchedInputException e,
401401

402402
assertToken(tokenType, p.currentToken());
403403

404-
final String text = p.getText();
404+
final String text = p.getString();
405405
if (!tokenValue.equals(text)) {
406406
String textDesc = (text == null) ? "NULL" : quote(text);
407407
fail("Token text ("+textDesc+") via parser of type "+p.getClass().getName()

‎afterburner/src/test/java/tools/jackson/module/afterburner/deser/merge/NodeMergeTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public void testObjectNodeUpdateValue() throws Exception
4444
MAPPER.readerForUpdating(base)
4545
.readValue(aposToQuotes("{'second':'bar', 'third':5, 'fourth':true}")));
4646
assertEquals(4, base.size());
47-
assertEquals("bar", base.path("second").asText());
48-
assertEquals("foo", base.path("first").asText());
47+
assertEquals("bar", base.path("second").asString());
48+
assertEquals("foo", base.path("first").asString());
4949
assertEquals(5, base.path("third").asInt());
5050
assertTrue(base.path("fourth").asBoolean());
5151
}
@@ -55,8 +55,8 @@ public void testObjectNodeMerge() throws Exception
5555
ObjectNodeWrapper w = MAPPER.readValue(aposToQuotes("{'props':{'stuff':'xyz'}}"),
5656
ObjectNodeWrapper.class);
5757
assertEquals(2, w.props.size());
58-
assertEquals("enabled", w.props.path("default").asText());
59-
assertEquals("xyz", w.props.path("stuff").asText());
58+
assertEquals("enabled", w.props.path("default").asString());
59+
assertEquals("xyz", w.props.path("stuff").asString());
6060
}
6161

6262
public void testObjectDeepUpdate() throws Exception
@@ -93,8 +93,8 @@ public void testArrayNodeUpdateValue() throws Exception
9393
MAPPER.readerForUpdating(base)
9494
.readValue(aposToQuotes("['second',false,null]")));
9595
assertEquals(4, base.size());
96-
assertEquals("first", base.path(0).asText());
97-
assertEquals("second", base.path(1).asText());
96+
assertEquals("first", base.path(0).asString());
97+
assertEquals("second", base.path(1).asString());
9898
assertFalse(base.path(2).asBoolean());
9999
assertTrue(base.path(3).isNull());
100100
}
@@ -113,6 +113,6 @@ public void testArrayNodeMerge() throws Exception
113113
n = w.list.get(4);
114114
assertTrue(n.isArray());
115115
assertEquals(0, n.size());
116-
assertEquals("foo", w.list.get(5).asText());
116+
assertEquals("foo", w.list.get(5).asString());
117117
}
118118
}

‎blackbird/src/main/java/tools/jackson/module/blackbird/deser/SettableStringProperty.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ public void deserializeAndSet(JsonParser p, DeserializationContext ctxt, Object
3838
delegate.deserializeAndSet(p, ctxt, bean);
3939
return;
4040
}
41-
set(ctxt, bean, p.getText());
41+
set(ctxt, bean, p.getString());
4242
}
4343

4444
@Override
4545
public Object deserializeSetAndReturn(JsonParser p, DeserializationContext ctxt, Object instance)
4646
throws JacksonException
4747
{
4848
if (p.hasToken(JsonToken.VALUE_STRING)) {
49-
return setAndReturn(ctxt, instance, p.getText());
49+
return setAndReturn(ctxt, instance, p.getString());
5050
}
5151
return delegate.deserializeSetAndReturn(p, ctxt, instance);
5252
}

‎blackbird/src/test/java/tools/jackson/module/blackbird/BlackbirdTestBase.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,10 @@ protected void assertType(Object ob, Class<?> expType)
259259
protected String getAndVerifyText(JsonParser p)
260260
{
261261
// Ok, let's verify other accessors
262-
int actLen = p.getTextLength();
263-
char[] ch = p.getTextCharacters();
264-
String str2 = new String(ch, p.getTextOffset(), actLen);
265-
String str = p.getText();
262+
int actLen = p.getStringLength();
263+
char[] ch = p.getStringCharacters();
264+
String str2 = new String(ch, p.getStringOffset(), actLen);
265+
String str = p.getString();
266266

267267
if (str.length() != actLen) {
268268
fail("Internal problem (p.token == "+p.currentToken()+"): p.getText().length() ['"+str+"'] == "+str.length()+"; p.getTextLength() == "+actLen);
@@ -274,15 +274,15 @@ protected String getAndVerifyText(JsonParser p)
274274

275275
protected void verifyFieldName(JsonParser p, String expName)
276276
{
277-
assertEquals(expName, p.getText());
277+
assertEquals(expName, p.getString());
278278
assertEquals(expName, p.currentName());
279279
}
280280

281281
protected void verifyIntValue(JsonParser p, long expValue)
282282
throws IOException
283283
{
284284
// First, via textual
285-
assertEquals(String.valueOf(expValue), p.getText());
285+
assertEquals(String.valueOf(expValue), p.getString());
286286
}
287287

288288
protected void verifyException(Throwable e, String... matches)

‎blackbird/src/test/java/tools/jackson/module/blackbird/deser/TestCreators2.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static class BytesDeserializer extends ValueDeserializer<byte[]>
4545
{
4646
@Override
4747
public byte[] deserialize(JsonParser jp, DeserializationContext ctxt) {
48-
String str = jp.getText();
48+
String str = jp.getString();
4949
try {
5050
return str.getBytes("UTF-8");
5151
} catch (IOException e) {

‎blackbird/src/test/java/tools/jackson/module/blackbird/deser/TestStdDeserializerOverrides.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static class MyStringDeserializer extends StdDeserializer<String>
2727

2828
@Override
2929
public String deserialize(JsonParser p, DeserializationContext ctxt) {
30-
return "Foo:"+p.getText();
30+
return "Foo:"+p.getString();
3131
}
3232
}
3333

@@ -42,7 +42,7 @@ static class DeAmpDeserializer extends StdDeserializer<String>
4242

4343
@Override
4444
public String deserialize(JsonParser p, DeserializationContext ctxt) {
45-
return p.getText().replaceAll("&amp;", "&");
45+
return p.getString().replaceAll("&amp;", "&");
4646
}
4747
}
4848

‎blackbird/src/test/java/tools/jackson/module/blackbird/deser/convert/CoerceJDKScalarsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ private void _verifyStringCoerceFail(JsonParser p,
238238
assertSame(p, e.processor());
239239

240240
assertToken(JsonToken.VALUE_STRING, p.currentToken());
241-
assertEquals(unquotedValue, p.getText());
241+
assertEquals(unquotedValue, p.getString());
242242
}
243243
}
244244
}

‎blackbird/src/test/java/tools/jackson/module/blackbird/deser/convert/CoerceToBooleanTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ private void _verifyStringCoerceFail(ObjectMapper nonCoercingMapper,
170170
assertSame(p, e.processor());
171171

172172
assertToken(JsonToken.VALUE_STRING, p.currentToken());
173-
assertEquals(unquotedValue, p.getText());
173+
assertEquals(unquotedValue, p.getString());
174174
}
175175
}
176176

@@ -401,7 +401,7 @@ private void _verifyBooleanCoerceFailReason(MismatchedInputException e,
401401

402402
assertToken(tokenType, p.currentToken());
403403

404-
final String text = p.getText();
404+
final String text = p.getString();
405405
if (!tokenValue.equals(text)) {
406406
String textDesc = (text == null) ? "NULL" : quote(text);
407407
fail("Token text ("+textDesc+") via parser of type "+p.getClass().getName()

‎blackbird/src/test/java/tools/jackson/module/blackbird/deser/merge/NodeMergeTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public void testObjectNodeUpdateValue() throws Exception
4545
MAPPER.readerForUpdating(base)
4646
.readValue(aposToQuotes("{'second':'bar', 'third':5, 'fourth':true}")));
4747
assertEquals(4, base.size());
48-
assertEquals("bar", base.path("second").asText());
49-
assertEquals("foo", base.path("first").asText());
48+
assertEquals("bar", base.path("second").asString());
49+
assertEquals("foo", base.path("first").asString());
5050
assertEquals(5, base.path("third").asInt());
5151
assertTrue(base.path("fourth").asBoolean());
5252
}
@@ -56,8 +56,8 @@ public void testObjectNodeMerge() throws Exception
5656
ObjectNodeWrapper w = MAPPER.readValue(aposToQuotes("{'props':{'stuff':'xyz'}}"),
5757
ObjectNodeWrapper.class);
5858
assertEquals(2, w.props.size());
59-
assertEquals("enabled", w.props.path("default").asText());
60-
assertEquals("xyz", w.props.path("stuff").asText());
59+
assertEquals("enabled", w.props.path("default").asString());
60+
assertEquals("xyz", w.props.path("stuff").asString());
6161
}
6262

6363
public void testObjectDeepUpdate() throws Exception
@@ -94,8 +94,8 @@ public void testArrayNodeUpdateValue() throws Exception
9494
MAPPER.readerForUpdating(base)
9595
.readValue(aposToQuotes("['second',false,null]")));
9696
assertEquals(4, base.size());
97-
assertEquals("first", base.path(0).asText());
98-
assertEquals("second", base.path(1).asText());
97+
assertEquals("first", base.path(0).asString());
98+
assertEquals("second", base.path(1).asString());
9999
assertFalse(base.path(2).asBoolean());
100100
assertTrue(base.path(3).isNull());
101101
}
@@ -114,6 +114,6 @@ public void testArrayNodeMerge() throws Exception
114114
n = w.list.get(4);
115115
assertTrue(n.isArray());
116116
assertEquals(0, n.size());
117-
assertEquals("foo", w.list.get(5).asText());
117+
assertEquals("foo", w.list.get(5).asString());
118118
}
119119
}

‎jakarta-xmlbind/src/test/java/tools/jackson/module/jakarta/xmlbind/introspect/JakartaXmlBindAnnotationIntrospectorTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -245,15 +245,15 @@ public void testSerializeDeserializeWithJaxbAnnotations() throws Exception
245245

246246
//make sure the json is written out correctly.
247247
JsonNode node = mapper.readValue(json, JsonNode.class);
248-
assertEquals(qname.toString(), node.get("qname").asText());
248+
assertEquals(qname.toString(), node.get("qname").asString());
249249
JsonNode attr = node.get("myattribute");
250250
assertNotNull(attr);
251-
assertEquals("attributeValue", attr.asText());
252-
assertEquals("elementValue", node.get("myelement").asText());
251+
assertEquals("attributeValue", attr.asString());
252+
assertEquals("elementValue", node.get("myelement").asString());
253253
assertTrue(node.has("mywrapped"));
254254
assertEquals(1, node.get("mywrapped").size());
255-
assertEquals("wrappedElementValue", node.get("mywrapped").get(0).asText());
256-
assertEquals("Value One", node.get("enumProperty").asText());
255+
assertEquals("wrappedElementValue", node.get("mywrapped").get(0).asString());
256+
assertEquals("Value One", node.get("enumProperty").asString());
257257
assertNull(node.get("propertyToIgnore"));
258258

259259
//now make sure it gets deserialized correctly.

0 commit comments

Comments
 (0)