Skip to content

Commit 25b8b10

Browse files
cowtowncodercowtowncoder
committed
...
1 parent a26b138 commit 25b8b10

File tree

14 files changed

+114
-114
lines changed

14 files changed

+114
-114
lines changed

‎csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ else if (_currToken == JsonToken.VALUE_STRING) {
528528
}
529529

530530
@Override
531-
public String getCurrentName() throws IOException {
531+
public String currentName() throws IOException {
532532
return _currentName;
533533
}
534534

@@ -594,7 +594,7 @@ public boolean nextFieldName(SerializableString str) throws IOException {
594594
return false;
595595
}
596596
// unlikely, but verify just in case
597-
return (nextToken() == JsonToken.FIELD_NAME) && str.getValue().equals(getCurrentName());
597+
return (nextToken() == JsonToken.FIELD_NAME) && str.getValue().equals(currentName());
598598
}
599599

600600
@Override
@@ -611,7 +611,7 @@ public String nextFieldName() throws IOException
611611
return null;
612612
}
613613
// unlikely, but verify just in case
614-
return (nextToken() == JsonToken.FIELD_NAME) ? getCurrentName() : null;
614+
return (nextToken() == JsonToken.FIELD_NAME) ? currentName() : null;
615615
}
616616

617617
@Override

‎csv/src/test/java/com/fasterxml/jackson/dataformat/csv/ModuleTestBase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,11 @@ protected String getAndVerifyText(JsonParser jp)
150150
return str;
151151
}
152152

153-
protected void verifyFieldName(JsonParser jp, String expName)
153+
protected void verifyFieldName(JsonParser p, String expName)
154154
throws IOException
155155
{
156-
assertEquals(expName, jp.getText());
157-
assertEquals(expName, jp.getCurrentName());
156+
assertEquals(expName, p.getText());
157+
assertEquals(expName, p.currentName());
158158
}
159159

160160
protected void verifyIntValue(JsonParser jp, long expValue)

‎csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/BasicParserTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -247,15 +247,15 @@ public void testColumnReordering() throws IOException {
247247
parser.setSchema(schemaWithReordering);
248248
assertEquals(JsonToken.START_OBJECT, parser.nextToken());
249249
assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
250-
assertEquals("b", parser.getCurrentName());
250+
assertEquals("b", parser.currentName());
251251
assertEquals(JsonToken.VALUE_STRING, parser.nextToken());
252252
assertEquals("vb", parser.getValueAsString());
253253
assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
254-
assertEquals("a",parser.getCurrentName());
254+
assertEquals("a",parser.currentName());
255255
assertEquals(JsonToken.VALUE_STRING, parser.nextToken());
256256
assertEquals("va", parser.getValueAsString());
257257
assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
258-
assertEquals("c", parser.getCurrentName());
258+
assertEquals("c", parser.currentName());
259259
assertEquals(JsonToken.VALUE_STRING, parser.nextToken());
260260
assertEquals("vc", parser.getValueAsString());
261261
assertEquals(JsonToken.END_OBJECT, parser.nextToken());
@@ -271,15 +271,15 @@ public void testColumnReordering() throws IOException {
271271
parser.setSchema(schemaWithoutReordering);
272272
assertEquals(JsonToken.START_OBJECT, parser.nextToken());
273273
assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
274-
assertEquals("a", parser.getCurrentName());
274+
assertEquals("a", parser.currentName());
275275
assertEquals(JsonToken.VALUE_STRING, parser.nextToken());
276276
assertEquals("vb", parser.getValueAsString());
277277
assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
278-
assertEquals("b", parser.getCurrentName());
278+
assertEquals("b", parser.currentName());
279279
assertEquals(JsonToken.VALUE_STRING, parser.nextToken());
280280
assertEquals("va", parser.getValueAsString());
281281
assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
282-
assertEquals("c", parser.getCurrentName());
282+
assertEquals("c", parser.currentName());
283283
assertEquals(JsonToken.VALUE_STRING, parser.nextToken());
284284
assertEquals("vc", parser.getValueAsString());
285285
assertEquals(JsonToken.END_OBJECT, parser.nextToken());
@@ -297,15 +297,15 @@ public void testColumnReordering() throws IOException {
297297
parser.setSchema(schemaWithoutHeader);
298298
assertEquals(JsonToken.START_OBJECT, parser.nextToken());
299299
assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
300-
assertEquals("a", parser.getCurrentName());
300+
assertEquals("a", parser.currentName());
301301
assertEquals(JsonToken.VALUE_STRING, parser.nextToken());
302302
assertEquals("vb", parser.getValueAsString());
303303
assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
304-
assertEquals("b", parser.getCurrentName());
304+
assertEquals("b", parser.currentName());
305305
assertEquals(JsonToken.VALUE_STRING, parser.nextToken());
306306
assertEquals("va", parser.getValueAsString());
307307
assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
308-
assertEquals("c", parser.getCurrentName());
308+
assertEquals("c", parser.currentName());
309309
assertEquals(JsonToken.VALUE_STRING, parser.nextToken());
310310
assertEquals("vc", parser.getValueAsString());
311311
assertEquals(JsonToken.END_OBJECT, parser.nextToken());
@@ -324,15 +324,15 @@ public void testColumnReordering() throws IOException {
324324
parser.setSchema(emptySchema);
325325
assertEquals(JsonToken.START_OBJECT, parser.nextToken());
326326
assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
327-
assertEquals("b", parser.getCurrentName());
327+
assertEquals("b", parser.currentName());
328328
assertEquals(JsonToken.VALUE_STRING, parser.nextToken());
329329
assertEquals("vb", parser.getValueAsString());
330330
assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
331-
assertEquals("a", parser.getCurrentName());
331+
assertEquals("a", parser.currentName());
332332
assertEquals(JsonToken.VALUE_STRING, parser.nextToken());
333333
assertEquals("va", parser.getValueAsString());
334334
assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
335-
assertEquals("c", parser.getCurrentName());
335+
assertEquals("c", parser.currentName());
336336
assertEquals(JsonToken.VALUE_STRING, parser.nextToken());
337337
assertEquals("vc", parser.getValueAsString());
338338
assertEquals(JsonToken.END_OBJECT, parser.nextToken());

‎csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/BrokenEncodingTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void testLatin1AsUTF8() throws Exception
3333

3434
assertToken(JsonToken.START_OBJECT, parser.nextToken());
3535
assertToken(JsonToken.FIELD_NAME, parser.nextToken());
36-
assertEquals("a", parser.getCurrentName());
36+
assertEquals("a", parser.currentName());
3737
assertToken(JsonToken.VALUE_STRING, parser.nextToken());
3838
assertToken(JsonToken.FIELD_NAME, parser.nextToken());
3939
assertToken(JsonToken.VALUE_STRING, parser.nextToken());
@@ -43,7 +43,7 @@ public void testLatin1AsUTF8() throws Exception
4343
// problem should only be triggered now
4444
assertToken(JsonToken.START_OBJECT, parser.nextToken());
4545
assertToken(JsonToken.FIELD_NAME, parser.nextToken());
46-
assertEquals("a", parser.getCurrentName());
46+
assertEquals("a", parser.currentName());
4747
assertToken(JsonToken.VALUE_STRING, parser.nextToken());
4848
assertEquals("abc", parser.getText());
4949
try {
@@ -75,12 +75,12 @@ public void testBrokenUTF8MiddleByte() throws Exception
7575

7676
assertToken(JsonToken.START_OBJECT, parser.nextToken());
7777
assertToken(JsonToken.FIELD_NAME, parser.nextToken());
78-
assertEquals("a", parser.getCurrentName());
78+
assertEquals("a", parser.currentName());
7979
assertToken(JsonToken.VALUE_STRING, parser.nextToken());
8080
assertEquals("1", parser.getText());
8181
try {
8282
assertToken(JsonToken.FIELD_NAME, parser.nextToken());
83-
assertEquals("b", parser.getCurrentName());
83+
assertEquals("b", parser.currentName());
8484
parser.nextToken();
8585
fail("Should trigger exception for invalid UTF-8 char");
8686
} catch (CharConversionException e) {

‎csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/StreamingReadTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private void _testInts(boolean useBytes, int a, int b, int c) throws Exception {
6767
assertToken(JsonToken.START_OBJECT, parser.nextToken());
6868

6969
assertToken(JsonToken.FIELD_NAME, parser.nextToken());
70-
assertEquals("a", parser.getCurrentName());
70+
assertEquals("a", parser.currentName());
7171

7272
StringWriter w = new StringWriter();
7373
assertEquals(1, parser.getText(w));
@@ -109,7 +109,7 @@ private void _testLongs(boolean useBytes, long a, long b) throws Exception
109109
assertToken(JsonToken.START_OBJECT, parser.nextToken());
110110

111111
assertToken(JsonToken.FIELD_NAME, parser.nextToken());
112-
assertEquals("a", parser.getCurrentName());
112+
assertEquals("a", parser.currentName());
113113
assertEquals(""+a, parser.nextTextValue());
114114
assertEquals(a, parser.getLongValue());
115115

@@ -131,7 +131,7 @@ private void _testDoubles(boolean useBytes, double a, double b, double c)
131131
assertToken(JsonToken.START_OBJECT, parser.nextToken());
132132

133133
assertToken(JsonToken.FIELD_NAME, parser.nextToken());
134-
assertEquals("a", parser.getCurrentName());
134+
assertEquals("a", parser.currentName());
135135
assertEquals(""+a, parser.nextTextValue());
136136
assertEquals(a, parser.getDoubleValue());
137137
assertEquals((float) a, parser.getFloatValue());

‎properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/JavaPropsParser.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,18 +175,18 @@ public void overrideCurrentName(String name) {
175175
*/
176176

177177
@Override
178-
public String getCurrentName() throws IOException {
178+
public String currentName() throws IOException {
179179
if (_readContext == null) {
180180
return null;
181181
}
182182
// [JACKSON-395]: start markers require information from parent
183183
if (_currToken == JsonToken.START_OBJECT || _currToken == JsonToken.START_ARRAY) {
184184
JPropReadContext parent = _readContext.getParent();
185185
if (parent != null) {
186-
return parent.getCurrentName();
186+
return parent.currentName();
187187
}
188188
}
189-
return _readContext.getCurrentName();
189+
return _readContext.currentName();
190190
}
191191

192192
@Override
@@ -224,7 +224,7 @@ public String getText() throws IOException {
224224
return _readContext.getCurrentText();
225225
}
226226
if (t == JsonToken.FIELD_NAME) {
227-
return _readContext.getCurrentName();
227+
return _readContext.currentName();
228228
}
229229
// shouldn't have non-String scalar values so:
230230
return (t == null) ? null : t.asString();

‎properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/io/JPropReadContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public static JPropReadContext create(JPropNode root) {
7272
public final JPropReadContext getParent() { return _parent; }
7373

7474
@Override
75-
public final String getCurrentName() {
75+
public final String currentName() {
7676
return _currentName;
7777
}
7878

‎properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/io/JPropWriteContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public void truncatePath(StringBuilder sb) {
150150
public final JPropWriteContext getParent() { return _parent; }
151151

152152
@Override
153-
public String getCurrentName() {
153+
public String currentName() {
154154
return _currentName;
155155
}
156156

‎properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/ModuleTestBase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,11 @@ protected String getAndVerifyText(JsonParser jp) throws IOException
215215
return str;
216216
}
217217

218-
protected void verifyFieldName(JsonParser jp, String expName)
218+
protected void verifyFieldName(JsonParser p, String expName)
219219
throws IOException
220220
{
221-
assertEquals(expName, jp.getText());
222-
assertEquals(expName, jp.getCurrentName());
221+
assertEquals(expName, p.getText());
222+
assertEquals(expName, p.currentName());
223223
}
224224

225225
protected void verifyIntValue(JsonParser jp, long expValue)

‎yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,12 +579,12 @@ public String getText() throws IOException
579579
}
580580

581581
@Override
582-
public String getCurrentName() throws IOException
582+
public String currentName() throws IOException
583583
{
584584
if (_currToken == JsonToken.FIELD_NAME) {
585585
return _currentFieldName;
586586
}
587-
return super.getCurrentName();
587+
return super.currentName();
588588
}
589589

590590
@Override

0 commit comments

Comments
 (0)