From ce3bf5ba1571e4259a36a72641c6cabb9a95e46d Mon Sep 17 00:00:00 2001 From: Danilo Del Busso Date: Fri, 13 Sep 2024 14:28:52 +0100 Subject: [PATCH] Fix syntax in CustomDateDeserializer.java Regression introduced by a incorrect merge conflict resolution after a rebase on master Signed-off-by: Danilo Del Busso --- .../java/com/xensource/xenapi/CustomDateDeserializer.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ocaml/sdk-gen/java/autogen/xen-api/src/main/java/com/xensource/xenapi/CustomDateDeserializer.java b/ocaml/sdk-gen/java/autogen/xen-api/src/main/java/com/xensource/xenapi/CustomDateDeserializer.java index e397ba7e27f..3ba135e0a40 100644 --- a/ocaml/sdk-gen/java/autogen/xen-api/src/main/java/com/xensource/xenapi/CustomDateDeserializer.java +++ b/ocaml/sdk-gen/java/autogen/xen-api/src/main/java/com/xensource/xenapi/CustomDateDeserializer.java @@ -151,8 +151,6 @@ public CustomDateDeserializer(Class t) { } } - private static - /** * Deserializes a {@link Date} object from the given JSON parser. * @@ -162,8 +160,8 @@ public CustomDateDeserializer(Class t) { * @return The deserialized {@link Date} object * @throws IOException if an I/O error occurs during deserialization */ - @Override public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException { + @Override + public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException { var text = jsonParser.getText(); for (SimpleDateFormat formatter : dateFormatsUtc) { try {