X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fjackson%2FSimpleMapper.java;h=d7f108c41fcc5c4afd0f994c082745da841d7c28;hb=f6a000c1d8ae0a652ff1612a373a0a119de5855c;hp=f15bf25ff81ebb1337f34ada47e3abcd95a97c79;hpb=e0c3340f5dc190522b8e54a2a2bfe3f02c8d1bfa;p=simple-mapper diff --git a/src/main/java/de/juplo/jackson/SimpleMapper.java b/src/main/java/de/juplo/jackson/SimpleMapper.java index f15bf25..d7f108c 100644 --- a/src/main/java/de/juplo/jackson/SimpleMapper.java +++ b/src/main/java/de/juplo/jackson/SimpleMapper.java @@ -117,14 +117,7 @@ public abstract class SimpleMapper if (next != null) return true; - return spliterator.tryAdvance(new Consumer() - { - @Override - public void accept(Object o) - { - next = o; - } - }); + return spliterator.tryAdvance((Object o) -> { next = o; }); } @Override @@ -249,14 +242,7 @@ public abstract class SimpleMapper if (next != null) return true; - return spliterator.tryAdvance(new Consumer>() - { - @Override - public void accept(Entry e) - { - next = e; - } - }); + return spliterator.tryAdvance((Entry e) -> { next = e; }); } @Override @@ -346,7 +332,10 @@ public abstract class SimpleMapper { JsonToken token = parser.getCurrentToken(); if (token == null) + { fail(parser, "unexpected EOF"); + return null; // << Will never be reached, because fail always throws an exception + } switch (token) { @@ -360,7 +349,7 @@ public abstract class SimpleMapper case VALUE_NULL: return null; } - fail(parser, "unexpected token " + token.toString()); + fail(parser, "unexpected token " + token); return null; // << Will never be reached, because fail always throws an exception }