projects
/
maven-thymeleaf-skin
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented (& tested) Spring-Boot-Autoconfiguration for SimpleMapperServcie
[maven-thymeleaf-skin]
/
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
d7f108c
..
3dd5509
100644
(file)
--- a/
src/main/java/de/juplo/jackson/SimpleMapper.java
+++ b/
src/main/java/de/juplo/jackson/SimpleMapper.java
@@
-5,7
+5,6
@@
import com.fasterxml.jackson.core.JsonLocation;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import java.io.IOException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import java.io.IOException;
-import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
@@
-15,7
+14,6
@@
import java.util.Map.Entry;
import java.util.NoSuchElementException;
import java.util.Spliterator;
import static java.util.Spliterator.IMMUTABLE;
import java.util.NoSuchElementException;
import java.util.Spliterator;
import static java.util.Spliterator.IMMUTABLE;
-import java.util.Spliterators;
import java.util.function.Consumer;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import java.util.function.Consumer;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
@@
-41,10
+39,7
@@
public abstract class SimpleMapper
JsonToken token = parser.nextToken();
if (token == null)
JsonToken token = parser.nextToken();
if (token == null)
- {
- LOG.warn("empty input");
- return Spliterators.emptySpliterator();
- }
+ return null;
if (!JsonToken.START_ARRAY.equals(token))
fail(parser, "The root-element must be an array!");
if (!JsonToken.START_ARRAY.equals(token))
fail(parser, "The root-element must be an array!");
@@
-140,10
+135,7
@@
public abstract class SimpleMapper
JsonToken token = parser.nextToken();
if (token == null)
JsonToken token = parser.nextToken();
if (token == null)
- {
- LOG.warn("empty input");
- return Spliterators.emptySpliterator();
- }
+ return null;
if (!JsonToken.START_OBJECT.equals(token))
fail(parser, "The root-element must be an object!");
if (!JsonToken.START_OBJECT.equals(token))
fail(parser, "The root-element must be an object!");
@@
-263,10
+255,7
@@
public abstract class SimpleMapper
JsonToken token = parser.nextToken();
if (token == null)
JsonToken token = parser.nextToken();
if (token == null)
- {
- LOG.warn("empty input");
- return Collections.EMPTY_LIST;
- }
+ return null;
if (!JsonToken.START_ARRAY.equals(token))
fail(parser, "The root-element must be an array!");
if (!JsonToken.START_ARRAY.equals(token))
fail(parser, "The root-element must be an array!");
@@
-284,10
+273,7
@@
public abstract class SimpleMapper
JsonToken token = parser.nextToken();
if (token == null)
JsonToken token = parser.nextToken();
if (token == null)
- {
- LOG.warn("empty input");
- return Collections.EMPTY_MAP;
- }
+ return null;
if (!JsonToken.START_OBJECT.equals(token))
fail(parser, "The root-element must be an object!");
if (!JsonToken.START_OBJECT.equals(token))
fail(parser, "The root-element must be an object!");
@@
-305,10
+291,7
@@
public abstract class SimpleMapper
JsonToken token = parser.nextToken();
if (token == null)
JsonToken token = parser.nextToken();
if (token == null)
- {
- LOG.warn("empty input");
return null;
return null;
- }
switch (token)
{
switch (token)
{