fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-10-20 00:19:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix hasNext to return false at document end.

Browse Source
This commit is contained in:
Eric Cochran
2018-06-22 15:18:22 -07:00
parent 03ada87e90
commit 627e62f507
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
moshi/src/main/java/com/squareup/moshi/JsonUtf8Reader.java
View File

@@ -162,7 +162,7 @@ final class JsonUtf8Reader extends JsonReader {
if (p == PEEKED_NONE) { if (p == PEEKED_NONE) {
p = doPeek(); p = doPeek();
} }
return p != PEEKED_END_OBJECT && p != PEEKED_END_ARRAY; return p != PEEKED_END_OBJECT && p != PEEKED_END_ARRAY && p != PEEKED_EOF;
} }
@Override public Token peek() throws IOException { @Override public Token peek() throws IOException {

3
moshi/src/main/java/com/squareup/moshi/JsonValueReader.java
View File

@@ -101,8 +101,7 @@ final class JsonValueReader extends JsonReader {
} }
@Override public boolean hasNext() throws IOException { @Override public boolean hasNext() throws IOException {
// TODO(jwilson): this is consistent with BufferedSourceJsonReader but it doesn't make sense. if (stackSize == 0) return false;
if (stackSize == 0) return true;
Object peeked = stack[stackSize - 1]; Object peeked = stack[stackSize - 1];
return !(peeked instanceof Iterator) || ((Iterator) peeked).hasNext(); return !(peeked instanceof Iterator) || ((Iterator) peeked).hasNext();

6
moshi/src/test/java/com/squareup/moshi/JsonReaderTest.java
View File

@@ -979,4 +979,10 @@ public final class JsonReaderTest {
} }
assertThat(reader.nextInt()).isEqualTo(1); assertThat(reader.nextInt()).isEqualTo(1);
} }
@Test public void emptyDocumentHasNextReturnsFalse() throws IOException {
JsonReader reader = newReader("1");
reader.readJsonValue();
assertThat(reader.hasNext()).isFalse();
}
} }