From 6b3977368d0795664e204ed59b09f48ddca6934d Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Sat, 9 Dec 2023 14:36:17 -0800 Subject: [PATCH] Remove compiler warnings (#448) --- .../jackson/dataformat/csv/CsvParser.java | 28 +++++-- .../dataformat/csv/ModuleTestBase.java | 26 +++--- .../csv/deser/BasicCSVParserTest.java | 24 +++--- .../csv/deser/BrokenEncodingTest.java | 8 +- .../csv/deser/StreamingCSVReadTest.java | 6 +- .../dataformat/javaprop/JavaPropsParser.java | 72 ++++++++++------ .../dataformat/javaprop/ModuleTestBase.java | 26 +++--- .../javaprop/SimpleStreamingTest.java | 4 +- .../jackson/dataformat/yaml/YAMLParser.java | 48 +++++++---- .../dataformat/yaml/FormatDetectionTest.java | 4 +- .../dataformat/yaml/ModuleTestBase.java | 26 +++--- .../yaml/MultipleDocumentsReadTest.java | 4 +- .../yaml/deser/StreamingParseTest.java | 82 +++++++++---------- yaml/src/test/java/perf/MediaItem.java | 6 +- 14 files changed, 206 insertions(+), 158 deletions(-) diff --git a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java index b6dac4e2..60a27d0d 100644 --- a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java +++ b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java @@ -612,15 +612,23 @@ public JsonStreamContext getParsingContext() { return _parsingContext; } - @Override - public JsonLocation getTokenLocation() { + @Override // since 2.17 + public JsonLocation currentLocation() { + return _reader.getCurrentLocation(); + } + + @Override // since 2.17 + public JsonLocation currentTokenLocation() { return _reader.getTokenLocation(); } + @Deprecated // since 2.17 @Override - public JsonLocation getCurrentLocation() { - return _reader.getCurrentLocation(); - } + public JsonLocation getCurrentLocation() { return currentLocation(); } + + @Deprecated // since 2.17 + @Override + public JsonLocation getTokenLocation() { return currentTokenLocation(); } @Override public Object getInputSource() { @@ -695,8 +703,8 @@ public boolean isExpectedNumberIntToken() return (t == JsonToken.VALUE_NUMBER_INT); } - @Override - public String getCurrentName() throws IOException { + @Override // since 2.17 + public String currentName() throws IOException { return _currentName; } @@ -705,6 +713,12 @@ public void overrideCurrentName(String name) { _currentName = name; } + @Deprecated // since 2.17 + @Override + public String getCurrentName() throws IOException { + return currentName(); + } + @Override public JsonToken nextToken() throws IOException { diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/ModuleTestBase.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/ModuleTestBase.java index 2bc930fc..118670bd 100644 --- a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/ModuleTestBase.java +++ b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/ModuleTestBase.java @@ -248,8 +248,8 @@ protected void assertToken(JsonToken expToken, JsonToken actToken) { } } - protected void assertToken(JsonToken expToken, JsonParser jp) { - assertToken(expToken, jp.getCurrentToken()); + protected void assertToken(JsonToken expToken, JsonParser p) { + assertToken(expToken, p.getCurrentToken()); } protected void assertType(Object ob, Class expType) @@ -268,35 +268,35 @@ protected void assertType(Object ob, Class expType) * available methods, and ensures results are consistent, before * returning them */ - protected String getAndVerifyText(JsonParser jp) + protected String getAndVerifyText(JsonParser p) throws IOException, JsonParseException { // Ok, let's verify other accessors - int actLen = jp.getTextLength(); - char[] ch = jp.getTextCharacters(); - String str2 = new String(ch, jp.getTextOffset(), actLen); - String str = jp.getText(); + int actLen = p.getTextLength(); + char[] ch = p.getTextCharacters(); + String str2 = new String(ch, p.getTextOffset(), actLen); + String str = p.getText(); if (str.length() != actLen) { - fail("Internal problem (jp.token == "+jp.getCurrentToken()+"): jp.getText().length() ['"+str+"'] == "+str.length()+"; jp.getTextLength() == "+actLen); + fail("Internal problem (p.token == "+p.getCurrentToken()+"): p.getText().length() ['"+str+"'] == "+str.length()+"; p.getTextLength() == "+actLen); } assertEquals("String access via getText(), getTextXxx() must be the same", str, str2); return str; } - protected void verifyFieldName(JsonParser jp, String expName) + protected void verifyFieldName(JsonParser p, String expName) throws IOException { - assertEquals(expName, jp.getText()); - assertEquals(expName, jp.getCurrentName()); + assertEquals(expName, p.getText()); + assertEquals(expName, p.currentName()); } - protected void verifyIntValue(JsonParser jp, long expValue) + protected void verifyIntValue(JsonParser p, long expValue) throws IOException { // First, via textual - assertEquals(String.valueOf(expValue), jp.getText()); + assertEquals(String.valueOf(expValue), p.getText()); } protected void verifyException(Throwable e, String... matches) diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/BasicCSVParserTest.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/BasicCSVParserTest.java index b586cab6..c91b7efd 100644 --- a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/BasicCSVParserTest.java +++ b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/BasicCSVParserTest.java @@ -251,15 +251,15 @@ public void testColumnReordering() throws IOException { parser.setSchema(schemaWithReordering); assertEquals(JsonToken.START_OBJECT, parser.nextToken()); assertEquals(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("b", parser.getCurrentName()); + assertEquals("b", parser.currentName()); assertEquals(JsonToken.VALUE_STRING, parser.nextToken()); assertEquals("vb", parser.getValueAsString()); assertEquals(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("a",parser.getCurrentName()); + assertEquals("a",parser.currentName()); assertEquals(JsonToken.VALUE_STRING, parser.nextToken()); assertEquals("va", parser.getValueAsString()); assertEquals(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("c", parser.getCurrentName()); + assertEquals("c", parser.currentName()); assertEquals(JsonToken.VALUE_STRING, parser.nextToken()); assertEquals("vc", parser.getValueAsString()); assertEquals(JsonToken.END_OBJECT, parser.nextToken()); @@ -275,15 +275,15 @@ public void testColumnReordering() throws IOException { parser.setSchema(schemaWithoutReordering); assertEquals(JsonToken.START_OBJECT, parser.nextToken()); assertEquals(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("a", parser.getCurrentName()); + assertEquals("a", parser.currentName()); assertEquals(JsonToken.VALUE_STRING, parser.nextToken()); assertEquals("vb", parser.getValueAsString()); assertEquals(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("b", parser.getCurrentName()); + assertEquals("b", parser.currentName()); assertEquals(JsonToken.VALUE_STRING, parser.nextToken()); assertEquals("va", parser.getValueAsString()); assertEquals(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("c", parser.getCurrentName()); + assertEquals("c", parser.currentName()); assertEquals(JsonToken.VALUE_STRING, parser.nextToken()); assertEquals("vc", parser.getValueAsString()); assertEquals(JsonToken.END_OBJECT, parser.nextToken()); @@ -301,15 +301,15 @@ public void testColumnReordering() throws IOException { parser.setSchema(schemaWithoutHeader); assertEquals(JsonToken.START_OBJECT, parser.nextToken()); assertEquals(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("a", parser.getCurrentName()); + assertEquals("a", parser.currentName()); assertEquals(JsonToken.VALUE_STRING, parser.nextToken()); assertEquals("vb", parser.getValueAsString()); assertEquals(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("b", parser.getCurrentName()); + assertEquals("b", parser.currentName()); assertEquals(JsonToken.VALUE_STRING, parser.nextToken()); assertEquals("va", parser.getValueAsString()); assertEquals(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("c", parser.getCurrentName()); + assertEquals("c", parser.currentName()); assertEquals(JsonToken.VALUE_STRING, parser.nextToken()); assertEquals("vc", parser.getValueAsString()); assertEquals(JsonToken.END_OBJECT, parser.nextToken()); @@ -328,15 +328,15 @@ public void testColumnReordering() throws IOException { parser.setSchema(emptySchema); assertEquals(JsonToken.START_OBJECT, parser.nextToken()); assertEquals(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("b", parser.getCurrentName()); + assertEquals("b", parser.currentName()); assertEquals(JsonToken.VALUE_STRING, parser.nextToken()); assertEquals("vb", parser.getValueAsString()); assertEquals(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("a", parser.getCurrentName()); + assertEquals("a", parser.currentName()); assertEquals(JsonToken.VALUE_STRING, parser.nextToken()); assertEquals("va", parser.getValueAsString()); assertEquals(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("c", parser.getCurrentName()); + assertEquals("c", parser.currentName()); assertEquals(JsonToken.VALUE_STRING, parser.nextToken()); assertEquals("vc", parser.getValueAsString()); assertEquals(JsonToken.END_OBJECT, parser.nextToken()); diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/BrokenEncodingTest.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/BrokenEncodingTest.java index 54ad4b31..04b92243 100644 --- a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/BrokenEncodingTest.java +++ b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/BrokenEncodingTest.java @@ -30,7 +30,7 @@ public void testLatin1AsUTF8() throws Exception assertToken(JsonToken.START_OBJECT, parser.nextToken()); assertToken(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("a", parser.getCurrentName()); + assertEquals("a", parser.currentName()); assertToken(JsonToken.VALUE_STRING, parser.nextToken()); assertToken(JsonToken.FIELD_NAME, parser.nextToken()); assertToken(JsonToken.VALUE_STRING, parser.nextToken()); @@ -40,7 +40,7 @@ public void testLatin1AsUTF8() throws Exception // problem should only be triggered now assertToken(JsonToken.START_OBJECT, parser.nextToken()); assertToken(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("a", parser.getCurrentName()); + assertEquals("a", parser.currentName()); assertToken(JsonToken.VALUE_STRING, parser.nextToken()); assertEquals("abc", parser.getText()); try { @@ -73,12 +73,12 @@ public void testBrokenUTF8MiddleByte() throws Exception assertToken(JsonToken.START_OBJECT, parser.nextToken()); assertToken(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("a", parser.getCurrentName()); + assertEquals("a", parser.currentName()); assertToken(JsonToken.VALUE_STRING, parser.nextToken()); assertEquals("1", parser.getText()); try { assertToken(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("b", parser.getCurrentName()); + assertEquals("b", parser.currentName()); parser.nextToken(); fail("Should trigger exception for invalid UTF-8 char"); } catch (CharConversionException e) { diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/StreamingCSVReadTest.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/StreamingCSVReadTest.java index f5ea95eb..0a034e8a 100644 --- a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/StreamingCSVReadTest.java +++ b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/StreamingCSVReadTest.java @@ -75,7 +75,7 @@ private void _testInts(boolean useBytes, int a, int b, int c) throws Exception { assertToken(JsonToken.START_OBJECT, parser.nextToken()); assertToken(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("a", parser.getCurrentName()); + assertEquals("a", parser.currentName()); StringWriter w = new StringWriter(); assertEquals(1, parser.getText(w)); @@ -149,7 +149,7 @@ private void _testLongs(boolean useBytes, long a, long b) throws Exception assertToken(JsonToken.START_OBJECT, parser.nextToken()); assertToken(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("a", parser.getCurrentName()); + assertEquals("a", parser.currentName()); assertEquals(""+a, parser.nextTextValue()); assertEquals(a, parser.getLongValue()); @@ -171,7 +171,7 @@ private void _testDoubles(boolean useBytes, double a, double b, double c) assertToken(JsonToken.START_OBJECT, parser.nextToken()); assertToken(JsonToken.FIELD_NAME, parser.nextToken()); - assertEquals("a", parser.getCurrentName()); + assertEquals("a", parser.currentName()); assertEquals(""+a, parser.nextTextValue()); assertEquals(a, parser.getDoubleValue()); assertEquals((float) a, parser.getFloatValue()); diff --git a/properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/JavaPropsParser.java b/properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/JavaPropsParser.java index 037064e9..cdbba9f0 100644 --- a/properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/JavaPropsParser.java +++ b/properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/JavaPropsParser.java @@ -226,32 +226,12 @@ public JsonStreamContext getParsingContext() { return _readContext; } - @Override - public void overrideCurrentName(String name) { - _readContext.overrideCurrentName(name); - } - /* /********************************************************** - /* Main parsing API, textual values + /* Main parsing API, traversal /********************************************************** */ - @Override - public String getCurrentName() throws IOException { - if (_readContext == null) { - return null; - } - // [JACKSON-395]: start markers require information from parent - if (_currToken == JsonToken.START_OBJECT || _currToken == JsonToken.START_ARRAY) { - JPropReadContext parent = _readContext.getParent(); - if (parent != null) { - return parent.getCurrentName(); - } - } - return _readContext.getCurrentName(); - } - @Override public JsonToken nextToken() throws IOException { _binaryValue = null; @@ -280,6 +260,38 @@ public JsonToken nextToken() throws IOException { return _currToken; } + /* + /********************************************************** + /* Main parsing API, textual values + /********************************************************** + */ + + @Override // since 2.17 + public String currentName() throws IOException { + if (_readContext == null) { + return null; + } + // [JACKSON-395]: start markers require information from parent + if (_currToken == JsonToken.START_OBJECT || _currToken == JsonToken.START_ARRAY) { + JPropReadContext parent = _readContext.getParent(); + if (parent != null) { + return parent.getCurrentName(); + } + } + return _readContext.getCurrentName(); + } + + @Override + public void overrideCurrentName(String name) { + _readContext.overrideCurrentName(name); + } + + @Deprecated // since 2.17 + @Override + public String getCurrentName() throws IOException { + return currentName(); + } + @Override public String getText() throws IOException { JsonToken t = _currToken; @@ -362,19 +374,27 @@ public Object getEmbeddedObject() throws IOException { return null; } - @Override - public JsonLocation getTokenLocation() { + @Override // since 2.17 + public JsonLocation currentLocation() { return JsonLocation.NA; } - @Override - public JsonLocation getCurrentLocation() { + @Override // since 2.17 + public JsonLocation currentTokenLocation() { return JsonLocation.NA; } + @Deprecated // since 2.17 + @Override + public JsonLocation getCurrentLocation() { return currentLocation(); } + + @Deprecated // since 2.17 + @Override + public JsonLocation getTokenLocation() { return currentTokenLocation(); } + /* /********************************************************** - /* Main parsing API, textual values + /* Main parsing API, numeric values /********************************************************** */ diff --git a/properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/ModuleTestBase.java b/properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/ModuleTestBase.java index 2b93a4e9..6833c7a4 100644 --- a/properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/ModuleTestBase.java +++ b/properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/ModuleTestBase.java @@ -195,8 +195,8 @@ protected void assertToken(JsonToken expToken, JsonToken actToken) { } } - protected void assertToken(JsonToken expToken, JsonParser jp) { - assertToken(expToken, jp.getCurrentToken()); + protected void assertToken(JsonToken expToken, JsonParser p) { + assertToken(expToken, p.getCurrentToken()); } protected void assertType(Object ob, Class expType) @@ -215,34 +215,34 @@ protected void assertType(Object ob, Class expType) * available methods, and ensures results are consistent, before * returning them */ - protected String getAndVerifyText(JsonParser jp) throws IOException + protected String getAndVerifyText(JsonParser p) throws IOException { // Ok, let's verify other accessors - int actLen = jp.getTextLength(); - char[] ch = jp.getTextCharacters(); - String str2 = new String(ch, jp.getTextOffset(), actLen); - String str = jp.getText(); + int actLen = p.getTextLength(); + char[] ch = p.getTextCharacters(); + String str2 = new String(ch, p.getTextOffset(), actLen); + String str = p.getText(); if (str.length() != actLen) { - fail("Internal problem (jp.token == "+jp.getCurrentToken()+"): jp.getText().length() ['"+str+"'] == "+str.length()+"; jp.getTextLength() == "+actLen); + fail("Internal problem (p.token == "+p.getCurrentToken()+"): p.getText().length() ['"+str+"'] == "+str.length()+"; p.getTextLength() == "+actLen); } assertEquals("String access via getText(), getTextXxx() must be the same", str, str2); return str; } - protected void verifyFieldName(JsonParser jp, String expName) + protected void verifyFieldName(JsonParser p, String expName) throws IOException { - assertEquals(expName, jp.getText()); - assertEquals(expName, jp.getCurrentName()); + assertEquals(expName, p.getText()); + assertEquals(expName, p.currentName()); } - protected void verifyIntValue(JsonParser jp, long expValue) + protected void verifyIntValue(JsonParser p, long expValue) throws IOException { // First, via textual - assertEquals(String.valueOf(expValue), jp.getText()); + assertEquals(String.valueOf(expValue), p.getText()); } protected void verifyException(Throwable e, String... matches) diff --git a/properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/SimpleStreamingTest.java b/properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/SimpleStreamingTest.java index 78176be0..5d7fe0ea 100644 --- a/properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/SimpleStreamingTest.java +++ b/properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/SimpleStreamingTest.java @@ -29,8 +29,8 @@ public void testParsing() throws Exception assertTrue(src instanceof Reader); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertNull(p.getEmbeddedObject()); - assertNotNull(p.getCurrentLocation()); // N/A - assertNotNull(p.getTokenLocation()); // N/A + assertNotNull(p.currentLocation()); // N/A + assertNotNull(p.currentTokenLocation()); // N/A assertToken(JsonToken.FIELD_NAME, p.nextToken()); assertEquals("foo", p.getText()); assertToken(JsonToken.VALUE_STRING, p.nextToken()); diff --git a/yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLParser.java b/yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLParser.java index e67df115..cc603cd9 100644 --- a/yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLParser.java +++ b/yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLParser.java @@ -375,23 +375,31 @@ public boolean isEnabled(YAMLParser.Feature f) { /********************************************************** */ - @Override - public JsonLocation getTokenLocation() - { + @Override // since 2.17 + public JsonLocation currentLocation() { + // can assume we are at the end of token now... if (_lastEvent == null) { return JsonLocation.NA; } - return _locationFor(_lastEvent.getStartMark()); + return _locationFor(_lastEvent.getEndMark()); } - @Override - public JsonLocation getCurrentLocation() { - // can assume we are at the end of token now... + @Override // since 2.17 + public JsonLocation currentTokenLocation() + { if (_lastEvent == null) { return JsonLocation.NA; } - return _locationFor(_lastEvent.getEndMark()); + return _locationFor(_lastEvent.getStartMark()); } + + @Deprecated // since 2.17 + @Override + public JsonLocation getCurrentLocation() { return currentLocation(); } + + @Deprecated // since 2.17 + @Override + public JsonLocation getTokenLocation() { return currentTokenLocation(); } protected JsonLocation _locationFor(Mark m) { @@ -915,6 +923,21 @@ private T _reportInvalidNumber(String str, int base, Exception e) throws IOE /********************************************************** */ + @Override // since 2.17 + public String currentName() throws IOException + { + if (_currToken == JsonToken.FIELD_NAME) { + return _currentFieldName; + } + return super.currentName(); + } + + @Deprecated // since 2.17 + @Override + public String getCurrentName() throws IOException { + return currentName(); + } + // For now we do not store char[] representation... @Override public boolean hasTextCharacters() { @@ -939,15 +962,6 @@ public String getText() throws IOException return null; } - @Override - public String getCurrentName() throws IOException - { - if (_currToken == JsonToken.FIELD_NAME) { - return _currentFieldName; - } - return super.getCurrentName(); - } - @Override public char[] getTextCharacters() throws IOException { String text = getText(); diff --git a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/FormatDetectionTest.java b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/FormatDetectionTest.java index 62c435cc..5ba041ca 100644 --- a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/FormatDetectionTest.java +++ b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/FormatDetectionTest.java @@ -29,7 +29,7 @@ public void testFormatDetection() throws Exception JsonParser p = match.createParserWithMatch(); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("name", p.getCurrentName()); + assertEquals("name", p.currentName()); assertToken(JsonToken.VALUE_STRING, p.nextToken()); assertEquals("Bob", p.getText()); assertToken(JsonToken.END_OBJECT, p.nextToken()); @@ -43,7 +43,7 @@ public void testFormatDetection() throws Exception p = match.createParserWithMatch(); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("name", p.getCurrentName()); + assertEquals("name", p.currentName()); assertToken(JsonToken.VALUE_STRING, p.nextToken()); assertEquals("Bob", p.getText()); assertToken(JsonToken.END_OBJECT, p.nextToken()); diff --git a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/ModuleTestBase.java b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/ModuleTestBase.java index cb6c955a..e8aa3dbd 100644 --- a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/ModuleTestBase.java +++ b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/ModuleTestBase.java @@ -106,9 +106,9 @@ protected void assertToken(JsonToken expToken, JsonToken actToken) } } - protected void assertToken(JsonToken expToken, JsonParser jp) + protected void assertToken(JsonToken expToken, JsonParser p) { - assertToken(expToken, jp.getCurrentToken()); + assertToken(expToken, p.getCurrentToken()); } protected void assertType(Object ob, Class expType) @@ -137,35 +137,35 @@ protected void assertYAML(String expOrig, String actOrig) * available methods, and ensures results are consistent, before * returning them */ - protected String getAndVerifyText(JsonParser jp) + protected String getAndVerifyText(JsonParser p) throws IOException, JsonParseException { // Ok, let's verify other accessors - int actLen = jp.getTextLength(); - char[] ch = jp.getTextCharacters(); - String str2 = new String(ch, jp.getTextOffset(), actLen); - String str = jp.getText(); + int actLen = p.getTextLength(); + char[] ch = p.getTextCharacters(); + String str2 = new String(ch, p.getTextOffset(), actLen); + String str = p.getText(); if (str.length() != actLen) { - fail("Internal problem (jp.token == "+jp.getCurrentToken()+"): jp.getText().length() ['"+str+"'] == "+str.length()+"; jp.getTextLength() == "+actLen); + fail("Internal problem (p.token == "+p.getCurrentToken()+"): p.getText().length() ['"+str+"'] == "+str.length()+"; p.getTextLength() == "+actLen); } assertEquals("String access via getText(), getTextXxx() must be the same", str, str2); return str; } - protected void verifyFieldName(JsonParser jp, String expName) + protected void verifyFieldName(JsonParser p, String expName) throws IOException { - assertEquals(expName, jp.getText()); - assertEquals(expName, jp.getCurrentName()); + assertEquals(expName, p.getText()); + assertEquals(expName, p.currentName()); } - protected void verifyIntValue(JsonParser jp, long expValue) + protected void verifyIntValue(JsonParser p, long expValue) throws IOException { // First, via textual - assertEquals(String.valueOf(expValue), jp.getText()); + assertEquals(String.valueOf(expValue), p.getText()); } protected void verifyException(Throwable e, String... matches) diff --git a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/MultipleDocumentsReadTest.java b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/MultipleDocumentsReadTest.java index 16b60697..9521d701 100644 --- a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/MultipleDocumentsReadTest.java +++ b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/MultipleDocumentsReadTest.java @@ -22,7 +22,7 @@ public void testMultipleDocumentsViaParser() throws Exception JsonParser p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(42, p.getIntValue()); assertEquals(JsonParser.NumberType.INT, p.getNumberType()); @@ -30,7 +30,7 @@ public void testMultipleDocumentsViaParser() throws Exception assertToken(JsonToken.END_OBJECT, p.nextToken()); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(-42, p.getIntValue()); assertEquals(JsonParser.NumberType.INT, p.getNumberType()); diff --git a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/deser/StreamingParseTest.java b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/deser/StreamingParseTest.java index c60cdc52..7521d780 100644 --- a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/deser/StreamingParseTest.java +++ b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/deser/StreamingParseTest.java @@ -37,7 +37,7 @@ public void testBasic() throws Exception assertToken(JsonToken.FIELD_NAME, p.nextToken()); assertToken(JsonToken.VALUE_STRING, p.nextToken()); assertEquals("text", p.getText()); - JsonLocation loc = p.getTokenLocation(); + JsonLocation loc = p.currentTokenLocation(); assertEquals(1, loc.getLineNr()); assertEquals(9, loc.getColumnNr()); assertEquals(8, loc.getCharOffset()); @@ -46,7 +46,7 @@ public void testBasic() throws Exception assertToken(JsonToken.FIELD_NAME, p.nextToken()); assertToken(JsonToken.VALUE_TRUE, p.nextToken()); assertEquals("true", p.getText()); - loc = p.getTokenLocation(); + loc = p.currentTokenLocation(); assertEquals(2, loc.getLineNr()); assertEquals(7, loc.getColumnNr()); assertEquals(21, loc.getCharOffset()); @@ -86,7 +86,7 @@ public void testIntParsingWithLimits() throws Exception p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(Integer.MAX_VALUE, p.getIntValue()); assertEquals(JsonParser.NumberType.INT, p.getNumberType()); @@ -98,7 +98,7 @@ public void testIntParsingWithLimits() throws Exception p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(Integer.MIN_VALUE, p.getIntValue()); assertEquals(JsonParser.NumberType.INT, p.getNumberType()); @@ -110,7 +110,7 @@ public void testIntParsingWithLimits() throws Exception p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(Integer.MAX_VALUE + 1L, p.getLongValue()); assertEquals(JsonParser.NumberType.LONG, p.getNumberType()); @@ -122,7 +122,7 @@ public void testIntParsingWithLimits() throws Exception p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(Integer.MIN_VALUE - 1L, p.getLongValue()); assertEquals(JsonParser.NumberType.LONG, p.getNumberType()); @@ -134,7 +134,7 @@ public void testIntParsingWithLimits() throws Exception p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(Long.MAX_VALUE, p.getLongValue()); assertEquals(JsonParser.NumberType.LONG, p.getNumberType()); @@ -146,7 +146,7 @@ public void testIntParsingWithLimits() throws Exception p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(Long.MIN_VALUE, p.getLongValue()); assertEquals(JsonParser.NumberType.LONG, p.getNumberType()); @@ -158,7 +158,7 @@ public void testIntParsingWithLimits() throws Exception p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE), p.getBigIntegerValue()); assertEquals(JsonParser.NumberType.BIG_INTEGER, p.getNumberType()); @@ -170,7 +170,7 @@ public void testIntParsingWithLimits() throws Exception p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(BigInteger.valueOf(Long.MIN_VALUE).subtract(BigInteger.ONE), p.getBigIntegerValue()); assertEquals(JsonParser.NumberType.BIG_INTEGER, p.getNumberType()); @@ -185,7 +185,7 @@ public void testIntParsingUnderscoresSm() throws Exception try (JsonParser p = YAML_F.createParser("num: 10_345")) { assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(10345, p.getIntValue()); assertEquals(JsonParser.NumberType.INT, p.getNumberType()); @@ -196,7 +196,7 @@ public void testIntParsingUnderscoresSm() throws Exception try (JsonParser p = YAML_F.createParser("num: -11_222")) { assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(-11222, p.getIntValue()); assertEquals(JsonParser.NumberType.INT, p.getNumberType()); @@ -207,7 +207,7 @@ public void testIntParsingUnderscoresSm() throws Exception try (JsonParser p = YAML_F.createParser("num: +8_192")) { assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(8192, p.getIntValue()); assertEquals(JsonParser.NumberType.INT, p.getNumberType()); @@ -223,7 +223,7 @@ public void testIntParsingUnderscoresSm() throws Exception p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(Integer.MAX_VALUE, p.getIntValue()); assertEquals(JsonParser.NumberType.INT, p.getNumberType()); @@ -235,7 +235,7 @@ public void testIntParsingUnderscoresSm() throws Exception p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(Integer.MIN_VALUE, p.getIntValue()); assertEquals(JsonParser.NumberType.INT, p.getNumberType()); @@ -247,7 +247,7 @@ public void testIntParsingUnderscoresSm() throws Exception p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(Integer.MAX_VALUE + 1L, p.getLongValue()); assertEquals(JsonParser.NumberType.LONG, p.getNumberType()); @@ -259,7 +259,7 @@ public void testIntParsingUnderscoresSm() throws Exception p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(Integer.MIN_VALUE - 1L, p.getLongValue()); assertEquals(JsonParser.NumberType.LONG, p.getNumberType()); @@ -271,7 +271,7 @@ public void testIntParsingUnderscoresSm() throws Exception p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(Long.MAX_VALUE, p.getLongValue()); assertEquals(JsonParser.NumberType.LONG, p.getNumberType()); @@ -283,7 +283,7 @@ public void testIntParsingUnderscoresSm() throws Exception p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(Long.MIN_VALUE, p.getLongValue()); assertEquals(JsonParser.NumberType.LONG, p.getNumberType()); @@ -295,7 +295,7 @@ public void testIntParsingUnderscoresSm() throws Exception p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE), p.getBigIntegerValue()); assertEquals(JsonParser.NumberType.BIG_INTEGER, p.getNumberType()); @@ -307,7 +307,7 @@ public void testIntParsingUnderscoresSm() throws Exception p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(BigInteger.valueOf(Long.MIN_VALUE).subtract(BigInteger.ONE), p.getBigIntegerValue()); assertEquals(JsonParser.NumberType.BIG_INTEGER, p.getNumberType()); @@ -338,7 +338,7 @@ public void testDoubleParsing() throws Exception assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("num", p.getCurrentName()); + assertEquals("num", p.currentName()); StringWriter w = new StringWriter(); assertEquals(3, p.getText(w)); @@ -358,7 +358,7 @@ public void testDoubleParsing() throws Exception p = YAML_F.createParser(YAML); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("ip", p.getCurrentName()); + assertEquals("ip", p.currentName()); // should be considered a String... assertToken(JsonToken.VALUE_STRING, p.nextToken()); @@ -381,10 +381,10 @@ public void testColons() throws Exception assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("section", p.getCurrentName()); + assertEquals("section", p.currentName()); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("text", p.getCurrentName()); + assertEquals("text", p.currentName()); assertToken(JsonToken.VALUE_STRING, p.nextToken()); assertEquals("foo:bar", p.getText()); assertToken(JsonToken.END_OBJECT, p.nextToken()); @@ -414,7 +414,7 @@ public void testAnchorParsing() throws Exception assertNull(yp.getObjectId()); assertToken(JsonToken.FIELD_NAME, yp.nextToken()); - assertEquals("parent", yp.getCurrentName()); + assertEquals("parent", yp.currentName()); assertFalse(yp.isCurrentAlias()); assertNull(yp.getObjectId()); @@ -422,24 +422,24 @@ public void testAnchorParsing() throws Exception assertFalse(yp.isCurrentAlias()); assertEquals("id1", yp.getObjectId()); assertToken(JsonToken.FIELD_NAME, yp.nextToken()); - assertEquals("name", yp.getCurrentName()); + assertEquals("name", yp.currentName()); assertToken(JsonToken.VALUE_STRING, yp.nextToken()); assertEquals("Bob", yp.getText()); assertFalse(yp.isCurrentAlias()); assertToken(JsonToken.END_OBJECT, yp.nextToken()); assertToken(JsonToken.FIELD_NAME, yp.nextToken()); - assertEquals("child", yp.getCurrentName()); + assertEquals("child", yp.currentName()); assertFalse(yp.isCurrentAlias()); assertToken(JsonToken.START_OBJECT, yp.nextToken()); assertFalse(yp.isCurrentAlias()); assertEquals("id2", yp.getObjectId()); assertToken(JsonToken.FIELD_NAME, yp.nextToken()); - assertEquals("name", yp.getCurrentName()); + assertEquals("name", yp.currentName()); assertToken(JsonToken.VALUE_STRING, yp.nextToken()); assertEquals("Bill", yp.getText()); assertToken(JsonToken.FIELD_NAME, yp.nextToken()); - assertEquals("parentRef", yp.getCurrentName()); + assertEquals("parentRef", yp.currentName()); assertToken(JsonToken.VALUE_STRING, yp.nextToken()); assertEquals("id1", yp.getText()); assertTrue(yp.isCurrentAlias()); @@ -459,7 +459,7 @@ public void testQuotedStyles() throws Exception assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("strings", p.getCurrentName()); + assertEquals("strings", p.currentName()); assertToken(JsonToken.START_ARRAY, p.nextToken()); assertToken(JsonToken.VALUE_STRING, p.nextToken()); assertEquals(0, p.getParsingContext().getCurrentIndex()); @@ -482,7 +482,7 @@ public void testUnquotedStyles() throws Exception assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("booleans", p.getCurrentName()); + assertEquals("booleans", p.currentName()); assertToken(JsonToken.START_ARRAY, p.nextToken()); assertToken(JsonToken.VALUE_TRUE, p.nextToken()); assertToken(JsonToken.VALUE_FALSE, p.nextToken()); @@ -510,29 +510,29 @@ public void testObjectWithNumbers() throws Exception assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("content", p.getCurrentName()); + assertEquals("content", p.currentName()); assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("uri", p.getCurrentName()); + assertEquals("uri", p.currentName()); assertToken(JsonToken.VALUE_STRING, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("title", p.getCurrentName()); + assertEquals("title", p.currentName()); assertToken(JsonToken.VALUE_STRING, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("width", p.getCurrentName()); + assertEquals("width", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(640, p.getIntValue()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("height", p.getCurrentName()); + assertEquals("height", p.currentName()); assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken()); assertEquals(480, p.getIntValue()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("persons", p.getCurrentName()); + assertEquals("persons", p.currentName()); assertToken(JsonToken.START_ARRAY, p.nextToken()); assertToken(JsonToken.VALUE_STRING, p.nextToken()); @@ -557,7 +557,7 @@ public void testNulls() throws Exception assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("nulls", p.getCurrentName()); + assertEquals("nulls", p.currentName()); assertToken(JsonToken.START_ARRAY, p.nextToken()); assertToken(JsonToken.VALUE_NULL, p.nextToken()); assertToken(JsonToken.END_ARRAY, p.nextToken()); @@ -574,7 +574,7 @@ public void testTildeNulls() throws Exception assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("nulls", p.getCurrentName()); + assertEquals("nulls", p.currentName()); assertToken(JsonToken.START_ARRAY, p.nextToken()); assertToken(JsonToken.VALUE_NULL, p.nextToken()); assertToken(JsonToken.END_ARRAY, p.nextToken()); @@ -592,7 +592,7 @@ public void testTimeLikeValues() throws Exception assertToken(JsonToken.START_OBJECT, p.nextToken()); assertToken(JsonToken.FIELD_NAME, p.nextToken()); - assertEquals("value", p.getCurrentName()); + assertEquals("value", p.currentName()); assertToken(JsonToken.VALUE_STRING, p.nextToken()); assertEquals("3:00", p.getText()); assertToken(JsonToken.END_OBJECT, p.nextToken()); diff --git a/yaml/src/test/java/perf/MediaItem.java b/yaml/src/test/java/perf/MediaItem.java index d58c3cee..84f29035 100644 --- a/yaml/src/test/java/perf/MediaItem.java +++ b/yaml/src/test/java/perf/MediaItem.java @@ -49,7 +49,7 @@ public static MediaItem deserialize(JsonParser jp) throws IOException } MediaItem item = new MediaItem(); while (jp.nextToken() == JsonToken.FIELD_NAME) { - String name = jp.getCurrentName(); + String name = jp.currentName(); if (name == "images") { item._photos = deserializeImages(jp); } else if (name == "content") { @@ -170,7 +170,7 @@ public static Photo deserialize(JsonParser jp) throws IOException { Photo photo = new Photo(); while (jp.nextToken() == JsonToken.FIELD_NAME) { - String name = jp.getCurrentName(); + String name = jp.currentName(); jp.nextToken(); Integer I = sFields.get(name); if (I != null) { @@ -306,7 +306,7 @@ public static Content deserialize(JsonParser jp) throws IOException Content content = new Content(); while (jp.nextToken() == JsonToken.FIELD_NAME) { - String name = jp.getCurrentName(); + String name = jp.currentName(); jp.nextToken(); Integer I = sFields.get(name); if (I != null) {