Merge pull request #181 from Thadoy/old_date_fix

Bugfix: Deserialization of old dates in Mongo

Author: YukiInu

CHANGELOG.md

@@ -21,6 +21,7 @@
 * Bugfix: Fixes problem with events time to live set to 10 seconds
 * Bugfix: Fixing problem with retry messages in Interconnect
 * Bugfix: Better error handling in CloudconductorPropertyProvider
+* Bugfix: Fallback for old dates (before 1970) for mongo
 * Fixed vulnerabilities: CVE-2024-13009(Jetty), CVE-2025-23184(Apache CXF), CVE-2024-57699 (Json-smart),CVE-2025-27533 (ActiveMQ)
 * Logging improvement and extension options for DaemonMessageListener
 * Add TLS server parameters for JAX-RS

mongodb/src/main/java/de/taimos/dvalin/mongo/mapper/JodaMapping.java

@@ -42,12 +42,14 @@
  */
 public class JodaMapping {
 
+    private static final String DATE_FIELD_NAME = "$date";
+
     public static class MongoDateTimeSerializer extends JsonSerializer<DateTime> {
 
         @Override
         public void serialize(DateTime value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
             jgen.writeStartObject();
-            jgen.writeStringField("$date", value.withZone(DateTimeZone.UTC).toString(ISODateTimeFormat.dateTime()));
+            jgen.writeStringField(JodaMapping.DATE_FIELD_NAME, value.withZone(DateTimeZone.UTC).toString(ISODateTimeFormat.dateTime()));
             jgen.writeEndObject();
         }
 
@@ -58,8 +60,22 @@ public static class MongoDateTimeDeserializer extends JsonDeserializer<DateTime>
         @Override
         public DateTime deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
             JsonNode node = jp.getCodec().readTree(jp);
-            String date = node.get("$date").asText();
-            return ISODateTimeFormat.dateTimeParser().withZoneUTC().parseDateTime(date);
+            String date = node.get(JodaMapping.DATE_FIELD_NAME).asText();
+            try {
+                return ISODateTimeFormat.dateTimeParser().withZoneUTC().parseDateTime(date);
+            } catch (IllegalArgumentException e) {
+                // Fallback for old dates (before 1970)
+                JsonNode dateNode = node.get(JodaMapping.DATE_FIELD_NAME);
+                if (dateNode != null) {
+                    JsonNode numberLongNode = dateNode.get("$numberLong");
+                    if (numberLongNode != null) {
+                        // Parse as BSON timestamp (milliseconds since epoch)
+                        long timestamp = numberLongNode.asLong();
+                        return new DateTime(timestamp, DateTimeZone.UTC);
+                    }
+                }
+            }
+            return null;
         }
     }
 }