Skip to content

Commit d68a8e8

Browse files
cowtowncodercowtowncoder
committed
Changes wrt [core#1378]
1 parent ad973d5 commit d68a8e8

File tree

6 files changed

+44
-44
lines changed

6 files changed

+44
-44
lines changed

‎src/main/java/tools/jackson/dataformat/xml/deser/FromXmlParser.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ public String nextName() throws JacksonException {
707707
* String collections.
708708
*/
709709
@Override
710-
public String nextTextValue() throws JacksonException
710+
public String nextStringValue() throws JacksonException
711711
{
712712
_binaryValue = null;
713713
if (_nextToken != null) {
@@ -840,7 +840,7 @@ private void _updateState(JsonToken t)
840840
*/
841841

842842
@Override
843-
public String getText() throws JacksonException
843+
public String getString() throws JacksonException
844844
{
845845
if (_currToken == null) {
846846
return null;
@@ -856,19 +856,19 @@ public String getText() throws JacksonException
856856
}
857857

858858
@Override
859-
public char[] getTextCharacters() throws JacksonException {
860-
String text = getText();
859+
public char[] getStringCharacters() throws JacksonException {
860+
String text = getString();
861861
return (text == null) ? null : text.toCharArray();
862862
}
863863

864864
@Override
865-
public int getTextLength() throws JacksonException {
866-
String text = getText();
865+
public int getStringLength() throws JacksonException {
866+
String text = getString();
867867
return (text == null) ? 0 : text.length();
868868
}
869869

870870
@Override
871-
public int getTextOffset() throws JacksonException {
871+
public int getStringOffset() throws JacksonException {
872872
return 0;
873873
}
874874

@@ -877,14 +877,14 @@ public int getTextOffset() throws JacksonException {
877877
* we must coalesce things it cannot really be exposed.
878878
*/
879879
@Override
880-
public boolean hasTextCharacters() {
880+
public boolean hasStringCharacters() {
881881
return false;
882882
}
883883

884884
@Override
885-
public int getText(Writer writer) throws JacksonException
885+
public int getString(Writer writer) throws JacksonException
886886
{
887-
String str = getText();
887+
String str = getString();
888888
if (str == null) {
889889
return 0;
890890
}
@@ -931,7 +931,7 @@ public byte[] getBinaryValue(Base64Variant b64variant) throws JacksonException
931931
protected byte[] _decodeBase64(Base64Variant b64variant) throws JacksonException
932932
{
933933
ByteArrayBuilder builder = _getByteArrayBuilder();
934-
final String str = getText();
934+
final String str = getString();
935935
_decodeBase64(str, builder, b64variant);
936936
return builder.toByteArray();
937937
}
@@ -1088,7 +1088,7 @@ protected void _convertNumberToInt() throws JacksonException
10881088
// Let's verify it's lossless conversion by simple roundtrip
10891089
int result = (int) _numberLong;
10901090
if (((long) result) != _numberLong) {
1091-
_reportError("Numeric value ("+getText()+") out of range of int");
1091+
_reportError("Numeric value ("+getString()+") out of range of int");
10921092
}
10931093
_numberInt = result;
10941094
} else if ((_numTypesValid & NR_BIGINT) != 0) {

‎src/main/java/tools/jackson/dataformat/xml/deser/XmlDeserializationContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public String extractScalarFromObject(JsonParser p, ValueDeserializer<?> deser,
6969
JsonToken t = p.nextToken();
7070
if (t == JsonToken.VALUE_STRING) {
7171
if (propName.equals("")) {
72-
text = p.getText();
72+
text = p.getString();
7373
}
7474
} else {
7575
p.skipChildren();

‎src/test/java/tools/jackson/dataformat/xml/XmlTestBase.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,10 @@ protected void assertToken(JsonToken expToken, JsonParser jp)
273273
protected String getAndVerifyText(JsonParser jp)
274274
{
275275
// Ok, let's verify other accessors
276-
int actLen = jp.getTextLength();
277-
char[] ch = jp.getTextCharacters();
278-
String str2 = new String(ch, jp.getTextOffset(), actLen);
279-
String str = jp.getText();
276+
int actLen = jp.getStringLength();
277+
char[] ch = jp.getStringCharacters();
278+
String str2 = new String(ch, jp.getStringOffset(), actLen);
279+
String str = jp.getString();
280280

281281
if (str.length() != actLen) {
282282
fail("Internal problem (jp.token == "+jp.currentToken()+"): jp.getText().length() ['"+str+"'] == "+str.length()+"; jp.getTextLength() == "+actLen);
@@ -288,7 +288,7 @@ protected String getAndVerifyText(JsonParser jp)
288288

289289
protected void verifyFieldName(JsonParser p, String expName)
290290
{
291-
assertEquals(expName, p.getText());
291+
assertEquals(expName, p.getString());
292292
assertEquals(expName, p.currentName());
293293
}
294294

‎src/test/java/tools/jackson/dataformat/xml/stream/XmlParser442Test.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ public void testMixedContentBeforeElement442() throws Exception
4040
assertEquals("", xp.currentName());
4141

4242
assertToken(JsonToken.VALUE_STRING, xp.nextToken());
43-
assertEquals("text", xp.getText().trim());
43+
assertEquals("text", xp.getString().trim());
4444

4545
assertToken(JsonToken.PROPERTY_NAME, xp.nextToken());
4646
assertEquals("leaf", xp.currentName());
4747
assertToken(JsonToken.VALUE_STRING, xp.nextToken());
48-
assertEquals("stuff", xp.getText().trim());
48+
assertEquals("stuff", xp.getString().trim());
4949

5050
assertToken(JsonToken.END_OBJECT, xp.nextToken());
5151
assertToken(JsonToken.END_OBJECT, xp.nextToken());

‎src/test/java/tools/jackson/dataformat/xml/stream/XmlParserNextXxxTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ public void testXmlAttributesWithNextTextValue() throws Exception
2424
assertToken(JsonToken.PROPERTY_NAME, xp.nextToken()); // <max>
2525
assertEquals("max", xp.currentName());
2626

27-
assertEquals("7", xp.nextTextValue());
27+
assertEquals("7", xp.nextStringValue());
2828

2929
assertToken(JsonToken.PROPERTY_NAME, xp.nextToken()); // <offset>
3030
assertEquals("offset", xp.currentName());
3131

32-
assertEquals("offset", xp.getText());
32+
assertEquals("offset", xp.getString());
3333

34-
assertEquals("9", xp.nextTextValue());
34+
assertEquals("9", xp.nextStringValue());
3535

36-
assertEquals("9", xp.getText());
36+
assertEquals("9", xp.getString());
3737

3838
assertToken(JsonToken.END_OBJECT, xp.nextToken()); // </data>
3939
xp.close();

‎src/test/java/tools/jackson/dataformat/xml/stream/XmlParserTest.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void testSimplest() throws Exception
3838
assertEquals("leaf", p.currentName());
3939
assertEquals(1, p.streamReadContext().getNestingDepth());
4040
assertToken(JsonToken.VALUE_STRING, p.nextToken());
41-
assertEquals("abc", p.getText());
41+
assertEquals("abc", p.getString());
4242
assertEquals(1, p.streamReadContext().getNestingDepth());
4343
assertToken(JsonToken.END_OBJECT, p.nextToken());
4444
assertEquals(0, p.streamReadContext().getNestingDepth());
@@ -71,7 +71,7 @@ public void testSimpleWithEmpty() throws Exception
7171
assertToken(JsonToken.PROPERTY_NAME, p.nextToken());
7272
assertEquals("leaf", p.currentName());
7373
assertToken(JsonToken.VALUE_STRING, p.nextToken());
74-
assertEquals("", p.getText());
74+
assertEquals("", p.getString());
7575
assertToken(JsonToken.END_OBJECT, p.nextToken());
7676
assertNull(p.nextToken());
7777
}
@@ -90,7 +90,7 @@ public void testRootScalar() throws Exception
9090
assertToken(JsonToken.PROPERTY_NAME, p.nextToken());
9191
assertEquals("", p.currentName());
9292
assertToken(JsonToken.VALUE_STRING, p.nextToken());
93-
assertEquals("value", p.getText());
93+
assertEquals("value", p.getString());
9494
assertToken(JsonToken.END_OBJECT, p.nextToken());
9595
assertNull(p.nextToken());
9696
// should be ok to call again tho
@@ -108,12 +108,12 @@ public void testRootMixed() throws Exception
108108
assertToken(JsonToken.PROPERTY_NAME, p.nextToken());
109109
assertEquals("", p.currentName());
110110
assertToken(JsonToken.VALUE_STRING, p.nextToken());
111-
assertEquals("value", p.getText());
111+
assertEquals("value", p.getString());
112112

113113
assertToken(JsonToken.PROPERTY_NAME, p.nextToken());
114114
assertEquals("child", p.currentName());
115115
assertToken(JsonToken.VALUE_STRING, p.nextToken());
116-
assertEquals("abc", p.getText());
116+
assertEquals("abc", p.getString());
117117

118118
assertToken(JsonToken.END_OBJECT, p.nextToken());
119119
assertNull(p.nextToken());
@@ -160,11 +160,11 @@ public void testRoundTripWithSample() throws Exception
160160
assertToken(JsonToken.PROPERTY_NAME, p.nextToken()); // 'Width'
161161
verifyFieldName(p, "Width");
162162
assertToken(JsonToken.VALUE_STRING, p.nextToken());
163-
assertEquals(String.valueOf(SAMPLE_SPEC_VALUE_WIDTH), p.getText());
163+
assertEquals(String.valueOf(SAMPLE_SPEC_VALUE_WIDTH), p.getString());
164164
assertToken(JsonToken.PROPERTY_NAME, p.nextToken()); // 'Height'
165165
verifyFieldName(p, "Height");
166166
assertToken(JsonToken.VALUE_STRING, p.nextToken());
167-
assertEquals(String.valueOf(SAMPLE_SPEC_VALUE_HEIGHT), p.getText());
167+
assertEquals(String.valueOf(SAMPLE_SPEC_VALUE_HEIGHT), p.getString());
168168
assertToken(JsonToken.PROPERTY_NAME, p.nextToken()); // 'Title'
169169
verifyFieldName(p, "Title");
170170
assertToken(JsonToken.VALUE_STRING, p.nextToken());
@@ -179,7 +179,7 @@ public void testRoundTripWithSample() throws Exception
179179
assertToken(JsonToken.PROPERTY_NAME, p.nextToken()); // 'Height'
180180
verifyFieldName(p, "Height");
181181
assertToken(JsonToken.VALUE_STRING, p.nextToken());
182-
assertEquals(String.valueOf(SAMPLE_SPEC_VALUE_TN_HEIGHT), p.getText());
182+
assertEquals(String.valueOf(SAMPLE_SPEC_VALUE_TN_HEIGHT), p.getString());
183183
assertToken(JsonToken.PROPERTY_NAME, p.nextToken()); // 'Width'
184184
verifyFieldName(p, "Width");
185185
// Width value is actually a String in the example
@@ -235,21 +235,21 @@ public void testForceElementAsArray() throws Exception
235235
assertToken(JsonToken.PROPERTY_NAME, xp.nextToken()); // <elem>
236236
assertEquals("elem", xp.currentName());
237237
assertToken(JsonToken.VALUE_STRING, xp.nextToken());
238-
assertEquals("value", xp.getText());
238+
assertEquals("value", xp.getString());
239239

240240
assertToken(JsonToken.PROPERTY_NAME, xp.nextToken()); // <elem>
241241
assertEquals("elem", xp.currentName());
242242
assertToken(JsonToken.START_OBJECT, xp.nextToken()); // <property>
243243
assertToken(JsonToken.PROPERTY_NAME, xp.nextToken());
244244
assertEquals("property", xp.currentName());
245245
assertToken(JsonToken.VALUE_STRING, xp.nextToken());
246-
assertEquals("123", xp.getText());
246+
assertEquals("123", xp.getString());
247247
assertToken(JsonToken.END_OBJECT, xp.nextToken()); // <object>
248248

249249
assertToken(JsonToken.PROPERTY_NAME, xp.nextToken()); // <elem>
250250
assertEquals("elem", xp.currentName());
251251
assertToken(JsonToken.VALUE_STRING, xp.nextToken());
252-
assertEquals("1", xp.getText());
252+
assertEquals("1", xp.getString());
253253

254254
assertToken(JsonToken.END_OBJECT, xp.nextToken()); // </array>
255255
xp.close();
@@ -268,17 +268,17 @@ public void testForceElementAsArray() throws Exception
268268

269269
assertToken(JsonToken.VALUE_STRING, xp.nextToken());
270270
assertTrue(xp.streamReadContext().inArray());
271-
assertEquals("value", xp.getText());
271+
assertEquals("value", xp.getString());
272272

273273
assertToken(JsonToken.START_OBJECT, xp.nextToken()); // <property>
274274
assertTrue(xp.streamReadContext().inObject());
275275
assertToken(JsonToken.PROPERTY_NAME, xp.nextToken());
276276
assertEquals("property", xp.currentName());
277277
assertToken(JsonToken.VALUE_STRING, xp.nextToken());
278-
assertEquals("123", xp.getText());
278+
assertEquals("123", xp.getString());
279279

280280
StringWriter w = new StringWriter();
281-
assertEquals(3, xp.getText(w));
281+
assertEquals(3, xp.getString(w));
282282
assertEquals("123", w.toString());
283283

284284
assertTrue(xp.streamReadContext().inObject());
@@ -287,7 +287,7 @@ public void testForceElementAsArray() throws Exception
287287

288288
assertToken(JsonToken.VALUE_STRING, xp.nextToken());
289289
assertTrue(xp.streamReadContext().inArray());
290-
assertEquals("1", xp.getText());
290+
assertEquals("1", xp.getString());
291291

292292
assertToken(JsonToken.END_ARRAY, xp.nextToken()); // </array>
293293
assertTrue(xp.streamReadContext().inRoot());
@@ -304,20 +304,20 @@ public void testXmlAttributes() throws Exception
304304
assertToken(JsonToken.PROPERTY_NAME, xp.nextToken()); // <max>
305305
assertEquals("max", xp.currentName());
306306
assertToken(JsonToken.VALUE_STRING, xp.nextToken());
307-
assertEquals("7", xp.getText());
307+
assertEquals("7", xp.getString());
308308

309309
assertToken(JsonToken.PROPERTY_NAME, xp.nextToken()); // <offset>
310310
assertEquals("offset", xp.currentName());
311311

312312
StringWriter w = new StringWriter();
313-
assertEquals(6, xp.getText(w));
313+
assertEquals(6, xp.getString(w));
314314
assertEquals("offset", w.toString());
315315

316316
assertToken(JsonToken.VALUE_STRING, xp.nextToken());
317-
assertEquals("9", xp.getText());
317+
assertEquals("9", xp.getString());
318318

319319
w = new StringWriter();
320-
assertEquals(1, xp.getText(w));
320+
assertEquals(1, xp.getString(w));
321321
assertEquals("9", w.toString());
322322

323323
assertToken(JsonToken.END_OBJECT, xp.nextToken()); // </data>
@@ -344,7 +344,7 @@ public void testInferredNumbers() throws Exception
344344
assertEquals("value1", xp.currentName());
345345
assertToken(JsonToken.VALUE_STRING, xp.nextToken());
346346
assertFalse(xp.isExpectedNumberIntToken());
347-
assertEquals("abc", xp.getText());
347+
assertEquals("abc", xp.getString());
348348

349349
assertToken(JsonToken.PROPERTY_NAME, xp.nextToken()); // @value2
350350
assertEquals("value2", xp.currentName());

0 commit comments

Comments
 (0)