You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/08/27 00:54:18 UTC
[03/50] [abbrv] tinkerpop git commit: A few tweaks to GraphSON format.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/531dcb59/data/tinkerpop-classic-v2d0-typed.json
----------------------------------------------------------------------
diff --git a/data/tinkerpop-classic-v2d0-typed.json b/data/tinkerpop-classic-v2d0-typed.json
index 56956ea..7401750 100644
--- a/data/tinkerpop-classic-v2d0-typed.json
+++ b/data/tinkerpop-classic-v2d0-typed.json
@@ -1,6 +1,6 @@
-{"id":{"@type":"gremlin:int32","@value":1},"label":"vertex","outE":{"created":[{"id":{"@type":"gremlin:int32","@value":9},"inV":{"@type":"gremlin:int32","@value":3},"properties":{"weight":{"@type":"gremlin:float","@value":0.4}}}],"knows":[{"id":{"@type":"gremlin:int32","@value":7},"inV":{"@type":"gremlin:int32","@value":2},"properties":{"weight":{"@type":"gremlin:float","@value":0.5}}},{"id":{"@type":"gremlin:int32","@value":8},"inV":{"@type":"gremlin:int32","@value":4},"properties":{"weight":{"@type":"gremlin:float","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"gremlin:int32","@value":0},"value":"marko"}],"age":[{"id":{"@type":"gremlin:int32","@value":2},"value":{"@type":"gremlin:int32","@value":29}}]}}
-{"id":{"@type":"gremlin:int32","@value":2},"label":"vertex","inE":{"knows":[{"id":{"@type":"gremlin:int32","@value":7},"outV":{"@type":"gremlin:int32","@value":1},"properties":{"weight":{"@type":"gremlin:float","@value":0.5}}}]},"properties":{"name":[{"id":{"@type":"gremlin:int32","@value":3},"value":"vadas"}],"age":[{"id":{"@type":"gremlin:int32","@value":4},"value":{"@type":"gremlin:int32","@value":27}}]}}
-{"id":{"@type":"gremlin:int32","@value":3},"label":"vertex","inE":{"created":[{"id":{"@type":"gremlin:int32","@value":9},"outV":{"@type":"gremlin:int32","@value":1},"properties":{"weight":{"@type":"gremlin:float","@value":0.4}}},{"id":{"@type":"gremlin:int32","@value":11},"outV":{"@type":"gremlin:int32","@value":4},"properties":{"weight":{"@type":"gremlin:float","@value":0.4}}},{"id":{"@type":"gremlin:int32","@value":12},"outV":{"@type":"gremlin:int32","@value":6},"properties":{"weight":{"@type":"gremlin:float","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"gremlin:int32","@value":5},"value":"lop"}],"lang":[{"id":{"@type":"gremlin:int32","@value":6},"value":"java"}]}}
-{"id":{"@type":"gremlin:int32","@value":4},"label":"vertex","inE":{"knows":[{"id":{"@type":"gremlin:int32","@value":8},"outV":{"@type":"gremlin:int32","@value":1},"properties":{"weight":{"@type":"gremlin:float","@value":1.0}}}]},"outE":{"created":[{"id":{"@type":"gremlin:int32","@value":10},"inV":{"@type":"gremlin:int32","@value":5},"properties":{"weight":{"@type":"gremlin:float","@value":1.0}}},{"id":{"@type":"gremlin:int32","@value":11},"inV":{"@type":"gremlin:int32","@value":3},"properties":{"weight":{"@type":"gremlin:float","@value":0.4}}}]},"properties":{"name":[{"id":{"@type":"gremlin:int32","@value":7},"value":"josh"}],"age":[{"id":{"@type":"gremlin:int32","@value":8},"value":{"@type":"gremlin:int32","@value":32}}]}}
-{"id":{"@type":"gremlin:int32","@value":5},"label":"vertex","inE":{"created":[{"id":{"@type":"gremlin:int32","@value":10},"outV":{"@type":"gremlin:int32","@value":4},"properties":{"weight":{"@type":"gremlin:float","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"gremlin:int32","@value":9},"value":"ripple"}],"lang":[{"id":{"@type":"gremlin:int32","@value":10},"value":"java"}]}}
-{"id":{"@type":"gremlin:int32","@value":6},"label":"vertex","outE":{"created":[{"id":{"@type":"gremlin:int32","@value":12},"inV":{"@type":"gremlin:int32","@value":3},"properties":{"weight":{"@type":"gremlin:float","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"gremlin:int32","@value":11},"value":"peter"}],"age":[{"id":{"@type":"gremlin:int32","@value":12},"value":{"@type":"gremlin:int32","@value":35}}]}}
+{"id":{"@type":"g:Int32","@value":1},"label":"vertex","outE":{"created":[{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.4}}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Float","@value":0.5}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":0},"value":"marko"}],"age":[{"id":{"@type":"g:Int32","@value":2},"value":{"@type":"g:Int32","@value":29}}]}}
+{"id":{"@type":"g:Int32","@value":2},"label":"vertex","inE":{"knows":[{"id":{"@type":"g:Int32","@value":7},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":0.5}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":3},"value":"vadas"}],"age":[{"id":{"@type":"g:Int32","@value":4},"value":{"@type":"g:Int32","@value":27}}]}}
+{"id":{"@type":"g:Int32","@value":3},"label":"vertex","inE":{"created":[{"id":{"@type":"g:Int32","@value":9},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":0.4}}},{"id":{"@type":"g:Int32","@value":11},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":0.4}}},{"id":{"@type":"g:Int32","@value":12},"outV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Float","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":5},"value":"lop"}],"lang":[{"id":{"@type":"g:Int32","@value":6},"value":"java"}]}}
+{"id":{"@type":"g:Int32","@value":4},"label":"vertex","inE":{"knows":[{"id":{"@type":"g:Int32","@value":8},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"outE":{"created":[{"id":{"@type":"g:Int32","@value":10},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Float","@value":1.0}}},{"id":{"@type":"g:Int32","@value":11},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.4}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":7},"value":"josh"}],"age":[{"id":{"@type":"g:Int32","@value":8},"value":{"@type":"g:Int32","@value":32}}]}}
+{"id":{"@type":"g:Int32","@value":5},"label":"vertex","inE":{"created":[{"id":{"@type":"g:Int32","@value":10},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":9},"value":"ripple"}],"lang":[{"id":{"@type":"g:Int32","@value":10},"value":"java"}]}}
+{"id":{"@type":"g:Int32","@value":6},"label":"vertex","outE":{"created":[{"id":{"@type":"g:Int32","@value":12},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":11},"value":"peter"}],"age":[{"id":{"@type":"g:Int32","@value":12},"value":{"@type":"g:Int32","@value":35}}]}}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/531dcb59/data/tinkerpop-crew-v2d0-typed.json
----------------------------------------------------------------------
diff --git a/data/tinkerpop-crew-v2d0-typed.json b/data/tinkerpop-crew-v2d0-typed.json
index e688520..77344c0 100644
--- a/data/tinkerpop-crew-v2d0-typed.json
+++ b/data/tinkerpop-crew-v2d0-typed.json
@@ -1,6 +1,6 @@
-{"id":{"@type":"gremlin:int32","@value":1},"label":"person","outE":{"uses":[{"id":{"@type":"gremlin:int32","@value":16},"inV":{"@type":"gremlin:int32","@value":11},"properties":{"skill":{"@type":"gremlin:int32","@value":5}}},{"id":{"@type":"gremlin:int32","@value":15},"inV":{"@type":"gremlin:int32","@value":10},"properties":{"skill":{"@type":"gremlin:int32","@value":4}}}],"develops":[{"id":{"@type":"gremlin:int32","@value":13},"inV":{"@type":"gremlin:int32","@value":10},"properties":{"since":{"@type":"gremlin:int32","@value":2009}}},{"id":{"@type":"gremlin:int32","@value":14},"inV":{"@type":"gremlin:int32","@value":11},"properties":{"since":{"@type":"gremlin:int32","@value":2010}}}]},"properties":{"name":[{"id":{"@type":"gremlin:int64","@value":0},"value":"marko"}],"location":[{"id":{"@type":"gremlin:int64","@value":6},"value":"san diego","properties":{"startTime":{"@type":"gremlin:int32","@value":1997},"endTime":{"@type":"gremlin:int32","@value":2001}}},{"id":{"@type":"gremlin:int6
4","@value":7},"value":"santa cruz","properties":{"startTime":{"@type":"gremlin:int32","@value":2001},"endTime":{"@type":"gremlin:int32","@value":2004}}},{"id":{"@type":"gremlin:int64","@value":8},"value":"brussels","properties":{"startTime":{"@type":"gremlin:int32","@value":2004},"endTime":{"@type":"gremlin:int32","@value":2005}}},{"id":{"@type":"gremlin:int64","@value":9},"value":"santa fe","properties":{"startTime":{"@type":"gremlin:int32","@value":2005}}}]}}
-{"id":{"@type":"gremlin:int32","@value":7},"label":"person","outE":{"uses":[{"id":{"@type":"gremlin:int32","@value":19},"inV":{"@type":"gremlin:int32","@value":10},"properties":{"skill":{"@type":"gremlin:int32","@value":5}}},{"id":{"@type":"gremlin:int32","@value":20},"inV":{"@type":"gremlin:int32","@value":11},"properties":{"skill":{"@type":"gremlin:int32","@value":4}}}],"develops":[{"id":{"@type":"gremlin:int32","@value":17},"inV":{"@type":"gremlin:int32","@value":10},"properties":{"since":{"@type":"gremlin:int32","@value":2010}}},{"id":{"@type":"gremlin:int32","@value":18},"inV":{"@type":"gremlin:int32","@value":11},"properties":{"since":{"@type":"gremlin:int32","@value":2011}}}]},"properties":{"name":[{"id":{"@type":"gremlin:int64","@value":1},"value":"stephen"}],"location":[{"id":{"@type":"gremlin:int64","@value":10},"value":"centreville","properties":{"startTime":{"@type":"gremlin:int32","@value":1990},"endTime":{"@type":"gremlin:int32","@value":2000}}},{"id":{"@type":"gremlin
:int64","@value":11},"value":"dulles","properties":{"startTime":{"@type":"gremlin:int32","@value":2000},"endTime":{"@type":"gremlin:int32","@value":2006}}},{"id":{"@type":"gremlin:int64","@value":12},"value":"purcellville","properties":{"startTime":{"@type":"gremlin:int32","@value":2006}}}]}}
-{"id":{"@type":"gremlin:int32","@value":8},"label":"person","outE":{"uses":[{"id":{"@type":"gremlin:int32","@value":22},"inV":{"@type":"gremlin:int32","@value":10},"properties":{"skill":{"@type":"gremlin:int32","@value":3}}},{"id":{"@type":"gremlin:int32","@value":23},"inV":{"@type":"gremlin:int32","@value":11},"properties":{"skill":{"@type":"gremlin:int32","@value":3}}}],"develops":[{"id":{"@type":"gremlin:int32","@value":21},"inV":{"@type":"gremlin:int32","@value":10},"properties":{"since":{"@type":"gremlin:int32","@value":2012}}}]},"properties":{"name":[{"id":{"@type":"gremlin:int64","@value":2},"value":"matthias"}],"location":[{"id":{"@type":"gremlin:int64","@value":13},"value":"bremen","properties":{"startTime":{"@type":"gremlin:int32","@value":2004},"endTime":{"@type":"gremlin:int32","@value":2007}}},{"id":{"@type":"gremlin:int64","@value":14},"value":"baltimore","properties":{"startTime":{"@type":"gremlin:int32","@value":2007},"endTime":{"@type":"gremlin:int32","@value":2011}
}},{"id":{"@type":"gremlin:int64","@value":15},"value":"oakland","properties":{"startTime":{"@type":"gremlin:int32","@value":2011},"endTime":{"@type":"gremlin:int32","@value":2014}}},{"id":{"@type":"gremlin:int64","@value":16},"value":"seattle","properties":{"startTime":{"@type":"gremlin:int32","@value":2014}}}]}}
-{"id":{"@type":"gremlin:int32","@value":9},"label":"person","outE":{"uses":[{"id":{"@type":"gremlin:int32","@value":24},"inV":{"@type":"gremlin:int32","@value":10},"properties":{"skill":{"@type":"gremlin:int32","@value":5}}},{"id":{"@type":"gremlin:int32","@value":25},"inV":{"@type":"gremlin:int32","@value":11},"properties":{"skill":{"@type":"gremlin:int32","@value":3}}}]},"properties":{"name":[{"id":{"@type":"gremlin:int64","@value":3},"value":"daniel"}],"location":[{"id":{"@type":"gremlin:int64","@value":17},"value":"spremberg","properties":{"startTime":{"@type":"gremlin:int32","@value":1982},"endTime":{"@type":"gremlin:int32","@value":2005}}},{"id":{"@type":"gremlin:int64","@value":18},"value":"kaiserslautern","properties":{"startTime":{"@type":"gremlin:int32","@value":2005},"endTime":{"@type":"gremlin:int32","@value":2009}}},{"id":{"@type":"gremlin:int64","@value":19},"value":"aachen","properties":{"startTime":{"@type":"gremlin:int32","@value":2009}}}]}}
-{"id":{"@type":"gremlin:int32","@value":10},"label":"software","inE":{"uses":[{"id":{"@type":"gremlin:int32","@value":19},"outV":{"@type":"gremlin:int32","@value":7},"properties":{"skill":{"@type":"gremlin:int32","@value":5}}},{"id":{"@type":"gremlin:int32","@value":22},"outV":{"@type":"gremlin:int32","@value":8},"properties":{"skill":{"@type":"gremlin:int32","@value":3}}},{"id":{"@type":"gremlin:int32","@value":24},"outV":{"@type":"gremlin:int32","@value":9},"properties":{"skill":{"@type":"gremlin:int32","@value":5}}},{"id":{"@type":"gremlin:int32","@value":15},"outV":{"@type":"gremlin:int32","@value":1},"properties":{"skill":{"@type":"gremlin:int32","@value":4}}}],"develops":[{"id":{"@type":"gremlin:int32","@value":17},"outV":{"@type":"gremlin:int32","@value":7},"properties":{"since":{"@type":"gremlin:int32","@value":2010}}},{"id":{"@type":"gremlin:int32","@value":21},"outV":{"@type":"gremlin:int32","@value":8},"properties":{"since":{"@type":"gremlin:int32","@value":2012}}},{"id":
{"@type":"gremlin:int32","@value":13},"outV":{"@type":"gremlin:int32","@value":1},"properties":{"since":{"@type":"gremlin:int32","@value":2009}}}]},"outE":{"traverses":[{"id":{"@type":"gremlin:int32","@value":26},"inV":{"@type":"gremlin:int32","@value":11}}]},"properties":{"name":[{"id":{"@type":"gremlin:int64","@value":4},"value":"gremlin"}]}}
-{"id":{"@type":"gremlin:int32","@value":11},"label":"software","inE":{"traverses":[{"id":{"@type":"gremlin:int32","@value":26},"outV":{"@type":"gremlin:int32","@value":10}}],"uses":[{"id":{"@type":"gremlin:int32","@value":16},"outV":{"@type":"gremlin:int32","@value":1},"properties":{"skill":{"@type":"gremlin:int32","@value":5}}},{"id":{"@type":"gremlin:int32","@value":20},"outV":{"@type":"gremlin:int32","@value":7},"properties":{"skill":{"@type":"gremlin:int32","@value":4}}},{"id":{"@type":"gremlin:int32","@value":23},"outV":{"@type":"gremlin:int32","@value":8},"properties":{"skill":{"@type":"gremlin:int32","@value":3}}},{"id":{"@type":"gremlin:int32","@value":25},"outV":{"@type":"gremlin:int32","@value":9},"properties":{"skill":{"@type":"gremlin:int32","@value":3}}}],"develops":[{"id":{"@type":"gremlin:int32","@value":18},"outV":{"@type":"gremlin:int32","@value":7},"properties":{"since":{"@type":"gremlin:int32","@value":2011}}},{"id":{"@type":"gremlin:int32","@value":14},"outV":{"@
type":"gremlin:int32","@value":1},"properties":{"since":{"@type":"gremlin:int32","@value":2010}}}]},"properties":{"name":[{"id":{"@type":"gremlin:int64","@value":5},"value":"tinkergraph"}]}}
+{"id":{"@type":"g:Int32","@value":1},"label":"person","outE":{"uses":[{"id":{"@type":"g:Int32","@value":16},"inV":{"@type":"g:Int32","@value":11},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":15},"inV":{"@type":"g:Int32","@value":10},"properties":{"skill":{"@type":"g:Int32","@value":4}}}],"develops":[{"id":{"@type":"g:Int32","@value":13},"inV":{"@type":"g:Int32","@value":10},"properties":{"since":{"@type":"g:Int32","@value":2009}}},{"id":{"@type":"g:Int32","@value":14},"inV":{"@type":"g:Int32","@value":11},"properties":{"since":{"@type":"g:Int32","@value":2010}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"marko"}],"location":[{"id":{"@type":"g:Int64","@value":6},"value":"san diego","properties":{"startTime":{"@type":"g:Int32","@value":1997},"endTime":{"@type":"g:Int32","@value":2001}}},{"id":{"@type":"g:Int64","@value":7},"value":"santa cruz","properties":{"startTime":{"@type":"g:Int32","@value":2001},"endTime":{"
@type":"g:Int32","@value":2004}}},{"id":{"@type":"g:Int64","@value":8},"value":"brussels","properties":{"startTime":{"@type":"g:Int32","@value":2004},"endTime":{"@type":"g:Int32","@value":2005}}},{"id":{"@type":"g:Int64","@value":9},"value":"santa fe","properties":{"startTime":{"@type":"g:Int32","@value":2005}}}]}}
+{"id":{"@type":"g:Int32","@value":7},"label":"person","outE":{"uses":[{"id":{"@type":"g:Int32","@value":19},"inV":{"@type":"g:Int32","@value":10},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":20},"inV":{"@type":"g:Int32","@value":11},"properties":{"skill":{"@type":"g:Int32","@value":4}}}],"develops":[{"id":{"@type":"g:Int32","@value":17},"inV":{"@type":"g:Int32","@value":10},"properties":{"since":{"@type":"g:Int32","@value":2010}}},{"id":{"@type":"g:Int32","@value":18},"inV":{"@type":"g:Int32","@value":11},"properties":{"since":{"@type":"g:Int32","@value":2011}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1},"value":"stephen"}],"location":[{"id":{"@type":"g:Int64","@value":10},"value":"centreville","properties":{"startTime":{"@type":"g:Int32","@value":1990},"endTime":{"@type":"g:Int32","@value":2000}}},{"id":{"@type":"g:Int64","@value":11},"value":"dulles","properties":{"startTime":{"@type":"g:Int32","@value":2000},"endTime":
{"@type":"g:Int32","@value":2006}}},{"id":{"@type":"g:Int64","@value":12},"value":"purcellville","properties":{"startTime":{"@type":"g:Int32","@value":2006}}}]}}
+{"id":{"@type":"g:Int32","@value":8},"label":"person","outE":{"uses":[{"id":{"@type":"g:Int32","@value":22},"inV":{"@type":"g:Int32","@value":10},"properties":{"skill":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":23},"inV":{"@type":"g:Int32","@value":11},"properties":{"skill":{"@type":"g:Int32","@value":3}}}],"develops":[{"id":{"@type":"g:Int32","@value":21},"inV":{"@type":"g:Int32","@value":10},"properties":{"since":{"@type":"g:Int32","@value":2012}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"matthias"}],"location":[{"id":{"@type":"g:Int64","@value":13},"value":"bremen","properties":{"startTime":{"@type":"g:Int32","@value":2004},"endTime":{"@type":"g:Int32","@value":2007}}},{"id":{"@type":"g:Int64","@value":14},"value":"baltimore","properties":{"startTime":{"@type":"g:Int32","@value":2007},"endTime":{"@type":"g:Int32","@value":2011}}},{"id":{"@type":"g:Int64","@value":15},"value":"oakland","properties":{"startTime":{"@type":"g:Int32
","@value":2011},"endTime":{"@type":"g:Int32","@value":2014}}},{"id":{"@type":"g:Int64","@value":16},"value":"seattle","properties":{"startTime":{"@type":"g:Int32","@value":2014}}}]}}
+{"id":{"@type":"g:Int32","@value":9},"label":"person","outE":{"uses":[{"id":{"@type":"g:Int32","@value":24},"inV":{"@type":"g:Int32","@value":10},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":25},"inV":{"@type":"g:Int32","@value":11},"properties":{"skill":{"@type":"g:Int32","@value":3}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":3},"value":"daniel"}],"location":[{"id":{"@type":"g:Int64","@value":17},"value":"spremberg","properties":{"startTime":{"@type":"g:Int32","@value":1982},"endTime":{"@type":"g:Int32","@value":2005}}},{"id":{"@type":"g:Int64","@value":18},"value":"kaiserslautern","properties":{"startTime":{"@type":"g:Int32","@value":2005},"endTime":{"@type":"g:Int32","@value":2009}}},{"id":{"@type":"g:Int64","@value":19},"value":"aachen","properties":{"startTime":{"@type":"g:Int32","@value":2009}}}]}}
+{"id":{"@type":"g:Int32","@value":10},"label":"software","inE":{"uses":[{"id":{"@type":"g:Int32","@value":19},"outV":{"@type":"g:Int32","@value":7},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":22},"outV":{"@type":"g:Int32","@value":8},"properties":{"skill":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":24},"outV":{"@type":"g:Int32","@value":9},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":15},"outV":{"@type":"g:Int32","@value":1},"properties":{"skill":{"@type":"g:Int32","@value":4}}}],"develops":[{"id":{"@type":"g:Int32","@value":17},"outV":{"@type":"g:Int32","@value":7},"properties":{"since":{"@type":"g:Int32","@value":2010}}},{"id":{"@type":"g:Int32","@value":21},"outV":{"@type":"g:Int32","@value":8},"properties":{"since":{"@type":"g:Int32","@value":2012}}},{"id":{"@type":"g:Int32","@value":13},"outV":{"@type":"g:Int32","@value":1},"properties":{"since":{"@type":"g:Int32","@v
alue":2009}}}]},"outE":{"traverses":[{"id":{"@type":"g:Int32","@value":26},"inV":{"@type":"g:Int32","@value":11}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":4},"value":"gremlin"}]}}
+{"id":{"@type":"g:Int32","@value":11},"label":"software","inE":{"traverses":[{"id":{"@type":"g:Int32","@value":26},"outV":{"@type":"g:Int32","@value":10}}],"uses":[{"id":{"@type":"g:Int32","@value":16},"outV":{"@type":"g:Int32","@value":1},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":20},"outV":{"@type":"g:Int32","@value":7},"properties":{"skill":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":23},"outV":{"@type":"g:Int32","@value":8},"properties":{"skill":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":25},"outV":{"@type":"g:Int32","@value":9},"properties":{"skill":{"@type":"g:Int32","@value":3}}}],"develops":[{"id":{"@type":"g:Int32","@value":18},"outV":{"@type":"g:Int32","@value":7},"properties":{"since":{"@type":"g:Int32","@value":2011}}},{"id":{"@type":"g:Int32","@value":14},"outV":{"@type":"g:Int32","@value":1},"properties":{"since":{"@type":"g:Int32","@value":2010}}}]},"properties":{"name":[{"id
":{"@type":"g:Int64","@value":5},"value":"tinkergraph"}]}}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/531dcb59/data/tinkerpop-modern-v2d0-typed.json
----------------------------------------------------------------------
diff --git a/data/tinkerpop-modern-v2d0-typed.json b/data/tinkerpop-modern-v2d0-typed.json
index 9a297c3..20973ec 100644
--- a/data/tinkerpop-modern-v2d0-typed.json
+++ b/data/tinkerpop-modern-v2d0-typed.json
@@ -1,6 +1,6 @@
-{"id":{"@type":"gremlin:int32","@value":1},"label":"person","outE":{"created":[{"id":{"@type":"gremlin:int32","@value":9},"inV":{"@type":"gremlin:int32","@value":3},"properties":{"weight":{"@type":"gremlin:double","@value":0.4}}}],"knows":[{"id":{"@type":"gremlin:int32","@value":7},"inV":{"@type":"gremlin:int32","@value":2},"properties":{"weight":{"@type":"gremlin:double","@value":0.5}}},{"id":{"@type":"gremlin:int32","@value":8},"inV":{"@type":"gremlin:int32","@value":4},"properties":{"weight":{"@type":"gremlin:double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"gremlin:int64","@value":0},"value":"marko"}],"age":[{"id":{"@type":"gremlin:int64","@value":1},"value":{"@type":"gremlin:int32","@value":29}}]}}
-{"id":{"@type":"gremlin:int32","@value":2},"label":"person","inE":{"knows":[{"id":{"@type":"gremlin:int32","@value":7},"outV":{"@type":"gremlin:int32","@value":1},"properties":{"weight":{"@type":"gremlin:double","@value":0.5}}}]},"properties":{"name":[{"id":{"@type":"gremlin:int64","@value":2},"value":"vadas"}],"age":[{"id":{"@type":"gremlin:int64","@value":3},"value":{"@type":"gremlin:int32","@value":27}}]}}
-{"id":{"@type":"gremlin:int32","@value":3},"label":"software","inE":{"created":[{"id":{"@type":"gremlin:int32","@value":9},"outV":{"@type":"gremlin:int32","@value":1},"properties":{"weight":{"@type":"gremlin:double","@value":0.4}}},{"id":{"@type":"gremlin:int32","@value":11},"outV":{"@type":"gremlin:int32","@value":4},"properties":{"weight":{"@type":"gremlin:double","@value":0.4}}},{"id":{"@type":"gremlin:int32","@value":12},"outV":{"@type":"gremlin:int32","@value":6},"properties":{"weight":{"@type":"gremlin:double","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"gremlin:int64","@value":4},"value":"lop"}],"lang":[{"id":{"@type":"gremlin:int64","@value":5},"value":"java"}]}}
-{"id":{"@type":"gremlin:int32","@value":4},"label":"person","inE":{"knows":[{"id":{"@type":"gremlin:int32","@value":8},"outV":{"@type":"gremlin:int32","@value":1},"properties":{"weight":{"@type":"gremlin:double","@value":1.0}}}]},"outE":{"created":[{"id":{"@type":"gremlin:int32","@value":10},"inV":{"@type":"gremlin:int32","@value":5},"properties":{"weight":{"@type":"gremlin:double","@value":1.0}}},{"id":{"@type":"gremlin:int32","@value":11},"inV":{"@type":"gremlin:int32","@value":3},"properties":{"weight":{"@type":"gremlin:double","@value":0.4}}}]},"properties":{"name":[{"id":{"@type":"gremlin:int64","@value":6},"value":"josh"}],"age":[{"id":{"@type":"gremlin:int64","@value":7},"value":{"@type":"gremlin:int32","@value":32}}]}}
-{"id":{"@type":"gremlin:int32","@value":5},"label":"software","inE":{"created":[{"id":{"@type":"gremlin:int32","@value":10},"outV":{"@type":"gremlin:int32","@value":4},"properties":{"weight":{"@type":"gremlin:double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"gremlin:int64","@value":8},"value":"ripple"}],"lang":[{"id":{"@type":"gremlin:int64","@value":9},"value":"java"}]}}
-{"id":{"@type":"gremlin:int32","@value":6},"label":"person","outE":{"created":[{"id":{"@type":"gremlin:int32","@value":12},"inV":{"@type":"gremlin:int32","@value":3},"properties":{"weight":{"@type":"gremlin:double","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"gremlin:int64","@value":10},"value":"peter"}],"age":[{"id":{"@type":"gremlin:int64","@value":11},"value":{"@type":"gremlin:int32","@value":35}}]}}
+{"id":{"@type":"g:Int32","@value":1},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Double","@value":0.5}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"marko"}],"age":[{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":29}}]}}
+{"id":{"@type":"g:Int32","@value":2},"label":"person","inE":{"knows":[{"id":{"@type":"g:Int32","@value":7},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":0.5}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"vadas"}],"age":[{"id":{"@type":"g:Int64","@value":3},"value":{"@type":"g:Int32","@value":27}}]}}
+{"id":{"@type":"g:Int32","@value":3},"label":"software","inE":{"created":[{"id":{"@type":"g:Int32","@value":9},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":0.4}}},{"id":{"@type":"g:Int32","@value":11},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":0.4}}},{"id":{"@type":"g:Int32","@value":12},"outV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Double","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":4},"value":"lop"}],"lang":[{"id":{"@type":"g:Int64","@value":5},"value":"java"}]}}
+{"id":{"@type":"g:Int32","@value":4},"label":"person","inE":{"knows":[{"id":{"@type":"g:Int32","@value":8},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"outE":{"created":[{"id":{"@type":"g:Int32","@value":10},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Double","@value":1.0}}},{"id":{"@type":"g:Int32","@value":11},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":6},"value":"josh"}],"age":[{"id":{"@type":"g:Int64","@value":7},"value":{"@type":"g:Int32","@value":32}}]}}
+{"id":{"@type":"g:Int32","@value":5},"label":"software","inE":{"created":[{"id":{"@type":"g:Int32","@value":10},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":8},"value":"ripple"}],"lang":[{"id":{"@type":"g:Int64","@value":9},"value":"java"}]}}
+{"id":{"@type":"g:Int32","@value":6},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":12},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":10},"value":"peter"}],"age":[{"id":{"@type":"g:Int64","@value":11},"value":{"@type":"g:Int32","@value":35}}]}}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/531dcb59/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
index 06fe51c..1378f6e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
@@ -188,7 +188,7 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
AtomicBoolean.class,
AtomicReference.class,
TokenBuffer.class
- ).forEach(e -> graphSONTypeIdResolver.addCustomType(String.format("%s:%s", GraphSONTokens.GREMLIN_TYPE_NAMESPACE, e.getSimpleName().toLowerCase()), e));
+ ).forEach(e -> graphSONTypeIdResolver.addCustomType(String.format("%s:%s", GraphSONTokens.GREMLIN_TYPE_NAMESPACE, e.getSimpleName()), e));
}
public static class Builder implements Mapper.Builder<Builder> {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/531dcb59/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
index efbee8f..cf80428 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
@@ -90,41 +90,41 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
new LinkedHashMap<Class, String>() {{
// Those don't have deserializers because handled by Jackson,
// but we still want to rename them in GraphSON
- put(ByteBuffer.class, "bytebuffer");
- put(Short.class, "int16");
- put(Integer.class, "int32");
- put(Long.class, "int64");
- put(Double.class, "double");
- put(Float.class, "float");
+ put(ByteBuffer.class, "ByteBuffer");
+ put(Short.class, "Int16");
+ put(Integer.class, "Int32");
+ put(Long.class, "Int64");
+ put(Double.class, "Double");
+ put(Float.class, "Float");
// Time serializers/deserializers
- put(Duration.class, "duration");
- put(Instant.class, "instant");
- put(LocalDate.class, "localdate");
- put(LocalDateTime.class, "localdatetime");
- put(LocalTime.class, "localtime");
- put(MonthDay.class, "monthday");
- put(OffsetDateTime.class, "offsetdatetime");
- put(OffsetTime.class, "offsettime");
- put(Period.class, "period");
- put(Year.class, "year");
- put(YearMonth.class, "yearmonth");
- put(ZonedDateTime.class, "zoneddatetime");
- put(ZoneOffset.class, "zoneoffset");
+ put(Duration.class, "Duration");
+ put(Instant.class, "Instant");
+ put(LocalDate.class, "LocalDate");
+ put(LocalDateTime.class, "LocalDateTime");
+ put(LocalTime.class, "LocalTime");
+ put(MonthDay.class, "MonthDay");
+ put(OffsetDateTime.class, "OffsetDateTime");
+ put(OffsetTime.class, "OffsetTime");
+ put(Period.class, "Period");
+ put(Year.class, "Year");
+ put(YearMonth.class, "YearMonth");
+ put(ZonedDateTime.class, "ZonedDateTime");
+ put(ZoneOffset.class, "ZoneOffset");
// Tinkerpop Graph objects
- put(Lambda.class, "lambda");
- put(Vertex.class, "vertex");
- put(Edge.class, "edge");
- put(Property.class, "property");
- put(Path.class, "path");
- put(VertexProperty.class, "vertexproperty");
+ put(Lambda.class, "Lambda");
+ put(Vertex.class, "Vertex");
+ put(Edge.class, "Edge");
+ put(Property.class, "Property");
+ put(Path.class, "Path");
+ put(VertexProperty.class, "VertexProperty");
put(Metrics.class, "metrics");
- put(TraversalMetrics.class, "traversalmetrics");
- put(Traverser.class, "traverser");
- put(Tree.class, "tree");
- put(Bytecode.class, "bytecode");
- put(Bytecode.Binding.class, "binding");
+ put(TraversalMetrics.class, "TraversalMetrics");
+ put(Traverser.class, "Traverser");
+ put(Tree.class, "Tree");
+ put(Bytecode.class, "Bytecode");
+ put(Bytecode.Binding.class, "Binding");
put(AndP.class, "P");
put(OrP.class, "P");
put(P.class, "P");
@@ -341,11 +341,11 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
addSerializer(Bytecode.Binding.class, new GraphSONTraversalSerializersV2d0.BindingJacksonSerializer());
addSerializer(Traverser.class, new GraphSONTraversalSerializersV2d0.TraverserJacksonSerializer());*/
// -- deserializers for traversal
- addDeserializer(Bytecode.class, new GraphSONTraversalSerializersV2d0.BytecodeJacksonDeserializer());
+ //addDeserializer(Bytecode.class, new GraphSONTraversalSerializersV2d0.BytecodeJacksonDeserializer());
//addDeserializer(Enum.class, new GraphSONTraversalSerializersV2d0.EnumJacksonDeserializer());
- addDeserializer(P.class, new GraphSONTraversalSerializersV2d0.PJacksonDeserializer());
- addDeserializer(Lambda.class, new GraphSONTraversalSerializersV2d0.LambdaJacksonDeserializer());
- addDeserializer(Bytecode.Binding.class, new GraphSONTraversalSerializersV2d0.BindingJacksonDeserializer());
+ //addDeserializer(P.class, new GraphSONTraversalSerializersV2d0.PJacksonDeserializer());
+ //addDeserializer(Lambda.class, new GraphSONTraversalSerializersV2d0.LambdaJacksonDeserializer());
+ //addDeserializer(Bytecode.Binding.class, new GraphSONTraversalSerializersV2d0.BindingJacksonDeserializer());
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/531dcb59/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
index 7a50b63..ff8cfd6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
@@ -47,7 +47,7 @@ public final class GraphSONTokens {
public static final String OBJECTS = "objects";
public static final String IN_LABEL = "inVLabel";
public static final String OUT_LABEL = "outVLabel";
- public static final String GREMLIN_TYPE_NAMESPACE = "gremlin";
+ public static final String GREMLIN_TYPE_NAMESPACE = "g";
// TraversalExplanation Tokens
public static final String ORIGINAL = "original";
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/531dcb59/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
index ed10a93..0136199 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
@@ -80,21 +80,21 @@ public class GraphSONMapperV2d0PartialEmbeddedTypeTest extends AbstractGraphSONT
assertEquals(myList, serializeDeserializeAuto(mapper, myList));
// no "@value" property
- String s = "{\""+GraphSONTokens.VALUETYPE+"\":\""+GraphSONTokens.GREMLIN_TYPE_NAMESPACE +":uuid\", \"test\":2}";
+ String s = "{\""+GraphSONTokens.VALUETYPE+"\":\"" + GraphSONTokens.GREMLIN_TYPE_NAMESPACE + ":UUID\", \"test\":2}";
Map<String,Object> map = new LinkedHashMap<>();
- map.put(GraphSONTokens.VALUETYPE, "gremlin:uuid");
+ map.put(GraphSONTokens.VALUETYPE, GraphSONTokens.GREMLIN_TYPE_NAMESPACE + ":UUID");
map.put("test", 2);
Object res = mapper.readValue(s, Object.class);
assertEquals(map, res);
// "@value" and "@type" property reversed
- s = "{\""+GraphSONTokens.VALUEPROP+"\":2, \""+ GraphSONTokens.VALUETYPE+"\":\""+GraphSONTokens.GREMLIN_TYPE_NAMESPACE +":int64\"}";
+ s = "{\""+GraphSONTokens.VALUEPROP+"\":2, \"" + GraphSONTokens.VALUETYPE + "\":\"" + GraphSONTokens.GREMLIN_TYPE_NAMESPACE + ":Int64\"}";
res = mapper.readValue(s, Object.class);
assertEquals(res, 2L);
assertEquals(res.getClass(), Long.class);
// no "@type" property.
- s = "{\""+GraphSONTokens.VALUEPROP+"\":2, \"id\":2}";
+ s = "{\""+GraphSONTokens.VALUEPROP + "\":2, \"id\":2}";
map = new LinkedHashMap<>();
map.put(GraphSONTokens.VALUEPROP, 2);
map.put("id", 2);
@@ -104,14 +104,14 @@ public class GraphSONMapperV2d0PartialEmbeddedTypeTest extends AbstractGraphSONT
@Test
public void shouldFailIfMoreThanTwoPropertiesInATypePattern() {
- String s = "{\"" + GraphSONTokens.VALUEPROP + "\":2, \"" + GraphSONTokens.VALUETYPE + "\":\""+GraphSONTokens.GREMLIN_TYPE_NAMESPACE +":int64\", \"hello\": \"world\"}";
+ String s = "{\"" + GraphSONTokens.VALUEPROP + "\":2, \"" + GraphSONTokens.VALUETYPE + "\":\""+GraphSONTokens.GREMLIN_TYPE_NAMESPACE +":Int64\", \"hello\": \"world\"}";
try {
mapper.readValue(s, Object.class);
fail("Should have failed deserializing because there's more than properties in the type.");
} catch (IOException e) {
assertThat(e.getMessage(), containsString("Detected the type pattern in the JSON payload but the map containing the types and values contains other fields. This is not allowed by the deserializer."));
}
- s = "{\"" + GraphSONTokens.VALUETYPE + "\":\""+GraphSONTokens.GREMLIN_TYPE_NAMESPACE +":int64\",\"" + GraphSONTokens.VALUEPROP + "\":2, \"hello\": \"world\"}";
+ s = "{\"" + GraphSONTokens.VALUETYPE + "\":\""+GraphSONTokens.GREMLIN_TYPE_NAMESPACE +":Int64\",\"" + GraphSONTokens.VALUEPROP + "\":2, \"hello\": \"world\"}";
try {
mapper.readValue(s, Object.class);
fail("Should have failed deserializing because there's more than properties in the type.");
@@ -131,7 +131,7 @@ public class GraphSONMapperV2d0PartialEmbeddedTypeTest extends AbstractGraphSONT
mapper.readValue(inputStream, Instant.class);
fail("Should have failed decoding the value");
} catch (Exception e) {
- assertThat(e.getMessage(), containsString("Could not deserialize the JSON value as required. Nested exception: java.lang.InstantiationException: Cannot deserialize the value with the detected type contained in the JSON ('"+GraphSONTokens.GREMLIN_TYPE_NAMESPACE +":zoneoffset') to the type specified in parameter to the object mapper (class java.time.Instant). Those types are incompatible."));
+ assertThat(e.getMessage(), containsString("Could not deserialize the JSON value as required. Nested exception: java.lang.InstantiationException: Cannot deserialize the value with the detected type contained in the JSON ('" + GraphSONTokens.GREMLIN_TYPE_NAMESPACE + ":ZoneOffset') to the type specified in parameter to the object mapper (class java.time.Instant). Those types are incompatible."));
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/531dcb59/gremlin-python/src/main/jython/gremlin_python/structure/io/graphson.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/structure/io/graphson.py b/gremlin-python/src/main/jython/gremlin_python/structure/io/graphson.py
index 6fb32b6..c3199c6 100644
--- a/gremlin-python/src/main/jython/gremlin_python/structure/io/graphson.py
+++ b/gremlin-python/src/main/jython/gremlin_python/structure/io/graphson.py
@@ -122,12 +122,12 @@ class BytecodeSerializer(GraphSONSerializer):
dict["source"] = sources
if len(steps) > 0:
dict["step"] = steps
- return _SymbolHelper.objectify("bytecode", dict)
+ return _SymbolHelper.objectify("Bytecode", dict)
class TraverserSerializer(GraphSONSerializer):
def _dictify(self, traverser):
- return _SymbolHelper.objectify("traverser", {"value": GraphSONWriter._dictify(traverser.object),
+ return _SymbolHelper.objectify("Traverser", {"value": GraphSONWriter._dictify(traverser.object),
"bulk": GraphSONWriter._dictify(traverser.bulk)})
@@ -153,7 +153,7 @@ class BindingSerializer(GraphSONSerializer):
dict = {}
dict["key"] = binding.key
dict["value"] = GraphSONWriter._dictify(binding.value)
- return _SymbolHelper.objectify("binding", dict)
+ return _SymbolHelper.objectify("Binding", dict)
class LambdaSerializer(GraphSONSerializer):
@@ -171,7 +171,7 @@ class LambdaSerializer(GraphSONSerializer):
dict["arguments"] = eval(dict["script"]).func_code.co_argcount
else:
dict["arguments"] = -1
- return _SymbolHelper.objectify("lambda", dict)
+ return _SymbolHelper.objectify("Lambda", dict)
class NumberSerializer(GraphSONSerializer):
@@ -179,11 +179,11 @@ class NumberSerializer(GraphSONSerializer):
if isinstance(number, bool): # python thinks that 0/1 integers are booleans
return number
elif isinstance(number, long):
- return _SymbolHelper.objectify("int64", number)
+ return _SymbolHelper.objectify("Int64", number)
elif isinstance(number, int):
- return _SymbolHelper.objectify("int32", number)
+ return _SymbolHelper.objectify("Int32", number)
elif isinstance(number, float):
- return _SymbolHelper.objectify("float", number)
+ return _SymbolHelper.objectify("Float", number)
else:
return number
@@ -209,9 +209,9 @@ class NumberDeserializer(GraphSONDeserializer):
def _objectify(self, dict):
type = dict[_SymbolHelper._TYPE]
value = dict[_SymbolHelper._VALUE]
- if type == "gremlin:int32":
+ if type == "g:Int32":
return int(value)
- elif type == "gremlin:int64":
+ elif type == "g:Int64":
return long(value)
else:
return float(value)
@@ -257,7 +257,7 @@ class _SymbolHelper(object):
return _SymbolHelper.symbolMap[symbol] if symbol in _SymbolHelper.symbolMap else symbol
@staticmethod
- def objectify(type, value, prefix="gremlin"):
+ def objectify(type, value, prefix="g"):
return {_SymbolHelper._TYPE: prefix + ":" + type, _SymbolHelper._VALUE: value}
@@ -275,13 +275,13 @@ serializers = {
}
deserializers = {
- "gremlin:traverser": TraverserDeserializer(),
- "gremlin:int32": NumberDeserializer(),
- "gremlin:int64": NumberDeserializer(),
- "gremlin:float": NumberDeserializer(),
- "gremlin:double": NumberDeserializer(),
- "gremlin:vertex": VertexDeserializer(),
- "gremlin:edge": EdgeDeserializer(),
- "gremlin:vertexproperty": VertexPropertyDeserializer(),
- "gremlin:property": PropertyDeserializer()
+ "g:Traverser": TraverserDeserializer(),
+ "g:Int32": NumberDeserializer(),
+ "g:Int64": NumberDeserializer(),
+ "g:Float": NumberDeserializer(),
+ "g:Double": NumberDeserializer(),
+ "g:Vertex": VertexDeserializer(),
+ "g:Edge": EdgeDeserializer(),
+ "g:VertexProperty": VertexPropertyDeserializer(),
+ "g:Property": PropertyDeserializer()
}