You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ke...@apache.org on 2024/11/03 23:50:29 UTC

(tinkerpop) 02/17: Rename GraphSONv4 g:OffsetDateTime to g:DateTime CTR

This is an automated email from the ASF dual-hosted git repository.

kenhuuu pushed a commit to branch master-http-final
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit ae76c17e1eb38b8ef8a5345d20204e27246651f4
Author: Ken Hu <10...@users.noreply.github.com>
AuthorDate: Wed Oct 16 21:00:11 2024 -0700

    Rename GraphSONv4 g:OffsetDateTime to g:DateTime CTR
    
    In GraphSONv4, the newly created g:DateTime has the same underlying JSON
    representation as the old g:OffsetDateTime; an ISO-8601 String.
---
 .../gremlin/structure/io/graphson/GraphSONXModuleV4.java          | 2 +-
 .../gremlin/structure/io/graphson/max-offsetdatetime-v4.json      | 2 +-
 .../gremlin/structure/io/graphson/min-offsetdatetime-v4.json      | 2 +-
 .../tinkerpop/gremlin/structure/io/graphson/var-type-map-v4.json  | 8 ++++----
 .../gremlin/structure/io/AbstractTypedCompatibilityTest.java      | 1 -
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV4.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV4.java
index 2f9812c147..aa7ad5e9ad 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV4.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV4.java
@@ -63,7 +63,7 @@ public final class GraphSONXModuleV4 extends GraphSONModule {
                 put(LocalDateTime.class, "LocalDateTime");
                 put(LocalTime.class, "LocalTime");
                 put(MonthDay.class, "MonthDay");
-                put(OffsetDateTime.class, "OffsetDateTime");
+                put(OffsetDateTime.class, "DateTime");
                 put(OffsetTime.class, "OffsetTime");
                 put(Period.class, "Period");
                 put(Year.class, "Year");
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-offsetdatetime-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-offsetdatetime-v4.json
index 6fc7c25fe6..022ea63ff8 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-offsetdatetime-v4.json
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/max-offsetdatetime-v4.json
@@ -1,4 +1,4 @@
 {
-  "@type" : "g:OffsetDateTime",
+  "@type" : "g:DateTime",
   "@value" : "+999999999-12-31T23:59:59.999999999-18:00"
 }
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-offsetdatetime-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-offsetdatetime-v4.json
index d45954b5bf..2b73140486 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-offsetdatetime-v4.json
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/min-offsetdatetime-v4.json
@@ -1,4 +1,4 @@
 {
-  "@type" : "g:OffsetDateTime",
+  "@type" : "g:DateTime",
   "@value" : "-999999999-01-01T00:00+18:00"
 }
\ No newline at end of file
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-map-v4.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-map-v4.json
index 5f551eb5d4..e920264240 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-map-v4.json
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/var-type-map-v4.json
@@ -13,13 +13,13 @@
       "@value" : 3
     } ]
   }, {
-    "@type" : "g:Date",
-    "@value" : 1481295
+    "@type" : "g:DateTime",
+    "@value" : "1970-01-01T00:24:41.295Z"
   }, "test", {
     "@type" : "g:Int32",
     "@value" : 123
   }, {
-    "@type" : "g:Date",
-    "@value" : 1481295
+    "@type" : "g:DateTime",
+    "@value" : "1970-01-01T00:24:41.295Z"
   }, "red" ]
 }
\ No newline at end of file
diff --git a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
index e39869d474..3b7bdf9093 100644
--- a/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
+++ b/gremlin-util/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
@@ -536,7 +536,6 @@ public abstract class AbstractTypedCompatibilityTest extends AbstractCompatibili
     }
 
     @Test
-    @Ignore("re-enable after GraphSONV4 datetime is implemented")
     public void shouldReadWriteMultiTypeMap() throws Exception {
         final String resourceName = "var-type-map";