diff options
| author | Eduardo Pedroni <e.pedroni91@gmail.com> | 2016-08-14 18:09:22 +0200 |
|---|---|---|
| committer | Eduardo Pedroni <e.pedroni91@gmail.com> | 2016-08-14 18:09:22 +0200 |
| commit | 8cb35b358563e5a81ad9e4aceb123b85222cf4cc (patch) | |
| tree | 0d73eebfe29e7d90d4e0d6c5d40a36db75de3fdc /src/eu/equalparts/cardbase/json | |
| parent | 78e369043f95e78b27c265f7eab4d766e54054f4 (diff) | |
Implemented some more filtering tests, sorted out validation and exceptions
Diffstat (limited to 'src/eu/equalparts/cardbase/json')
| -rw-r--r-- | src/eu/equalparts/cardbase/json/CardDeserializer.java | 1 | ||||
| -rw-r--r-- | src/eu/equalparts/cardbase/json/CardSerializer.java | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/eu/equalparts/cardbase/json/CardDeserializer.java b/src/eu/equalparts/cardbase/json/CardDeserializer.java index 7193c53..e140a5f 100644 --- a/src/eu/equalparts/cardbase/json/CardDeserializer.java +++ b/src/eu/equalparts/cardbase/json/CardDeserializer.java @@ -50,7 +50,6 @@ public class CardDeserializer extends StdDeserializer<Card> { newCard.loyalty = new IntegerCardField("loyalty", node.hasNonNull("loyalty") ? node.get("loyalty").asInt() : null); newCard.multiverseid = new IntegerCardField("multiverseid", node.hasNonNull("multiverseid") ? node.get("multiverseid").asInt() : null); newCard.imageName = new StringCardField("imageName", node.hasNonNull("imageName") ? node.get("imageName").asText() : null); - newCard.watermark = new StringCardField("watermark", node.hasNonNull("watermark") ? node.get("watermark").asText() : null); newCard.setCode = new StringCardField("setCode", node.hasNonNull("setCode") ? node.get("setCode").asText() : null); return newCard; diff --git a/src/eu/equalparts/cardbase/json/CardSerializer.java b/src/eu/equalparts/cardbase/json/CardSerializer.java index 5699061..7eaa0cb 100644 --- a/src/eu/equalparts/cardbase/json/CardSerializer.java +++ b/src/eu/equalparts/cardbase/json/CardSerializer.java @@ -103,12 +103,6 @@ public class CardSerializer extends JsonSerializer<Card> { jGen.writeNullField("imageName"); } - if (card.watermark.get() != null) { - jGen.writeStringField("watermark", card.watermark.get()); - } else { - jGen.writeNullField("watermark"); - } - if (card.setCode.get() != null) { jGen.writeStringField("setCode", card.setCode.get()); } else { |