You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by fl...@apache.org on 2018/08/13 17:38:09 UTC
[03/15] tinkerpop git commit: TINKERPOP-1945 Added additional
extended GraphSON types to .NET
TINKERPOP-1945 Added additional extended GraphSON types to .NET
Support (de)serialization of GraphSON Duration-Types to TimeSpans.
Support (de)serialization of GraphSON BigInteger-Types to System.Numerics.BigInteger. An update to the latest version of Newtonsoft.Json would provide even better support.
Support (de)serialization of GraphSON Byte-Types to System.Byte.
Support (de)serialization of GraphSON Byte-Types to byte[].
Support (de)serialization of GraphSON Char-Types to System.Char.
Support deserialization of GraphSON Instant-Types to System.Date. It is up to discussion whether System.Date should be serialized to gx:Date or gx:Instant; currently it is neither.
Support deserialization of GraphSON LocalDate-Types to System.Date.
Support deserialization of GraphSON LocalDateTime-Types to System.DateTime.
Support deserialization of GraphSON LocalTime-Types to System.TimeSpan.
Support deserialization of GraphSON OffsetDateTime-Types to System.DateTimeOffset.
Support deserialization of GraphSON Period-Types to System.TimeSpan.
Support (de)serialization of GraphSON Int16-Types to System.Int16.
Update Newtonsoft.Json.
Explicitly reference Newtonsoft.Json 11.0.2 from Gremlin.Net.UnitTest.csproj.
Support deserialization of GraphSON ZoneOffset-Types to System.TimeSpan.
Support deserialization of GraphSON InetAddress-Types to string.
Split BigIntegerConverter and TimeSpanConverter into Serializer and Deserializer.
Split ByteBufferSerializer into ByteBufferSerializer and ByteBufferDeserializer.
Split DateSerializer into DateSerializer and DateDeserializer.
Remove InetAddressDeserializer for symmetry reasons.
Remove InstantDeserializer for symmetry reasons.
Remove LocalDateDeserializer, LocalDateTimeDeserializer and LocalTimeDeserializer for symmetry reasons.
Remove OffsetDateTimeDeserializer for symmetry reasons.
Remove ZoneOffsetDeserializer for symmetry reasons.
Remove registration for gx:Period for symmetry reasons.
Move Registration of DecimalConverter since it's in the extended (gx) namespace.
Remove unit tests that are now failing due to the removal of (de)serializers.
Add missing license headers.
Fix namespace of Int16.
Rename TimeSpan(De)serializer to Duration(De)serializer.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ddeaf416
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ddeaf416
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ddeaf416
Branch: refs/heads/tp32
Commit: ddeaf4161e0d055046652033e3f1abaeecc66216
Parents: 180da8d
Author: Daniel Weber <dw...@exram.de>
Authored: Wed Apr 18 10:48:27 2018 +0200
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 13 11:17:05 2018 -0400
----------------------------------------------------------------------
.../src/Gremlin.Net/Gremlin.Net.csproj | 2 +-
.../IO/GraphSON/BigIntegerDeserializer.cs | 38 +++++++
.../IO/GraphSON/BigIntegerSerializer.cs | 37 +++++++
.../IO/GraphSON/ByteBufferDeserializer.cs | 36 ++++++
.../IO/GraphSON/ByteBufferSerializer.cs | 36 ++++++
.../Structure/IO/GraphSON/ByteConverter.cs | 33 ++++++
.../Structure/IO/GraphSON/CharConverter.cs | 34 ++++++
.../Structure/IO/GraphSON/DateDeserializer.cs | 38 +++++++
.../Structure/IO/GraphSON/DateSerializer.cs | 9 +-
.../IO/GraphSON/DurationDeserializer.cs | 37 +++++++
.../Structure/IO/GraphSON/DurationSerializer.cs | 38 +++++++
.../Structure/IO/GraphSON/GraphSONReader.cs | 14 ++-
.../Structure/IO/GraphSON/GraphSONWriter.cs | 13 ++-
.../Structure/IO/GraphSON/Int16Converter.cs | 34 ++++++
.../Gremlin.Net.UnitTest.csproj | 1 +
.../IO/GraphSON/GraphSONReaderTests.cs | 110 +++++++++++++++++++
.../IO/GraphSON/GraphSONWriterTests.cs | 65 +++++++++++
17 files changed, 561 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddeaf416/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index df4150a..e506bf5 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -48,7 +48,7 @@ Please see the reference documentation at Apache TinkerPop for more information
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+ <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddeaf416/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/BigIntegerDeserializer.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/BigIntegerDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/BigIntegerDeserializer.cs
new file mode 100644
index 0000000..755dbcc
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/BigIntegerDeserializer.cs
@@ -0,0 +1,38 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using System.Numerics;
+using System.Xml;
+using Newtonsoft.Json.Linq;
+
+namespace Gremlin.Net.Structure.IO.GraphSON
+{
+ internal class BigIntegerDeserializer : IGraphSONDeserializer
+ {
+ public dynamic Objectify(JToken graphsonObject, GraphSONReader reader)
+ {
+ var bigInteger = graphsonObject.ToObject<string>();
+ return BigInteger.Parse(bigInteger);
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddeaf416/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/BigIntegerSerializer.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/BigIntegerSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/BigIntegerSerializer.cs
new file mode 100644
index 0000000..b53f752
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/BigIntegerSerializer.cs
@@ -0,0 +1,37 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using System.Collections.Generic;
+using System.Numerics;
+
+namespace Gremlin.Net.Structure.IO.GraphSON
+{
+ internal class BigIntegerSerializer : IGraphSONSerializer
+ {
+ public Dictionary<string, dynamic> Dictify(dynamic objectData, GraphSONWriter writer)
+ {
+ BigInteger value = objectData;
+ return GraphSONUtil.ToTypedValue("BigInteger", value.ToString(), "gx");
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddeaf416/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ByteBufferDeserializer.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ByteBufferDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ByteBufferDeserializer.cs
new file mode 100644
index 0000000..f77abb0
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ByteBufferDeserializer.cs
@@ -0,0 +1,36 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#endregion
+
+using System;
+using Newtonsoft.Json.Linq;
+
+namespace Gremlin.Net.Structure.IO.GraphSON
+{
+ internal class ByteBufferDeserializer : IGraphSONDeserializer
+ {
+ public dynamic Objectify(JToken graphsonObject, GraphSONReader reader)
+ {
+ var base64String = graphsonObject.ToObject<string>();
+ return Convert.FromBase64String(base64String);
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddeaf416/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ByteBufferSerializer.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ByteBufferSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ByteBufferSerializer.cs
new file mode 100644
index 0000000..09d4f27
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ByteBufferSerializer.cs
@@ -0,0 +1,36 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+
+namespace Gremlin.Net.Structure.IO.GraphSON
+{
+ internal class ByteBufferSerializer : IGraphSONSerializer
+ {
+ public Dictionary<string, dynamic> Dictify(dynamic objectData, GraphSONWriter writer)
+ {
+ byte[] value = objectData;
+ return GraphSONUtil.ToTypedValue("ByteBuffer", Convert.ToBase64String(value), "gx");
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddeaf416/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ByteConverter.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ByteConverter.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ByteConverter.cs
new file mode 100644
index 0000000..6525d52
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/ByteConverter.cs
@@ -0,0 +1,33 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#endregion
+
+using System;
+
+namespace Gremlin.Net.Structure.IO.GraphSON
+{
+ internal class ByteConverter : NumberConverter
+ {
+ protected override string GraphSONTypeName => "Byte";
+ protected override Type HandledType => typeof(byte);
+ protected override string Prefix => "gx";
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddeaf416/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/CharConverter.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/CharConverter.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/CharConverter.cs
new file mode 100644
index 0000000..b7023be
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/CharConverter.cs
@@ -0,0 +1,34 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#endregion
+
+using System;
+
+namespace Gremlin.Net.Structure.IO.GraphSON
+{
+ internal class CharConverter : NumberConverter
+ {
+ protected override string GraphSONTypeName => "Char";
+ protected override Type HandledType => typeof(char);
+ protected override string Prefix => "gx";
+ protected override bool StringifyValue => true;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddeaf416/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DateDeserializer.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DateDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DateDeserializer.cs
new file mode 100644
index 0000000..98ca25e
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DateDeserializer.cs
@@ -0,0 +1,38 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#endregion
+
+using System;
+using Newtonsoft.Json.Linq;
+
+namespace Gremlin.Net.Structure.IO.GraphSON
+{
+ internal class DateDeserializer : IGraphSONDeserializer
+ {
+ private static readonly DateTimeOffset UnixStart = new DateTimeOffset(1970, 1, 1, 0, 0, 0, 0, TimeSpan.Zero);
+
+ public dynamic Objectify(JToken graphsonObject, GraphSONReader reader)
+ {
+ var milliseconds = graphsonObject.ToObject<long>();
+ return UnixStart.AddTicks(TimeSpan.TicksPerMillisecond * milliseconds);
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddeaf416/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DateSerializer.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DateSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DateSerializer.cs
index 3333f0c..d6c830a 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DateSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DateSerializer.cs
@@ -23,11 +23,10 @@
using System;
using System.Collections.Generic;
-using Newtonsoft.Json.Linq;
namespace Gremlin.Net.Structure.IO.GraphSON
{
- internal class DateSerializer : IGraphSONSerializer, IGraphSONDeserializer
+ internal class DateSerializer : IGraphSONSerializer
{
private static readonly DateTimeOffset UnixStart = new DateTimeOffset(1970, 1, 1, 0, 0, 0, 0, TimeSpan.Zero);
@@ -37,11 +36,5 @@ namespace Gremlin.Net.Structure.IO.GraphSON
var ticks = (value - UnixStart).Ticks;
return GraphSONUtil.ToTypedValue("Date", ticks / TimeSpan.TicksPerMillisecond);
}
-
- public dynamic Objectify(JToken graphsonObject, GraphSONReader reader)
- {
- var milliseconds = graphsonObject.ToObject<long>();
- return UnixStart.AddTicks(TimeSpan.TicksPerMillisecond * milliseconds);
- }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddeaf416/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DurationDeserializer.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DurationDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DurationDeserializer.cs
new file mode 100644
index 0000000..00a9a70
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DurationDeserializer.cs
@@ -0,0 +1,37 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using System.Xml;
+using Newtonsoft.Json.Linq;
+
+namespace Gremlin.Net.Structure.IO.GraphSON
+{
+ internal class DurationDeserializer : IGraphSONDeserializer
+ {
+ public dynamic Objectify(JToken graphsonObject, GraphSONReader reader)
+ {
+ var duration = graphsonObject.ToObject<string>();
+ return XmlConvert.ToTimeSpan(duration);
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddeaf416/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DurationSerializer.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DurationSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DurationSerializer.cs
new file mode 100644
index 0000000..9fe5fcd
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/DurationSerializer.cs
@@ -0,0 +1,38 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Xml;
+
+namespace Gremlin.Net.Structure.IO.GraphSON
+{
+ internal class DurationSerializer : IGraphSONSerializer
+ {
+ public Dictionary<string, dynamic> Dictify(dynamic objectData, GraphSONWriter writer)
+ {
+ TimeSpan value = objectData;
+ return GraphSONUtil.ToTypedValue("Duration", XmlConvert.ToString(value), "gx");
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddeaf416/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
index db03dd4..d11b14c 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
@@ -42,14 +42,22 @@ namespace Gremlin.Net.Structure.IO.GraphSON
{"g:Float", new FloatConverter()},
{"g:Double", new DoubleConverter()},
{"g:UUID", new UuidDeserializer()},
- {"g:Date", new DateSerializer()},
- {"g:Timestamp", new DateSerializer()},
+ {"g:Date", new DateDeserializer()},
+ {"g:Timestamp", new DateDeserializer()},
{"g:Vertex", new VertexDeserializer()},
{"g:Edge", new EdgeDeserializer()},
{"g:Property", new PropertyDeserializer()},
{"g:VertexProperty", new VertexPropertyDeserializer()},
{"g:Path", new PathDeserializer()},
- {"gx:BigDecimal", new DecimalConverter()}
+
+ //Extended
+ {"gx:BigDecimal", new DecimalConverter()},
+ {"gx:Duration", new DurationDeserializer()},
+ {"gx:BigInteger", new BigIntegerDeserializer()},
+ {"gx:Byte", new ByteConverter()},
+ {"gx:ByteBuffer", new ByteBufferDeserializer()},
+ {"gx:Char", new CharConverter()},
+ {"gx:Int16", new Int16Converter() }
};
/// <summary>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddeaf416/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
index 8926d23..5994180 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
@@ -25,6 +25,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
+using System.Numerics;
using System.Reflection;
using Gremlin.Net.Driver.Messages;
using Gremlin.Net.Process.Traversal;
@@ -49,7 +50,6 @@ namespace Gremlin.Net.Structure.IO.GraphSON
{typeof(long), new Int64Converter()},
{typeof(float), new FloatConverter()},
{typeof(double), new DoubleConverter()},
- {typeof(decimal), new DecimalConverter()},
{typeof(Guid), new UuidSerializer()},
{typeof(DateTimeOffset), new DateSerializer()},
{typeof(Type), new ClassSerializer()},
@@ -60,7 +60,16 @@ namespace Gremlin.Net.Structure.IO.GraphSON
{typeof(Property), new PropertySerializer()},
{typeof(VertexProperty), new VertexPropertySerializer()},
{typeof(AbstractTraversalStrategy), new TraversalStrategySerializer()},
- {typeof(ILambda), new LambdaSerializer()}
+ {typeof(ILambda), new LambdaSerializer()},
+
+ //Extended
+ {typeof(decimal), new DecimalConverter()},
+ {typeof(TimeSpan), new DurationSerializer()},
+ {typeof(BigInteger), new BigIntegerSerializer()},
+ {typeof(byte), new ByteConverter()},
+ {typeof(byte[]), new ByteBufferSerializer()},
+ {typeof(char), new CharConverter() },
+ {typeof(short), new Int16Converter() }
};
/// <summary>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddeaf416/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Int16Converter.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Int16Converter.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Int16Converter.cs
new file mode 100644
index 0000000..abe5a77
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Int16Converter.cs
@@ -0,0 +1,34 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using System;
+
+namespace Gremlin.Net.Structure.IO.GraphSON
+{
+ internal class Int16Converter : NumberConverter
+ {
+ protected override string GraphSONTypeName => "Int16";
+ protected override Type HandledType => typeof(short);
+ protected override string Prefix => "gx";
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddeaf416/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
index d1d6372..0b44e57 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
@@ -15,6 +15,7 @@
</ItemGroup>
<ItemGroup>
+ <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="Moq" Version="4.7.99" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddeaf416/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
index d2ce40b..74bf385 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
@@ -23,9 +23,12 @@
using System;
using System.Collections.Generic;
+using System.Numerics;
+using Gremlin.Net.Process.Traversal;
using Gremlin.Net.Structure;
using Gremlin.Net.Structure.IO.GraphSON;
using Moq;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Xunit;
@@ -38,6 +41,17 @@ namespace Gremlin.Net.UnitTest.Structure.IO.GraphSON
return new GraphSONReader();
}
+ //During CI, we encountered a case where Newtonsoft.Json version 9.0.0
+ //was loaded although there is no obvious direct nor indirect dependency
+ //on that version of the library. An explicit reference to version
+ //11.0.0 from Gremlin.Net.UnitTest fixes that, however, it is
+ //still unclear what causes the downgrade. Until resolution, we keep this test.
+ [Fact]
+ public void NewtonsoftJsonVersionShouldSupportReallyBigIntegers()
+ {
+ Assert.Equal(new Version(11, 0, 0, 0), typeof(JToken).Assembly.GetName().Version);
+ }
+
[Fact]
public void ShouldDeserializeWithCustomDeserializerForNewType()
{
@@ -320,6 +334,102 @@ namespace Gremlin.Net.UnitTest.Structure.IO.GraphSON
Assert.NotNull(d);
Assert.Equal("g:Traverser", (string)d["@type"]);
}
+
+ [Fact]
+ public void ShouldDeserializeDurationToTimeSpan()
+ {
+ var serializedValue = "{\"@type\":\"gx:Duration\",\"@value\":\"PT120H\"}";
+ var reader = CreateStandardGraphSONReader();
+
+ var jObject = JObject.Parse(serializedValue);
+ TimeSpan deserializedValue = reader.ToObject(jObject);
+
+ Assert.Equal(TimeSpan.FromDays(5), deserializedValue);
+ }
+
+ [Fact]
+ public void ShouldDeserializeBigInteger()
+ {
+ var serializedValue = "{\"@type\":\"gx:BigInteger\",\"@value\":123456789}";
+ var reader = CreateStandardGraphSONReader();
+
+ var jObject = JObject.Parse(serializedValue);
+ BigInteger deserializedValue = reader.ToObject(jObject);
+
+ Assert.Equal(BigInteger.Parse("123456789"), deserializedValue);
+ }
+
+ [Fact]
+ public void ShouldDeserializeBigIntegerValueAsString()
+ {
+ var serializedValue = "{\"@type\":\"gx:BigInteger\",\"@value\":\"123456789\"}";
+ var reader = CreateStandardGraphSONReader();
+
+ var jObject = JObject.Parse(serializedValue);
+ BigInteger deserializedValue = reader.ToObject(jObject);
+
+ Assert.Equal(BigInteger.Parse("123456789"), deserializedValue);
+ }
+
+ [Fact]
+ public void ShouldDeserializeReallyBigIntegerValue()
+ {
+ var serializedValue = "{\"@type\":\"gx:BigInteger\",\"@value\":123456789987654321123456789987654321}";
+ var reader = CreateStandardGraphSONReader();
+
+ var jObject = JObject.Parse(serializedValue);
+ BigInteger deserializedValue = reader.ToObject(jObject);
+
+ Assert.Equal(BigInteger.Parse("123456789987654321123456789987654321"), deserializedValue);
+ }
+
+ [Fact]
+ public void ShouldDeserializeByte()
+ {
+ var serializedValue = "{\"@type\":\"gx:Byte\",\"@value\":1}";
+ var reader = CreateStandardGraphSONReader();
+
+ var jObject = JObject.Parse(serializedValue);
+ var deserializedValue = reader.ToObject(jObject);
+
+ Assert.Equal(1, deserializedValue);
+ }
+
+ [Fact]
+ public void ShouldDeserializeByteBuffer()
+ {
+ var serializedValue = "{\"@type\":\"gx:ByteBuffer\",\"@value\":\"c29tZSBieXRlcyBmb3IgeW91\"}";
+ var reader = CreateStandardGraphSONReader();
+
+ var jObject = JObject.Parse(serializedValue);
+ var deserializedValue = reader.ToObject(jObject);
+
+ Assert.Equal(Convert.FromBase64String("c29tZSBieXRlcyBmb3IgeW91"), deserializedValue);
+ }
+
+ [Fact]
+ public void ShouldDeserializeChar()
+ {
+ var serializedValue = "{\"@type\":\"gx:Char\",\"@value\":\"x\"}";
+ var reader = CreateStandardGraphSONReader();
+
+ var jObject = JObject.Parse(serializedValue);
+ var deserializedValue = reader.ToObject(jObject);
+
+ Assert.Equal('x', deserializedValue);
+ }
+
+ [Fact]
+ public void ShouldDeserializeInt16()
+ {
+ var serializedValue = "{\"@type\":\"gx:Int16\",\"@value\":100}";
+ var reader = CreateStandardGraphSONReader();
+
+ var jObject = JObject.Parse(serializedValue);
+ var deserializedValue = reader.ToObject(jObject);
+
+ Assert.Equal(100, deserializedValue);
+ }
}
internal class TestGraphSONDeserializer : IGraphSONDeserializer
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddeaf416/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs
index 54dc8f3..a544fb3 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs
@@ -23,6 +23,7 @@
using System;
using System.Collections.Generic;
+using System.Numerics;
using Gremlin.Net.Process.Traversal;
using Gremlin.Net.Process.Traversal.Strategy.Decoration;
using Gremlin.Net.Structure;
@@ -346,6 +347,70 @@ namespace Gremlin.Net.UnitTest.Structure.IO.GraphSON
"{\"@type\":\"g:Lambda\",\"@value\":{\"script\":\"{ it.get() }\",\"language\":\"gremlin-groovy\",\"arguments\":-1}}";
Assert.Equal(expected, graphSon);
}
+
+ [Fact]
+ public void ShouldSerializeTimeSpan()
+ {
+ var writer = CreateStandardGraphSONWriter();
+ var timeSpan = new TimeSpan(5, 4, 3, 2, 1);
+
+ var graphSon = writer.WriteObject(timeSpan);
+
+ const string expected = "{\"@type\":\"gx:Duration\",\"@value\":\"P5DT4H3M2.001S\"}";
+ Assert.Equal(expected, graphSon);
+ }
+
+ [Fact]
+ public void ShouldSerializeBigInteger()
+ {
+ var writer = CreateStandardGraphSONWriter();
+ var bigInteger = BigInteger.Parse("123456789987654321123456789987654321");
+
+ var graphSon = writer.WriteObject(bigInteger);
+
+ const string expected = "{\"@type\":\"gx:BigInteger\",\"@value\":\"123456789987654321123456789987654321\"}";
+ Assert.Equal(expected, graphSon);
+ }
+
+ [Fact]
+ public void ShouldSerializeByte()
+ {
+ var writer = CreateStandardGraphSONWriter();
+
+ var graphSon = writer.WriteObject((byte)1);
+
+ Assert.Equal("{\"@type\":\"gx:Byte\",\"@value\":1}", graphSon);
+ }
+
+ [Fact]
+ public void ShouldSerializeByteBuffer()
+ {
+ var writer = CreateStandardGraphSONWriter();
+
+ var graphSon = writer.WriteObject(Convert.FromBase64String("c29tZSBieXRlcyBmb3IgeW91"));
+
+ Assert.Equal("{\"@type\":\"gx:ByteBuffer\",\"@value\":\"c29tZSBieXRlcyBmb3IgeW91\"}", graphSon);
+ }
+
+ [Fact]
+ public void ShouldSerializeChar()
+ {
+ var writer = CreateStandardGraphSONWriter();
+
+ var graphSon = writer.WriteObject('x');
+
+ Assert.Equal("{\"@type\":\"gx:Char\",\"@value\":\"x\"}", graphSon);
+ }
+
+ [Fact]
+ public void ShouldSerializeInt16()
+ {
+ var writer = CreateStandardGraphSONWriter();
+
+ var graphSon = writer.WriteObject((short)100);
+
+ Assert.Equal("{\"@type\":\"gx:Int16\",\"@value\":100}", graphSon);
+ }
}
internal class TestGraphSONSerializer : IGraphSONSerializer