Skip to content

Commit 452fe21

Browse files
cowtowncodercowtowncoder
committed
Sync wrt [core#1378]
1 parent 9bedc40 commit 452fe21

File tree

65 files changed

+318
-318
lines changed

Some content is hidden

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

65 files changed

+318
-318
lines changed

‎avro/src/main/java/tools/jackson/dataformat/avro/AvroParser.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -206,33 +206,33 @@ public TokenStreamLocation currentLocation() {
206206
*/
207207

208208
@Override
209-
public abstract boolean hasTextCharacters();
209+
public abstract boolean hasStringCharacters();
210210

211211
@Override
212-
public abstract String getText() throws JacksonException;
212+
public abstract String getString() throws JacksonException;
213213

214214
@Override
215-
public abstract int getText(Writer writer) throws JacksonException;
215+
public abstract int getString(Writer writer) throws JacksonException;
216216

217217
@Override
218218
public String currentName() throws JacksonException {
219219
return _avroContext.currentName();
220220
}
221221

222222
@Override
223-
public char[] getTextCharacters() throws JacksonException {
224-
String text = getText();
223+
public char[] getStringCharacters() throws JacksonException {
224+
String text = getString();
225225
return (text == null) ? null : text.toCharArray();
226226
}
227227

228228
@Override
229-
public int getTextLength() throws JacksonException {
230-
String text = getText();
229+
public int getStringLength() throws JacksonException {
230+
String text = getString();
231231
return (text == null) ? 0 : text.length();
232232
}
233233

234234
@Override
235-
public int getTextOffset() throws JacksonException {
235+
public int getStringOffset() throws JacksonException {
236236
return 0;
237237
}
238238

@@ -258,7 +258,7 @@ public byte[] getBinaryValue(Base64Variant variant) throws JacksonException
258258
}
259259
@SuppressWarnings("resource")
260260
ByteArrayBuilder builder = _getByteArrayBuilder();
261-
_decodeBase64(getText(), builder, variant);
261+
_decodeBase64(getString(), builder, variant);
262262
_binaryValue = builder.toByteArray();
263263
}
264264
return _binaryValue;

‎avro/src/main/java/tools/jackson/dataformat/avro/apacheimpl/ApacheAvroParserImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,17 +164,17 @@ protected void _closeInput() throws IOException {
164164

165165
// For now we do not store char[] representation...
166166
@Override
167-
public boolean hasTextCharacters() {
167+
public boolean hasStringCharacters() {
168168
return false;
169169
}
170170

171171
@Override
172-
public String nextTextValue() throws JacksonException {
172+
public String nextStringValue() throws JacksonException {
173173
return (nextToken() == JsonToken.VALUE_STRING) ? _textValue : null;
174174
}
175175

176176
@Override
177-
public String getText() throws JacksonException
177+
public String getString() throws JacksonException
178178
{
179179
if (_currToken == JsonToken.VALUE_STRING) {
180180
return _textValue;
@@ -192,7 +192,7 @@ public String getText() throws JacksonException
192192
}
193193

194194
@Override
195-
public int getText(Writer writer) throws JacksonException
195+
public int getString(Writer writer) throws JacksonException
196196
{
197197
JsonToken t = _currToken;
198198
try {

‎avro/src/main/java/tools/jackson/dataformat/avro/apacheimpl/DecoderOverAvroParser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public Utf8 readString(Utf8 old) throws IOException {
125125
@Override
126126
public String readString() throws IOException {
127127
nextValue();
128-
String value = _parser.getText();
128+
String value = _parser.getString();
129129
_parser.clearCurrentToken();
130130
return value;
131131
}

‎avro/src/main/java/tools/jackson/dataformat/avro/deser/AvroParserImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public int nextNameMatch(PropertyNameMatcher matcher) throws JacksonException
180180
*/
181181

182182
@Override
183-
public abstract String nextTextValue() throws JacksonException;
183+
public abstract String nextStringValue() throws JacksonException;
184184

185185
@Override
186186
public final void _initSchema(AvroSchema schema) throws JacksonException {
@@ -304,7 +304,7 @@ public final float getFloatValue() throws JacksonException
304304
// Bounds/range checks would be tricky here, so let's not bother even trying...
305305
/*
306306
if (value < -Float.MAX_VALUE || value > MAX_FLOAT_D) {
307-
_reportError("Numeric value ("+getText()+") out of range of Java float");
307+
_reportError("Numeric value ("+getString()+") out of range of Java float");
308308
}
309309
*/
310310
return _numberFloat;
@@ -333,7 +333,7 @@ protected final void convertNumberToInt() throws JacksonException
333333
// Let's verify it's lossless conversion by simple roundtrip
334334
int result = (int) _numberLong;
335335
if (((long) result) != _numberLong) {
336-
_reportError("Numeric value ("+getText()+") out of range of int");
336+
_reportError("Numeric value ("+getString()+") out of range of int");
337337
}
338338
_numberInt = result;
339339
} else if ((_numTypesValid & NR_BIGINT) != 0) {

‎avro/src/main/java/tools/jackson/dataformat/avro/deser/JacksonAvroParserImpl.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public int releaseBuffered(OutputStream out)
155155

156156
// !!! TODO: optimize
157157
@Override
158-
public String nextTextValue() throws JacksonException {
158+
public String nextStringValue() throws JacksonException {
159159
if (nextToken() == JsonToken.VALUE_STRING) {
160160
return _textBuffer.contentsAsString();
161161
}
@@ -169,14 +169,14 @@ public String nextTextValue() throws JacksonException {
169169
*/
170170

171171
@Override
172-
public boolean hasTextCharacters() {
172+
public boolean hasStringCharacters() {
173173
if (_currToken == JsonToken.VALUE_STRING) { return true; } // usually true
174174
// name might be copied but...
175175
return false;
176176
}
177177

178178
@Override
179-
public String getText() throws JacksonException
179+
public String getString() throws JacksonException
180180
{
181181
JsonToken t = _currToken;
182182
if (t == JsonToken.VALUE_STRING) {
@@ -195,7 +195,7 @@ public String getText() throws JacksonException
195195
}
196196

197197
@Override
198-
public int getText(Writer writer) throws JacksonException
198+
public int getString(Writer writer) throws JacksonException
199199
{
200200
JsonToken t = _currToken;
201201

@@ -590,13 +590,13 @@ public void decodeString() throws IOException {
590590
// or if not, could we read?
591591
if (len >= _inputBuffer.length) {
592592
// If not enough space, need handling similar to chunked
593-
_finishLongText(len);
593+
_finishLongString(len);
594594
return;
595595
}
596596
_loadToHaveAtLeast(len);
597597
}
598598
// offline for better optimization
599-
_finishShortText(len);
599+
_finishShortString(len);
600600
}
601601

602602
@Override
@@ -611,7 +611,7 @@ public void skipString() throws IOException {
611611
_skip(len);
612612
}
613613

614-
private final String _finishShortText(int len) throws IOException
614+
private final String _finishShortString(int len) throws IOException
615615
{
616616
char[] outBuf = _textBuffer.emptyAndGetCurrentSegment();
617617
if (outBuf.length < len) { // one minor complication
@@ -673,7 +673,7 @@ private final String _finishShortText(int len) throws IOException
673673
return _textBuffer.setCurrentAndReturn(outPtr);
674674
}
675675

676-
private final void _finishLongText(int len) throws IOException
676+
private final void _finishLongString(int len) throws IOException
677677
{
678678
char[] outBuf = _textBuffer.emptyAndGetCurrentSegment();
679679
int outPtr = 0;

‎avro/src/test/java/tools/jackson/dataformat/avro/BinaryDataTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,6 @@ public void _testAvroSchemaGenerationWithJackson(AvroMapper mapper) throws Excep
7777
assertToken(JsonToken.END_OBJECT, p.nextToken());
7878
assertNull(p.nextToken());
7979
p.close();
80-
assertNull(p.nextTextValue());
80+
assertNull(p.nextStringValue());
8181
}
8282
}

‎avro/src/test/java/tools/jackson/dataformat/avro/POJOSimpleReadTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@ private void _testSimplePojoViaParser(Employee empl, byte[] avro,
5858
}
5959

6060
assertToken(JsonToken.PROPERTY_NAME, p.nextToken());
61-
assertFalse(p.hasTextCharacters());
61+
assertFalse(p.hasStringCharacters());
6262
assertEquals("name", p.currentName());
63-
assertEquals("name", p.getText());
63+
assertEquals("name", p.getString());
6464
assertToken(JsonToken.VALUE_STRING, p.nextToken());
65-
assertEquals(empl.name, p.getText());
65+
assertEquals(empl.name, p.getString());
6666

6767
StringWriter sw = new StringWriter();
68-
assertEquals(empl.name.length(), p.getText(sw));
68+
assertEquals(empl.name.length(), p.getString(sw));
6969
assertEquals(empl.name, sw.toString());
7070

71-
assertTrue(p.hasTextCharacters());
71+
assertTrue(p.hasStringCharacters());
7272
assertToken(JsonToken.PROPERTY_NAME, p.nextToken());
7373
assertEquals("age", p.currentName());
7474
assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
@@ -81,14 +81,14 @@ private void _testSimplePojoViaParser(Employee empl, byte[] avro,
8181

8282
assertEquals("emails", p.currentName());
8383
sw = new StringWriter();
84-
assertEquals(6, p.getText(sw));
84+
assertEquals(6, p.getString(sw));
8585
assertEquals("emails", sw.toString());
8686

8787
assertToken(JsonToken.START_ARRAY, p.nextToken());
8888
assertToken(JsonToken.VALUE_STRING, p.nextToken());
89-
assertEquals(empl.emails[0], p.getText());
89+
assertEquals(empl.emails[0], p.getString());
9090
assertToken(JsonToken.VALUE_STRING, p.nextToken());
91-
assertEquals(empl.emails[1], p.getText());
91+
assertEquals(empl.emails[1], p.getString());
9292
assertToken(JsonToken.END_ARRAY, p.nextToken());
9393

9494
assertToken(JsonToken.PROPERTY_NAME, p.nextToken());

‎cbor/src/main/java/tools/jackson/dataformat/cbor/CBORParser.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ protected void _closeInput() {
475475
*/
476476

477477
@Override
478-
public boolean hasTextCharacters()
478+
public boolean hasStringCharacters()
479479
{
480480
if (_currToken == JsonToken.VALUE_STRING) {
481481
// yes; is or can be made available efficiently as char[]
@@ -1101,7 +1101,7 @@ protected final boolean _checkNextIsEndArray() throws JacksonException
11011101

11021102
/**
11031103
* Method for forcing full read of current token, even if it might otherwise
1104-
* only be read if data is accessed via {@link #getText} and similar methods.
1104+
* only be read if data is accessed via {@link #getString()} and similar methods.
11051105
*/
11061106
@Override
11071107
public void finishToken() throws JacksonException
@@ -1605,10 +1605,10 @@ private final int _nextFieldFromSymbolsLong(PropertyNameMatcher matcher,
16051605
*/
16061606

16071607
@Override
1608-
public String nextTextValue() throws JacksonException
1608+
public String nextStringValue() throws JacksonException
16091609
{
16101610
if (nextToken() == JsonToken.VALUE_STRING) {
1611-
return getText();
1611+
return getString();
16121612
}
16131613
return null;
16141614
}
@@ -1657,7 +1657,7 @@ public Boolean nextBooleanValue() throws JacksonException
16571657
* Method can be called for any event.
16581658
*/
16591659
@Override
1660-
public String getText() throws JacksonException
1660+
public String getString() throws JacksonException
16611661
{
16621662
JsonToken t = _currToken;
16631663
if (_tokenIncomplete) {
@@ -1681,7 +1681,7 @@ public String getText() throws JacksonException
16811681
}
16821682

16831683
@Override
1684-
public char[] getTextCharacters() throws JacksonException
1684+
public char[] getStringCharacters() throws JacksonException
16851685
{
16861686
if (_currToken != null) { // null only before/after document
16871687
if (_tokenIncomplete) {
@@ -1703,7 +1703,7 @@ public char[] getTextCharacters() throws JacksonException
17031703
}
17041704

17051705
@Override
1706-
public int getTextLength() throws JacksonException
1706+
public int getStringLength() throws JacksonException
17071707
{
17081708
if (_currToken != null) { // null only before/after document
17091709
if (_tokenIncomplete) {
@@ -1728,7 +1728,7 @@ public int getTextLength() throws JacksonException
17281728
}
17291729

17301730
@Override
1731-
public int getTextOffset() throws JacksonException {
1731+
public int getStringOffset() throws JacksonException {
17321732
return 0;
17331733
}
17341734

@@ -1747,7 +1747,7 @@ public String getValueAsString() throws JacksonException
17471747
if (_currToken == null || _currToken == JsonToken.VALUE_NULL || !_currToken.isScalarValue()) {
17481748
return null;
17491749
}
1750-
return getText();
1750+
return getString();
17511751
}
17521752

17531753
@Override
@@ -1758,11 +1758,11 @@ public String getValueAsString(String defaultValue) throws JacksonException
17581758
return defaultValue;
17591759
}
17601760
}
1761-
return getText();
1761+
return getString();
17621762
}
17631763

17641764
@Override
1765-
public int getText(Writer writer) throws JacksonException
1765+
public int getString(Writer writer) throws JacksonException
17661766
{
17671767
if (_tokenIncomplete) {
17681768
_finishToken();
@@ -1937,7 +1937,7 @@ private final byte[] _getBinaryFromString(Base64Variant variant) throws JacksonE
19371937
if (_binaryValue == null) {
19381938
// 26-Jun-2021, tatu: Copied from ParserBase
19391939
ByteArrayBuilder builder = _getByteArrayBuilder();
1940-
_decodeBase64(getText(), builder, variant);
1940+
_decodeBase64(getString(), builder, variant);
19411941
_binaryValue = builder.toByteArray();
19421942
}
19431943
return _binaryValue;
@@ -2252,7 +2252,7 @@ protected void convertNumberToBigDecimal() throws JacksonException
22522252
if ((_numTypesValid & (NR_DOUBLE | NR_FLOAT)) != 0) {
22532253
// Let's parse from String representation, to avoid rounding errors that
22542254
//non-decimal floating operations would incur
2255-
final String text = getText();
2255+
final String text = getString();
22562256
// 16-Jan-2024, tatu: OSS-Fuzz managed to trigger this; let's fail
22572257
// explicitly
22582258
if (text == null) {

‎cbor/src/test/java/tools/jackson/dataformat/cbor/CBORTestBase.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,10 @@ protected void _verifyBytes(byte[] actBytes, byte exp1, byte exp2, byte exp3, by
263263
protected String getAndVerifyText(JsonParser p) throws IOException
264264
{
265265
// Ok, let's verify other accessors
266-
int actLen = p.getTextLength();
267-
char[] ch = p.getTextCharacters();
268-
String str2 = new String(ch, p.getTextOffset(), actLen);
269-
String str = p.getText();
266+
int actLen = p.getStringLength();
267+
char[] ch = p.getStringCharacters();
268+
String str2 = new String(ch, p.getStringOffset(), actLen);
269+
String str = p.getString();
270270

271271
if (str.length() != actLen) {
272272
fail("Internal problem (p.token == "+p.currentToken()+"): p.getText().length() ['"+str+"'] == "+str.length()+"; p.getTextLength() == "+actLen);

‎cbor/src/test/java/tools/jackson/dataformat/cbor/GeneratorLongStringTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ private void _verifyStrings(byte[] input, List<String> strings)
8585
if ((i % 3) == 0) { // just for fun, try calling finish every now and then
8686
p.finishToken();
8787
}
88-
assertEquals(strings.get(i), p.getText());
88+
assertEquals(strings.get(i), p.getString());
8989
}
9090
assertToken(JsonToken.END_ARRAY, p.nextToken());
9191
p.close();

0 commit comments

Comments
 (0)