projects
/
simple-mapper
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleared some "Possible Null-Pointer Dereferencing"-warnings
[simple-mapper]
/
src
/
main
/
java
/
de
/
juplo
/
jackson
/
SimpleMapper.java
diff --git
a/src/main/java/de/juplo/jackson/SimpleMapper.java
b/src/main/java/de/juplo/jackson/SimpleMapper.java
index
f15bf25
..
d7f108c
100644
(file)
--- 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;
if (next != null)
return true;
- return spliterator.tryAdvance(new Consumer<Object>()
- {
- @Override
- public void accept(Object o)
- {
- next = o;
- }
- });
+ return spliterator.tryAdvance((Object o) -> { next = o; });
}
@Override
}
@Override
@@
-249,14
+242,7
@@
public abstract class SimpleMapper
if (next != null)
return true;
if (next != null)
return true;
- return spliterator.tryAdvance(new Consumer<Entry<String, Object>>()
- {
- @Override
- public void accept(Entry<String, Object> e)
- {
- next = e;
- }
- });
+ return spliterator.tryAdvance((Entry<String, Object> e) -> { next = e; });
}
@Override
}
@Override
@@
-346,7
+332,10
@@
public abstract class SimpleMapper
{
JsonToken token = parser.getCurrentToken();
if (token == null)
{
JsonToken token = parser.getCurrentToken();
if (token == null)
+ {
fail(parser, "unexpected EOF");
fail(parser, "unexpected EOF");
+ return null; // << Will never be reached, because fail always throws an exception
+ }
switch (token)
{
switch (token)
{
@@
-360,7
+349,7
@@
public abstract class SimpleMapper
case VALUE_NULL: return null;
}
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
}
return null; // << Will never be reached, because fail always throws an exception
}