Skip to content

Commit

Permalink
Remove compiler warnings (#448)
Browse files Browse the repository at this point in the history
  • Loading branch information
@cowtowncoder
cowtowncoder authored Dec 9, 2023
1 parent 64ed6d8 commit 6b39773
Show file tree
Hide file tree
Showing 14 changed files with 206 additions and 158 deletions.
28 changes: 21 additions & 7 deletions csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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;
}

Expand All @@ -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
{
Expand Down
26 changes: 13 additions & 13 deletions csv/src/test/java/com/fasterxml/jackson/dataformat/csv/ModuleTestBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
24 changes: 12 additions & 12 deletions csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/BasicCSVParserTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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());
Expand All @@ -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());
Expand All @@ -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());
Expand Down
8 changes: 4 additions & 4 deletions csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/BrokenEncodingTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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 {
Expand Down Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/StreamingCSVReadTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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());

Expand All @@ -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());
Expand Down
72 changes: 46 additions & 26 deletions properties/src/main/java/com/fasterxml/jackson/dataformat/javaprop/JavaPropsParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
/**********************************************************
*/

Expand Down
Loading

0 comments on commit 6b39773

Please sign in to comment.