No effective code change - fix imports and override annotations (#1155)

This commit is contained in:
Roland Praml authored and Rob Bygrave committed 2017-10-05 10:55:48 +13:00
1 parent 2fe1a349c3
commit 47b0a917a2
6 files changed
+31 -13

No files matched your search

@@ -22,6 +22,7 @@ public class DJsonService implements SpiJsonService {
/**
* Write the nested Map/List as json.
*/
@Override
public String write(Object object) throws IOException {
return EJsonWriter.write(object);
}
@@ -29,6 +30,7 @@ public class DJsonService implements SpiJsonService {
/**
* Write the nested Map/List as json to the writer.
*/
@Override
public void write(Object object, Writer writer) throws IOException {
EJsonWriter.write(object, writer);
}
@@ -36,6 +38,7 @@ public class DJsonService implements SpiJsonService {
/**
* Write the nested Map/List as json to the jsonGenerator.
*/
@Override
public void write(Object object, JsonGenerator jsonGenerator) throws IOException {
EJsonWriter.write(object, jsonGenerator);
}
@@ -43,6 +46,7 @@ public class DJsonService implements SpiJsonService {
/**
* Write the collection as json array to the jsonGenerator.
*/
@Override
public void writeCollection(Collection<Object> collection, JsonGenerator jsonGenerator) throws IOException {
EJsonWriter.writeCollection(collection, jsonGenerator);
}
@@ -51,6 +55,7 @@ public class DJsonService implements SpiJsonService {
* Parse the json and return as a Map additionally specifying if the returned map should
* be modify aware meaning that it can detect when it has been modified.
*/
@Override
public Map<String, Object> parseObject(String json, boolean modifyAware) throws IOException {
return EJsonReader.parseObject(json, modifyAware);
}
@@ -58,6 +63,7 @@ public class DJsonService implements SpiJsonService {
/**
* Parse the json and return as a Map.
*/
@Override
public Map<String, Object> parseObject(String json) throws IOException {
return EJsonReader.parseObject(json);
}
@@ -65,6 +71,7 @@ public class DJsonService implements SpiJsonService {
/**
* Parse the json and return as a Map taking a reader.
*/
@Override
public Map<String, Object> parseObject(Reader reader, boolean modifyAware) throws IOException {
return EJsonReader.parseObject(reader, modifyAware);
}
@@ -72,6 +79,7 @@ public class DJsonService implements SpiJsonService {
/**
* Parse the json and return as a Map taking a reader.
*/
@Override
public Map<String, Object> parseObject(Reader reader) throws IOException {
return EJsonReader.parseObject(reader);
}
@@ -79,6 +87,7 @@ public class DJsonService implements SpiJsonService {
/**
* Parse the json and return as a Map taking a JsonParser.
*/
@Override
public Map<String, Object> parseObject(JsonParser parser) throws IOException {
return EJsonReader.parseObject(parser);
}
@@ -89,6 +98,7 @@ public class DJsonService implements SpiJsonService {
* Used when the first token is checked to see if the value is null prior to calling this.
* </p>
*/
@Override
public Map<String, Object> parseObject(JsonParser parser, JsonToken token) throws IOException {
return EJsonReader.parseObject(parser, token);
}
@@ -96,6 +106,7 @@ public class DJsonService implements SpiJsonService {
/**
* Parse the json and return as a modify aware List.
*/
@Override
public <T> List<T> parseList(String json, boolean modifyAware) throws IOException {
return EJsonReader.parseList(json, modifyAware);
}
@@ -103,6 +114,7 @@ public class DJsonService implements SpiJsonService {
/**
* Parse the json and return as a List.
*/
@Override
public List<Object> parseList(String json) throws IOException {
return EJsonReader.parseList(json);
}
@@ -110,6 +122,7 @@ public class DJsonService implements SpiJsonService {
/**
* Parse the json and return as a List taking a Reader.
*/
@Override
public List<Object> parseList(Reader reader) throws IOException {
return EJsonReader.parseList(reader);
}
@@ -117,6 +130,7 @@ public class DJsonService implements SpiJsonService {
/**
* Parse the json and return as a List taking a JsonParser.
*/
@Override
public List<Object> parseList(JsonParser parser) throws IOException {
return EJsonReader.parseList(parser, false);
}
@@ -124,6 +138,7 @@ public class DJsonService implements SpiJsonService {
/**
* Parse the json returning as a List taking into account the current token.
*/
@Override
@SuppressWarnings("unchecked")
public <T> List<T> parseList(JsonParser parser, JsonToken currentToken) throws IOException {
return (List<T>) EJsonReader.parse(parser, currentToken, false);
@@ -132,6 +147,7 @@ public class DJsonService implements SpiJsonService {
/**
* Parse the json and return as a List or Map.
*/
@Override
public Object parse(String json) throws IOException {
return EJsonReader.parse(json);
}
@@ -139,6 +155,7 @@ public class DJsonService implements SpiJsonService {
/**
* Parse the json and return as a List or Map.
*/
@Override
public Object parse(Reader reader) throws IOException {
return EJsonReader.parse(reader);
}
@@ -146,6 +163,7 @@ public class DJsonService implements SpiJsonService {
/**
* Parse the json and return as a List or Map.
*/
@Override
public Object parse(JsonParser parser) throws IOException {
return EJsonReader.parse(parser);
}
@@ -153,6 +171,7 @@ public class DJsonService implements SpiJsonService {
/**
* Parse the json returning a Set that might be modify aware.
*/
@Override
public <T> Set<T> parseSet(String json, boolean modifyAware) throws IOException {
List<T> list = parseList(json, modifyAware);
if (list == null) {
@@ -169,6 +188,7 @@ public class DJsonService implements SpiJsonService {
/**
* Parse the json returning as a Set taking into account the current token.
*/
@Override
public <T> Set<T> parseSet(JsonParser parser, JsonToken currentToken) throws IOException {
return new LinkedHashSet<>(parseList(parser, currentToken));
}