Skip to content

Commit 03013f2

Browse files
cowtowncodercowtowncoder
committed
Test code clean up: pro-actively replace to-be-deprecated methods to non-deprecated ones (wrt 2.17)
1 parent fa31ccf commit 03013f2

35 files changed

+303
-300
lines changed

‎src/test/java/com/fasterxml/jackson/core/ParserFeatureDefaultsTest.java

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ public JsonToken nextToken() {
1818
protected void _handleEOF() {
1919
}
2020

21+
@Deprecated
2122
@Override
2223
public String getCurrentName() {
2324
return null;
@@ -85,11 +86,13 @@ public Version version() {
8586
return null;
8687
}
8788

89+
@Deprecated
8890
@Override
8991
public JsonLocation getCurrentLocation() {
9092
return null;
9193
}
9294

95+
@Deprecated
9396
@Override
9497
public JsonLocation getTokenLocation() {
9598
return null;

‎src/test/java/com/fasterxml/jackson/core/TestExceptions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ private void _testEofExceptions(int mode) throws Exception
123123

124124
public void testContentSnippetWithOffset() throws Exception
125125
{
126-
final JsonFactory jsonF = this.streamFactoryBuilder()
126+
final JsonFactory jsonF = streamFactoryBuilder()
127127
.enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
128128
.build();
129129

‎src/test/java/com/fasterxml/jackson/core/TestJDKSerializability.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void testLocation() throws Exception
8585
JsonFactory jf = new JsonFactory();
8686
JsonParser jp = jf.createParser(" { }");
8787
assertToken(JsonToken.START_OBJECT, jp.nextToken());
88-
JsonLocation loc = jp.getCurrentLocation();
88+
JsonLocation loc = jp.currentLocation();
8989

9090
byte[] stuff = jdkSerialize(loc);
9191
JsonLocation loc2 = jdkDeserialize(stuff);

‎src/test/java/com/fasterxml/jackson/core/base64/Base64BinaryParsingTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ private void _testStreaming(int mode) throws IOException
305305
assertToken(JsonToken.START_OBJECT, p.nextToken());
306306

307307
assertToken(JsonToken.FIELD_NAME, p.nextToken());
308-
assertEquals("b", p.getCurrentName());
308+
assertEquals("b", p.currentName());
309309
assertToken(JsonToken.VALUE_STRING, p.nextToken());
310310
ByteArrayOutputStream result = new ByteArrayOutputStream(size);
311311
int gotten = p.readBinaryValue(result);

‎src/test/java/com/fasterxml/jackson/core/constraints/LargeNumberWriteTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ private void _verifyLargeNumberDoc(JsonParser p, BigInteger bigValue) throws Exc
161161
{
162162
assertToken(JsonToken.START_OBJECT, p.nextToken());
163163
assertToken(JsonToken.FIELD_NAME, p.nextToken());
164-
assertEquals("field", p.getCurrentName());
164+
assertEquals("field", p.currentName());
165165
assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
166166
assertEquals(bigValue, p.getBigIntegerValue());
167167
assertToken(JsonToken.END_OBJECT, p.nextToken());
@@ -172,7 +172,7 @@ private void _verifyLargeNumberDoc(JsonParser p, BigDecimal bigValue) throws Exc
172172
{
173173
assertToken(JsonToken.START_OBJECT, p.nextToken());
174174
assertToken(JsonToken.FIELD_NAME, p.nextToken());
175-
assertEquals("field", p.getCurrentName());
175+
assertEquals("field", p.currentName());
176176
assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
177177
assertEquals(bigValue, p.getDecimalValue());
178178
assertToken(JsonToken.END_OBJECT, p.nextToken());

‎src/test/java/com/fasterxml/jackson/core/filter/BasicParserFilteringTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -623,16 +623,16 @@ public void testTokensSingleMatchWithPath() throws Exception
623623
assertEquals(JsonToken.FIELD_NAME, p.getCurrentToken());
624624
assertTrue(p.hasToken(JsonToken.FIELD_NAME));
625625
assertTrue(p.hasTokenId(JsonTokenId.ID_FIELD_NAME));
626-
assertEquals("ob", p.getCurrentName());
626+
assertEquals("ob", p.currentName());
627627
// assertEquals("ob", p.getText());
628628

629629
assertToken(JsonToken.START_OBJECT, p.nextToken());
630-
assertEquals("ob", p.getCurrentName());
630+
assertEquals("ob", p.currentName());
631631

632-
assertEquals(p0.getCurrentLocation(), p.getCurrentLocation());
632+
assertEquals(p0.currentLocation(), p.currentLocation());
633633

634634
assertToken(JsonToken.FIELD_NAME, p.nextToken());
635-
assertEquals("value", p.getCurrentName());
635+
assertEquals("value", p.currentName());
636636
assertEquals("value", p.getText());
637637

638638
assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());

‎src/test/java/com/fasterxml/jackson/core/format/TestJsonFormatDetection.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ public void testSimpleValidObject() throws Exception
4141
// no "certain" match with JSON, but solid:
4242
assertEquals(MatchStrength.SOLID_MATCH, matcher.getMatchStrength());
4343
// and thus:
44-
JsonParser jp = matcher.createParserWithMatch();
45-
assertToken(JsonToken.START_OBJECT, jp.nextToken());
46-
assertToken(JsonToken.FIELD_NAME, jp.nextToken());
47-
assertEquals("field", jp.getCurrentName());
48-
assertToken(JsonToken.VALUE_TRUE, jp.nextToken());
49-
assertToken(JsonToken.END_OBJECT, jp.nextToken());
50-
assertNull(jp.nextToken());
51-
jp.close();
44+
JsonParser p = matcher.createParserWithMatch();
45+
assertToken(JsonToken.START_OBJECT, p.nextToken());
46+
assertToken(JsonToken.FIELD_NAME, p.nextToken());
47+
assertEquals("field", p.currentName());
48+
assertToken(JsonToken.VALUE_TRUE, p.nextToken());
49+
assertToken(JsonToken.END_OBJECT, p.nextToken());
50+
assertNull(p.nextToken());
51+
p.close();
5252
}
5353

5454
/**

‎src/test/java/com/fasterxml/jackson/core/json/TestParserOverrides.java

+26-26
Original file line numberDiff line numberDiff line change
@@ -59,38 +59,38 @@ public void _testTokenAccess(JsonFactory jf, boolean useStream) throws Exception
5959
jp.close();
6060
}
6161

62-
private void _testCurrentName(JsonFactory jf, boolean useStream) throws Exception
62+
private void _testCurrentName(JsonFactory f, boolean useStream) throws Exception
6363
{
6464
final String DOC = "{\"first\":{\"second\":3, \"third\":false}}";
65-
JsonParser jp = useStream ?
66-
jf.createParser(new ByteArrayInputStream(DOC.getBytes("UTF-8")))
67-
: jf.createParser(new StringReader(DOC));
68-
assertNull(jp.currentToken());
69-
assertToken(JsonToken.START_OBJECT, jp.nextToken());
70-
assertToken(JsonToken.FIELD_NAME, jp.nextToken());
71-
assertEquals("first", jp.getCurrentName());
72-
assertToken(JsonToken.START_OBJECT, jp.nextToken());
73-
assertEquals("first", jp.getCurrentName()); // still the same...
74-
jp.overrideCurrentName("foobar");
75-
assertEquals("foobar", jp.getCurrentName()); // but not any more!
65+
JsonParser p = useStream ?
66+
f.createParser(new ByteArrayInputStream(DOC.getBytes("UTF-8")))
67+
: f.createParser(new StringReader(DOC));
68+
assertNull(p.currentToken());
69+
assertToken(JsonToken.START_OBJECT, p.nextToken());
70+
assertToken(JsonToken.FIELD_NAME, p.nextToken());
71+
assertEquals("first", p.currentName());
72+
assertToken(JsonToken.START_OBJECT, p.nextToken());
73+
assertEquals("first", p.currentName()); // still the same...
74+
p.overrideCurrentName("foobar");
75+
assertEquals("foobar", p.currentName()); // but not any more!
7676

77-
assertToken(JsonToken.FIELD_NAME, jp.nextToken());
78-
assertEquals("second", jp.getCurrentName());
79-
assertToken(JsonToken.VALUE_NUMBER_INT, jp.nextToken());
80-
assertEquals("second", jp.getCurrentName());
77+
assertToken(JsonToken.FIELD_NAME, p.nextToken());
78+
assertEquals("second", p.currentName());
79+
assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
80+
assertEquals("second", p.currentName());
8181

82-
assertToken(JsonToken.FIELD_NAME, jp.nextToken());
83-
assertEquals("third", jp.getCurrentName());
84-
assertToken(JsonToken.VALUE_FALSE, jp.nextToken());
85-
assertEquals("third", jp.getCurrentName());
82+
assertToken(JsonToken.FIELD_NAME, p.nextToken());
83+
assertEquals("third", p.currentName());
84+
assertToken(JsonToken.VALUE_FALSE, p.nextToken());
85+
assertEquals("third", p.currentName());
8686

87-
assertToken(JsonToken.END_OBJECT, jp.nextToken());
87+
assertToken(JsonToken.END_OBJECT, p.nextToken());
8888
// should retain overrides, too
89-
assertEquals("foobar", jp.getCurrentName());
89+
assertEquals("foobar", p.currentName());
9090

91-
assertToken(JsonToken.END_OBJECT, jp.nextToken());
92-
jp.clearCurrentToken();
93-
assertNull(jp.currentToken());
94-
jp.close();
91+
assertToken(JsonToken.END_OBJECT, p.nextToken());
92+
p.clearCurrentToken();
93+
assertNull(p.currentToken());
94+
p.close();
9595
}
9696
}

‎src/test/java/com/fasterxml/jackson/core/json/TestWithTonsaSymbols.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ private void _testWith(boolean useStream)
4949
assertToken(JsonToken.START_OBJECT, p.nextToken());
5050
for (int i = 0; i < FIELD_COUNT; ++i) {
5151
assertToken(JsonToken.FIELD_NAME, p.nextToken());
52-
assertEquals(fieldNameFor(i), p.getCurrentName());
52+
assertEquals(fieldNameFor(i), p.currentName());
5353
assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
5454
assertEquals(i, p.getIntValue());
5555
}

‎src/test/java/com/fasterxml/jackson/core/json/async/AsyncFieldNamesTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private void _testSimpleFieldName(String fieldName) throws IOException
4040
assertToken(JsonToken.VALUE_TRUE, r.nextToken());
4141
assertToken(JsonToken.END_OBJECT, r.nextToken());
4242
assertNull(r.nextToken());
43-
JsonLocation loc = r.parser().getCurrentLocation();
43+
JsonLocation loc = r.parser().currentLocation();
4444
assertEquals(2, loc.getLineNr());
4545
assertEquals(1, loc.getColumnNr());
4646
}

‎src/test/java/com/fasterxml/jackson/core/json/async/AsyncInvalidCharsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private void _testUTF8BomOk(int offset, int readSize) throws Exception
5555
* "out of stream" (not part of input).
5656
*/
5757

58-
JsonLocation loc = p.parser().getTokenLocation();
58+
JsonLocation loc = p.parser().currentTokenLocation();
5959
// so if BOM was consider in-stream (part of input), this should expect 3:
6060
// (NOTE: this is location for START_ARRAY token, now)
6161
assertEquals(-1, loc.getCharOffset());

‎src/test/java/com/fasterxml/jackson/core/json/async/AsyncLocationTest.java

+22-22
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ public void testLocationOffsets() throws Exception
2222
feeder.feedInput(input, 2, 3);
2323
assertEquals(JsonToken.START_ARRAY, parser.nextToken());
2424
assertEquals(1, parser.currentLocation().getByteOffset());
25-
assertEquals(1, parser.getTokenLocation().getByteOffset());
26-
assertEquals(1, parser.getCurrentLocation().getLineNr());
27-
assertEquals(1, parser.getTokenLocation().getLineNr());
28-
assertEquals(2, parser.getCurrentLocation().getColumnNr());
29-
assertEquals(1, parser.getTokenLocation().getColumnNr());
25+
assertEquals(1, parser.currentTokenLocation().getByteOffset());
26+
assertEquals(1, parser.currentLocation().getLineNr());
27+
assertEquals(1, parser.currentTokenLocation().getLineNr());
28+
assertEquals(2, parser.currentLocation().getColumnNr());
29+
assertEquals(1, parser.currentTokenLocation().getColumnNr());
3030

3131
feeder.feedInput(input, 0, 1);
3232
assertEquals(JsonToken.START_ARRAY, parser.nextToken());
33-
assertEquals(2, parser.getCurrentLocation().getByteOffset());
34-
assertEquals(2, parser.getTokenLocation().getByteOffset());
35-
assertEquals(1, parser.getCurrentLocation().getLineNr());
36-
assertEquals(1, parser.getTokenLocation().getLineNr());
37-
assertEquals(3, parser.getCurrentLocation().getColumnNr());
38-
assertEquals(2, parser.getTokenLocation().getColumnNr());
33+
assertEquals(2, parser.currentLocation().getByteOffset());
34+
assertEquals(2, parser.currentTokenLocation().getByteOffset());
35+
assertEquals(1, parser.currentLocation().getLineNr());
36+
assertEquals(1, parser.currentTokenLocation().getLineNr());
37+
assertEquals(3, parser.currentLocation().getColumnNr());
38+
assertEquals(2, parser.currentTokenLocation().getColumnNr());
3939
parser.close();
4040
}
4141

@@ -48,20 +48,20 @@ public void testLocationOffsetsByteBuffer() throws Exception
4848
feeder.feedInput(ByteBuffer.wrap(utf8Bytes(input), 2, 1));
4949
assertEquals(JsonToken.START_ARRAY, parser.nextToken());
5050
assertEquals(1, parser.currentLocation().getByteOffset());
51-
assertEquals(1, parser.getTokenLocation().getByteOffset());
52-
assertEquals(1, parser.getCurrentLocation().getLineNr());
53-
assertEquals(1, parser.getTokenLocation().getLineNr());
54-
assertEquals(2, parser.getCurrentLocation().getColumnNr());
55-
assertEquals(1, parser.getTokenLocation().getColumnNr());
51+
assertEquals(1, parser.currentTokenLocation().getByteOffset());
52+
assertEquals(1, parser.currentLocation().getLineNr());
53+
assertEquals(1, parser.currentTokenLocation().getLineNr());
54+
assertEquals(2, parser.currentLocation().getColumnNr());
55+
assertEquals(1, parser.currentTokenLocation().getColumnNr());
5656

5757
feeder.feedInput(ByteBuffer.wrap(utf8Bytes(input), 0, 1));
5858
assertEquals(JsonToken.START_ARRAY, parser.nextToken());
59-
assertEquals(2, parser.getCurrentLocation().getByteOffset());
60-
assertEquals(2, parser.getTokenLocation().getByteOffset());
61-
assertEquals(1, parser.getCurrentLocation().getLineNr());
62-
assertEquals(1, parser.getTokenLocation().getLineNr());
63-
assertEquals(3, parser.getCurrentLocation().getColumnNr());
64-
assertEquals(2, parser.getTokenLocation().getColumnNr());
59+
assertEquals(2, parser.currentLocation().getByteOffset());
60+
assertEquals(2, parser.currentTokenLocation().getByteOffset());
61+
assertEquals(1, parser.currentLocation().getLineNr());
62+
assertEquals(1, parser.currentTokenLocation().getLineNr());
63+
assertEquals(3, parser.currentLocation().getColumnNr());
64+
assertEquals(2, parser.currentTokenLocation().getColumnNr());
6565
parser.close();
6666
}
6767
}

‎src/test/java/com/fasterxml/jackson/core/read/CommentParsingTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,11 @@ private void _testYAMLComments(JsonFactory f, int mode) throws Exception
225225
JsonParser p = createParser(f, mode, DOC);
226226
assertEquals(JsonToken.START_OBJECT, p.nextToken());
227227
assertEquals(JsonToken.FIELD_NAME, p.nextToken());
228-
assertEquals("a", p.getCurrentName());
228+
assertEquals("a", p.currentName());
229229
assertEquals(JsonToken.VALUE_NUMBER_INT, p.nextToken());
230230
assertEquals(1, p.getIntValue());
231231
assertEquals(JsonToken.FIELD_NAME, p.nextToken());
232-
assertEquals("b", p.getCurrentName());
232+
assertEquals("b", p.currentName());
233233
assertEquals(JsonToken.START_ARRAY, p.nextToken());
234234
assertEquals(JsonToken.VALUE_NUMBER_INT, p.nextToken());
235235
assertEquals(3, p.getIntValue());

‎src/test/java/com/fasterxml/jackson/core/read/LocationDuringReaderParsingTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ private void testLocationAtEndOfParse(LocationTestCase test) throws Exception
5050
private void testInitialLocation(LocationTestCase test) throws Exception
5151
{
5252
JsonParser p = createParserUsingReader(test.json);
53-
JsonLocation loc = p.getCurrentLocation();
53+
JsonLocation loc = p.currentLocation();
5454
p.close();
5555

5656
assertLocation(loc, at(1, 1, 0));
@@ -70,12 +70,12 @@ private void testTokenLocations(LocationTestCase test) throws Exception
7070

7171
private void assertCurrentLocation(JsonParser p, LocData loc)
7272
{
73-
assertLocation(p.getCurrentLocation(), loc);
73+
assertLocation(p.currentLocation(), loc);
7474
}
7575

7676
private void assertTokenLocation(JsonParser p, LocData loc)
7777
{
78-
assertLocation(p.getTokenLocation(), loc);
78+
assertLocation(p.currentTokenLocation(), loc);
7979
}
8080

8181
private void assertLocation(JsonLocation pLoc, LocData loc)

‎src/test/java/com/fasterxml/jackson/core/read/LocationDuringStreamParsingTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ private void testLocationAtEndOfParse(LocationTestCase test) throws Exception
5050
private void testInitialLocation(LocationTestCase test) throws Exception
5151
{
5252
JsonParser p = createParserUsingStream(test.json, "UTF8");
53-
JsonLocation loc = p.getCurrentLocation();
53+
JsonLocation loc = p.currentLocation();
5454
p.close();
5555

5656
assertLocation(loc, at(1, 1, 0));
@@ -70,12 +70,12 @@ private void testTokenLocations(LocationTestCase test) throws Exception
7070

7171
private void assertCurrentLocation(JsonParser p, LocData loc)
7272
{
73-
assertLocation(p.getCurrentLocation(), loc);
73+
assertLocation(p.currentLocation(), loc);
7474
}
7575

7676
private void assertTokenLocation(JsonParser p, LocData loc)
7777
{
78-
assertLocation(p.getTokenLocation(), loc);
78+
assertLocation(p.currentTokenLocation(), loc);
7979
}
8080

8181
private void assertLocation(JsonLocation pLoc, LocData loc)

‎src/test/java/com/fasterxml/jackson/core/read/LocationInArrayTest.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,28 @@ private void _testOffsetInArrays(boolean useBytes) throws Exception
2626
p = useBytes ? JSON_F.createParser(DOC.getBytes("UTF-8"))
2727
: JSON_F.createParser(DOC.toCharArray());
2828
assertToken(JsonToken.START_ARRAY, p.nextToken());
29-
_assertLocation(useBytes, p.getTokenLocation(), 2L, 1, 3);
30-
_assertLocation(useBytes, p.getCurrentLocation(), 3L, 1, 4);
29+
_assertLocation(useBytes, p.currentTokenLocation(), 2L, 1, 3);
30+
_assertLocation(useBytes, p.currentLocation(), 3L, 1, 4);
3131

3232
assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
33-
_assertLocation(useBytes, p.getTokenLocation(), 3L, 1, 4);
33+
_assertLocation(useBytes, p.currentTokenLocation(), 3L, 1, 4);
3434
assertEquals(10, p.getIntValue()); // just to ensure read proceeds to end
3535
// 2-digits so
36-
_assertLocation(useBytes, p.getCurrentLocation(), 5L, 1, 6);
36+
_assertLocation(useBytes, p.currentLocation(), 5L, 1, 6);
3737

3838
assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
39-
_assertLocation(useBytes, p.getTokenLocation(), 7L, 1, 8);
39+
_assertLocation(useBytes, p.currentTokenLocation(), 7L, 1, 8);
4040
assertEquals(251, p.getIntValue()); // just to ensure read proceeds to end
41-
_assertLocation(useBytes, p.getCurrentLocation(), 10L, 1, 11);
41+
_assertLocation(useBytes, p.currentLocation(), 10L, 1, 11);
4242

4343
assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
44-
_assertLocation(useBytes, p.getTokenLocation(), 15L, 2, 4);
44+
_assertLocation(useBytes, p.currentTokenLocation(), 15L, 2, 4);
4545
assertEquals(3, p.getIntValue());
46-
_assertLocation(useBytes, p.getCurrentLocation(), 16L, 2, 5);
46+
_assertLocation(useBytes, p.currentLocation(), 16L, 2, 5);
4747

4848
assertToken(JsonToken.END_ARRAY, p.nextToken());
49-
_assertLocation(useBytes, p.getTokenLocation(), 18L, 2, 7);
50-
_assertLocation(useBytes, p.getCurrentLocation(), 19L, 2, 8);
49+
_assertLocation(useBytes, p.currentTokenLocation(), 18L, 2, 7);
50+
_assertLocation(useBytes, p.currentLocation(), 19L, 2, 8);
5151

5252
p.close();
5353
}

0 commit comments

Comments
 (0)