From 3a25d47f187fe7499d2d481d9a0a3411a92bfa11 Mon Sep 17 00:00:00 2001 From: Eduardo Pedroni Date: Sun, 21 Aug 2016 01:14:38 +0200 Subject: Switched from ant to gradle, had to refactor some of the tests because of the new build structure, a bit ugly but should pass --- src/eu/equalparts/cardbase/card/CardSetInformation.java | 8 +++++--- src/eu/equalparts/cardbase/json/FullCardSetDeserializer.java | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'src/eu') diff --git a/src/eu/equalparts/cardbase/card/CardSetInformation.java b/src/eu/equalparts/cardbase/card/CardSetInformation.java index a01c18d..d57015c 100644 --- a/src/eu/equalparts/cardbase/card/CardSetInformation.java +++ b/src/eu/equalparts/cardbase/card/CardSetInformation.java @@ -1,10 +1,12 @@ package eu.equalparts.cardbase.card; +import com.fasterxml.jackson.annotation.JsonProperty; + public class CardSetInformation { - private String name; - private String code; - private String releaseDate; + @JsonProperty private String name; + @JsonProperty private String code; + @JsonProperty private String releaseDate; /** * @return the set's name. diff --git a/src/eu/equalparts/cardbase/json/FullCardSetDeserializer.java b/src/eu/equalparts/cardbase/json/FullCardSetDeserializer.java index 73034a0..c493df4 100644 --- a/src/eu/equalparts/cardbase/json/FullCardSetDeserializer.java +++ b/src/eu/equalparts/cardbase/json/FullCardSetDeserializer.java @@ -45,7 +45,7 @@ public class FullCardSetDeserializer extends StdDeserializer { if (jsonTree.hasNonNull("name")) { fcs.name = jsonTree.get("name").asText(); } else { - throw new JsonMappingException("Field \"name\" not found."); + throw new JsonMappingException(jp, "Field \"name\" not found."); } String setCode; @@ -53,13 +53,13 @@ public class FullCardSetDeserializer extends StdDeserializer { setCode = jsonTree.get("code").asText(); fcs.code = setCode; } else { - throw new JsonMappingException("Field \"code\" not found."); + throw new JsonMappingException(jp, "Field \"code\" not found."); } if (jsonTree.hasNonNull("releaseDate")) { fcs.releaseDate = jsonTree.get("releaseDate").asText(); } else { - throw new JsonMappingException("Field \"releaseDate\" not found."); + throw new JsonMappingException(jp, "Field \"releaseDate\" not found."); } if (jsonTree.hasNonNull("cards")) { @@ -74,7 +74,7 @@ public class FullCardSetDeserializer extends StdDeserializer { } fcs.cards = cardMap; } else { - throw new JsonMappingException("Field \"cards\" not found."); + throw new JsonMappingException(jp, "Field \"cards\" not found."); } /* -- cgit v1.2.3