diff --git a/src/main/java/ru/dmitriymx/astralcheckreport/objects/CertDeserialize.java b/src/main/java/ru/dmitriymx/astralcheckreport/objects/CertDeserialize.java index 016a6cf..519b3fd 100644 --- a/src/main/java/ru/dmitriymx/astralcheckreport/objects/CertDeserialize.java +++ b/src/main/java/ru/dmitriymx/astralcheckreport/objects/CertDeserialize.java @@ -12,6 +12,7 @@ import java.text.SimpleDateFormat; public class CertDeserialize implements JsonDeserializer { private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + private SimpleDateFormat sdf2 = new SimpleDateFormat("dd.MM.yyyy"); @Override public Cert deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException { @@ -29,10 +30,23 @@ public class CertDeserialize implements JsonDeserializer { try { cert.startCertDate = sdf.parse(dateStr); + } catch (ParseException e) { + try { + cert.startCertDate = sdf2.parse(dateStr); + } catch (ParseException e1) { + e1.printStackTrace(); + } + } + + try { if (dateStrEnd != null) cert.endCertDate = sdf.parse(dateStrEnd); } catch (ParseException e) { - e.printStackTrace(); + try { + cert.endCertDate = sdf2.parse(dateStrEnd); + } catch (ParseException e1) { + e1.printStackTrace(); + } } return cert;