#26890 include in 23.01.10

dotCMS · Dec 28, 2023 · adfcc47 · adfcc47
1 parent d566af1
commit adfcc47
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/dotCMS/src/main/java/com/dotcms/content/business/json/ContentletJsonAPIImpl.java b/dotCMS/src/main/java/com/dotcms/content/business/json/ContentletJsonAPIImpl.java
@@ -61,6 +61,7 @@
 import io.vavr.Tuple2;
 import io.vavr.control.Try;
 import java.io.File;
+import java.sql.Timestamp;
 import java.time.Instant;
 import java.util.Date;
 import java.util.HashMap;
@@ -311,6 +312,11 @@ private Map<String, Object> getContentletMapFromImmutable(final Contentlet immut
                 }
             }
 
+            //Backwards compatibility for Date Fields, should be Timestamp
+            if(value instanceof Date){
+                value = new Timestamp(((Date) value).getTime());
+            }
+
             map.put(field.variable(), value);
         }
         return map;

diff --git a/hotfix_tracking.md b/hotfix_tracking.md
@@ -182,3 +182,4 @@ This maintenance release includes the following code fixes:
 149. https://github.com/dotCMS/core/issues/26970 : GraphQL Cache not working #26970
 150. https://github.com/dotCMS/core/issues/26934 : Add Catalina Log Back #26934
 151. https://github.com/dotCMS/core/issues/26926 : Add left indexes to inode.inode and identifier.id #26926
+152. https://github.com/dotCMS/core/issues/26890 : GraphQL Dates not using the right format #26890