You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/03/03 19:10:36 UTC
[4/8] incubator-tinkerpop git commit: Renamed Gremlin Kryo to simply
Gryo.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/929a2889/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1D0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1D0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1D0Test.java
new file mode 100644
index 0000000..158039a
--- /dev/null
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1D0Test.java
@@ -0,0 +1,294 @@
+/*
+ * 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.
+ */
+package org.apache.tinkerpop.gremlin.driver.ser;
+
+import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.structure.Compare;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.util.StreamFactory;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.UnpooledByteBufAllocator;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+/**
+ * Serializer tests that cover non-lossy serialization/deserialization methods.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GryoMessageSerializerV1D0Test {
+ private static final Map<String, Object> config = new HashMap<String, Object>() {{
+ put("serializeResultToString", true);
+ }};
+
+ private UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
+ private ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
+ private static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
+
+ public MessageSerializer binarySerializer = new GryoMessageSerializerV1d0();
+
+ public MessageSerializer textSerializer = new GryoMessageSerializerV1d0();
+
+ public GryoMessageSerializerV1D0Test() {
+ textSerializer.configure(config, null);
+ }
+
+ @Test
+ public void serializeIterable() throws Exception {
+ final ArrayList<Integer> list = new ArrayList<>();
+ list.add(1);
+ list.add(100);
+
+ final ResponseMessage response = convertBinary(list);
+ assertCommon(response);
+
+ final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
+ assertEquals(2, deserializedFunList.size());
+ assertEquals(new Integer(1), deserializedFunList.get(0));
+ assertEquals(new Integer(100), deserializedFunList.get(1));
+ }
+
+ @Test
+ public void serializeIterableToString() throws Exception {
+ final ArrayList<Integer> list = new ArrayList<>();
+ list.add(1);
+ list.add(100);
+
+ final ResponseMessage response = convertText(list);
+ assertCommon(response);
+
+ final List deserializedFunList = (List) response.getResult().getData();
+ assertEquals(2, deserializedFunList.size());
+ assertEquals("1", deserializedFunList.get(0));
+ assertEquals("100", deserializedFunList.get(1));
+ }
+
+ @Test
+ public void serializeIterableToStringWithNull() throws Exception {
+ final ArrayList<Integer> list = new ArrayList<>();
+ list.add(1);
+ list.add(null);
+ list.add(100);
+
+ final ResponseMessage response = convertText(list);
+ assertCommon(response);
+
+ final List deserializedFunList = (List) response.getResult().getData();
+ assertEquals(3, deserializedFunList.size());
+ assertEquals("1", deserializedFunList.get(0).toString());
+ assertEquals("null", deserializedFunList.get(1).toString());
+ assertEquals("100", deserializedFunList.get(2).toString());
+ }
+
+ @Test
+ public void serializeIterableWithNull() throws Exception {
+ final ArrayList<Integer> list = new ArrayList<>();
+ list.add(1);
+ list.add(null);
+ list.add(100);
+
+ final ResponseMessage response = convertBinary(list);
+ assertCommon(response);
+
+ final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
+ assertEquals(3, deserializedFunList.size());
+ assertEquals(new Integer(1), deserializedFunList.get(0));
+ assertNull(deserializedFunList.get(1));
+ assertEquals(new Integer(100), deserializedFunList.get(2));
+ }
+
+ @Test
+ public void serializeMap() throws Exception {
+ final Map<String, Object> map = new HashMap<>();
+ final Map<String, String> innerMap = new HashMap<>();
+ innerMap.put("a", "b");
+
+ map.put("x", 1);
+ map.put("y", "some");
+ map.put("z", innerMap);
+
+ final ResponseMessage response = convertBinary(map);
+ assertCommon(response);
+
+ final Map<String, Object> deserializedMap = (Map<String, Object>) response.getResult().getData();
+ assertEquals(3, deserializedMap.size());
+ assertEquals(1, deserializedMap.get("x"));
+ assertEquals("some", deserializedMap.get("y"));
+
+ final Map<String, String> deserializedInnerMap = (Map<String, String>) deserializedMap.get("z");
+ assertEquals(1, deserializedInnerMap.size());
+ assertEquals("b", deserializedInnerMap.get("a"));
+ }
+
+ @Test
+ public void serializeEdge() throws Exception {
+ final Graph g = TinkerGraph.open();
+ final Vertex v1 = g.addVertex();
+ final Vertex v2 = g.addVertex();
+ final Edge e = v1.addEdge("test", v2);
+ e.property("abc", 123);
+
+ final Iterable<Edge> iterable = g.E().toList();
+
+ final ResponseMessage response = convertBinary(iterable);
+ assertCommon(response);
+
+ final List<DetachedEdge> edgeList = (List<DetachedEdge>) response.getResult().getData();
+ assertEquals(1, edgeList.size());
+
+ final DetachedEdge deserializedEdge = edgeList.get(0);
+ assertEquals(2l, deserializedEdge.id());
+ assertEquals("test", deserializedEdge.label());
+
+ assertEquals(new Integer(123), (Integer) deserializedEdge.value("abc"));
+ assertEquals(1, StreamFactory.stream(deserializedEdge.iterators().propertyIterator()).count());
+ assertEquals(0l, deserializedEdge.iterators().vertexIterator(Direction.OUT).next().id());
+ assertEquals(Vertex.DEFAULT_LABEL, deserializedEdge.iterators().vertexIterator(Direction.OUT).next().label());
+ assertEquals(1l, deserializedEdge.iterators().vertexIterator(Direction.IN).next().id());
+ assertEquals(Vertex.DEFAULT_LABEL, deserializedEdge.iterators().vertexIterator(Direction.IN).next().label());
+ }
+
+ @Test
+ public void serializeVertexWithEmbeddedMap() throws Exception {
+ final Graph g = TinkerGraph.open();
+ final Vertex v = g.addVertex();
+ final Map<String, Object> map = new HashMap<>();
+ map.put("x", 500);
+ map.put("y", "some");
+
+ final ArrayList<Object> friends = new ArrayList<>();
+ friends.add("x");
+ friends.add(5);
+ friends.add(map);
+
+ v.property("friends", friends);
+
+ final List list = g.V().toList();
+
+ final ResponseMessage response = convertBinary(list);
+ assertCommon(response);
+
+ final List<DetachedVertex> vertexList = (List<DetachedVertex>) response.getResult().getData();
+ assertEquals(1, vertexList.size());
+
+ final DetachedVertex deserializedVertex = vertexList.get(0);
+ assertEquals(0l, deserializedVertex.id());
+ assertEquals(Vertex.DEFAULT_LABEL, deserializedVertex.label());
+
+ assertEquals(1, StreamFactory.stream(deserializedVertex.iterators().propertyIterator()).count());
+
+ final List<Object> deserializedInnerList = (List<Object>) deserializedVertex.iterators().valueIterator("friends").next();
+ assertEquals(3, deserializedInnerList.size());
+ assertEquals("x", deserializedInnerList.get(0));
+ assertEquals(5, deserializedInnerList.get(1));
+
+ final Map<String, Object> deserializedInnerInnerMap = (Map<String, Object>) deserializedInnerList.get(2);
+ assertEquals(2, deserializedInnerInnerMap.size());
+ assertEquals(500, deserializedInnerInnerMap.get("x"));
+ assertEquals("some", deserializedInnerInnerMap.get("y"));
+ }
+
+ @Test
+ public void serializeToMapWithElementForKey() throws Exception {
+ final TinkerGraph g = TinkerFactory.createClassic();
+ final Map<Vertex, Integer> map = new HashMap<>();
+ map.put(g.V().has("name", Compare.eq, "marko").next(), 1000);
+
+ final ResponseMessage response = convertBinary(map);
+ assertCommon(response);
+
+ final Map<Vertex, Integer> deserializedMap = (Map<Vertex, Integer>) response.getResult().getData();
+ assertEquals(1, deserializedMap.size());
+
+ final Vertex deserializedMarko = deserializedMap.keySet().iterator().next();
+ assertEquals("marko", deserializedMarko.iterators().valueIterator("name").next().toString());
+ assertEquals(1, deserializedMarko.id());
+ assertEquals(Vertex.DEFAULT_LABEL, deserializedMarko.label());
+ assertEquals(new Integer(29), (Integer) deserializedMarko.iterators().valueIterator("age").next());
+ assertEquals(2, StreamFactory.stream(deserializedMarko.iterators().propertyIterator()).count());
+
+ assertEquals(new Integer(1000), deserializedMap.values().iterator().next());
+ }
+
+ @Test
+ public void serializeFullResponseMessage() throws Exception {
+ final UUID id = UUID.randomUUID();
+
+ final Map<String, Object> metaData = new HashMap<>();
+ metaData.put("test", "this");
+ metaData.put("one", 1);
+
+ final Map<String, Object> attributes = new HashMap<>();
+ attributes.put("test", "that");
+ attributes.put("two", 2);
+
+ final ResponseMessage response = ResponseMessage.build(id)
+ .responseMetaData(metaData)
+ .code(ResponseStatusCode.SUCCESS)
+ .result("some-result")
+ .statusAttributes(attributes)
+ .statusMessage("worked")
+ .create();
+
+ final ByteBuf bb = binarySerializer.serializeResponseAsBinary(response, allocator);
+ final ResponseMessage deserialized = binarySerializer.deserializeResponse(bb);
+
+ assertEquals(id, deserialized.getRequestId());
+ assertEquals("this", deserialized.getResult().getMeta().get("test"));
+ assertEquals(1, deserialized.getResult().getMeta().get("one"));
+ assertEquals("some-result", deserialized.getResult().getData());
+ assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
+ assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
+ assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
+ assertEquals("worked", deserialized.getStatus().getMessage());
+ }
+
+ private void assertCommon(final ResponseMessage response) {
+ assertEquals(requestId, response.getRequestId());
+ assertEquals(ResponseStatusCode.SUCCESS, response.getStatus().getCode());
+ }
+
+ private ResponseMessage convertBinary(final Object toSerialize) throws SerializationException {
+ final ByteBuf bb = binarySerializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
+ return binarySerializer.deserializeResponse(bb);
+ }
+
+ private ResponseMessage convertText(final Object toSerialize) throws SerializationException {
+ final ByteBuf bb = textSerializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
+ return textSerializer.deserializeResponse(bb);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/929a2889/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0Test.java
deleted file mode 100644
index 5514bfc..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/KryoMessageSerializerV1d0Test.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.structure.Compare;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.StreamFactory;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-/**
- * Serializer tests that cover non-lossy serialization/deserialization methods.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class KryoMessageSerializerV1d0Test {
- private static final Map<String, Object> config = new HashMap<String, Object>() {{
- put("serializeResultToString", true);
- }};
-
- private UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
- private ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
- private static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
-
- public MessageSerializer binarySerializer = new KryoMessageSerializerV1d0();
-
- public MessageSerializer textSerializer = new KryoMessageSerializerV1d0();
-
- public KryoMessageSerializerV1d0Test() {
- textSerializer.configure(config, null);
- }
-
- @Test
- public void serializeIterable() throws Exception {
- final ArrayList<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(100);
-
- final ResponseMessage response = convertBinary(list);
- assertCommon(response);
-
- final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
- assertEquals(2, deserializedFunList.size());
- assertEquals(new Integer(1), deserializedFunList.get(0));
- assertEquals(new Integer(100), deserializedFunList.get(1));
- }
-
- @Test
- public void serializeIterableToString() throws Exception {
- final ArrayList<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(100);
-
- final ResponseMessage response = convertText(list);
- assertCommon(response);
-
- final List deserializedFunList = (List) response.getResult().getData();
- assertEquals(2, deserializedFunList.size());
- assertEquals("1", deserializedFunList.get(0));
- assertEquals("100", deserializedFunList.get(1));
- }
-
- @Test
- public void serializeIterableToStringWithNull() throws Exception {
- final ArrayList<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(null);
- list.add(100);
-
- final ResponseMessage response = convertText(list);
- assertCommon(response);
-
- final List deserializedFunList = (List) response.getResult().getData();
- assertEquals(3, deserializedFunList.size());
- assertEquals("1", deserializedFunList.get(0).toString());
- assertEquals("null", deserializedFunList.get(1).toString());
- assertEquals("100", deserializedFunList.get(2).toString());
- }
-
- @Test
- public void serializeIterableWithNull() throws Exception {
- final ArrayList<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(null);
- list.add(100);
-
- final ResponseMessage response = convertBinary(list);
- assertCommon(response);
-
- final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
- assertEquals(3, deserializedFunList.size());
- assertEquals(new Integer(1), deserializedFunList.get(0));
- assertNull(deserializedFunList.get(1));
- assertEquals(new Integer(100), deserializedFunList.get(2));
- }
-
- @Test
- public void serializeMap() throws Exception {
- final Map<String, Object> map = new HashMap<>();
- final Map<String, String> innerMap = new HashMap<>();
- innerMap.put("a", "b");
-
- map.put("x", 1);
- map.put("y", "some");
- map.put("z", innerMap);
-
- final ResponseMessage response = convertBinary(map);
- assertCommon(response);
-
- final Map<String, Object> deserializedMap = (Map<String, Object>) response.getResult().getData();
- assertEquals(3, deserializedMap.size());
- assertEquals(1, deserializedMap.get("x"));
- assertEquals("some", deserializedMap.get("y"));
-
- final Map<String, String> deserializedInnerMap = (Map<String, String>) deserializedMap.get("z");
- assertEquals(1, deserializedInnerMap.size());
- assertEquals("b", deserializedInnerMap.get("a"));
- }
-
- @Test
- public void serializeEdge() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v1 = g.addVertex();
- final Vertex v2 = g.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Edge> iterable = g.E().toList();
-
- final ResponseMessage response = convertBinary(iterable);
- assertCommon(response);
-
- final List<DetachedEdge> edgeList = (List<DetachedEdge>) response.getResult().getData();
- assertEquals(1, edgeList.size());
-
- final DetachedEdge deserializedEdge = edgeList.get(0);
- assertEquals(2l, deserializedEdge.id());
- assertEquals("test", deserializedEdge.label());
-
- assertEquals(new Integer(123), (Integer) deserializedEdge.value("abc"));
- assertEquals(1, StreamFactory.stream(deserializedEdge.iterators().propertyIterator()).count());
- assertEquals(0l, deserializedEdge.iterators().vertexIterator(Direction.OUT).next().id());
- assertEquals(Vertex.DEFAULT_LABEL, deserializedEdge.iterators().vertexIterator(Direction.OUT).next().label());
- assertEquals(1l, deserializedEdge.iterators().vertexIterator(Direction.IN).next().id());
- assertEquals(Vertex.DEFAULT_LABEL, deserializedEdge.iterators().vertexIterator(Direction.IN).next().label());
- }
-
- @Test
- public void serializeVertexWithEmbeddedMap() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v = g.addVertex();
- final Map<String, Object> map = new HashMap<>();
- map.put("x", 500);
- map.put("y", "some");
-
- final ArrayList<Object> friends = new ArrayList<>();
- friends.add("x");
- friends.add(5);
- friends.add(map);
-
- v.property("friends", friends);
-
- final List list = g.V().toList();
-
- final ResponseMessage response = convertBinary(list);
- assertCommon(response);
-
- final List<DetachedVertex> vertexList = (List<DetachedVertex>) response.getResult().getData();
- assertEquals(1, vertexList.size());
-
- final DetachedVertex deserializedVertex = vertexList.get(0);
- assertEquals(0l, deserializedVertex.id());
- assertEquals(Vertex.DEFAULT_LABEL, deserializedVertex.label());
-
- assertEquals(1, StreamFactory.stream(deserializedVertex.iterators().propertyIterator()).count());
-
- final List<Object> deserializedInnerList = (List<Object>) deserializedVertex.iterators().valueIterator("friends").next();
- assertEquals(3, deserializedInnerList.size());
- assertEquals("x", deserializedInnerList.get(0));
- assertEquals(5, deserializedInnerList.get(1));
-
- final Map<String, Object> deserializedInnerInnerMap = (Map<String, Object>) deserializedInnerList.get(2);
- assertEquals(2, deserializedInnerInnerMap.size());
- assertEquals(500, deserializedInnerInnerMap.get("x"));
- assertEquals("some", deserializedInnerInnerMap.get("y"));
- }
-
- @Test
- public void serializeToMapWithElementForKey() throws Exception {
- final TinkerGraph g = TinkerFactory.createClassic();
- final Map<Vertex, Integer> map = new HashMap<>();
- map.put(g.V().has("name", Compare.eq, "marko").next(), 1000);
-
- final ResponseMessage response = convertBinary(map);
- assertCommon(response);
-
- final Map<Vertex, Integer> deserializedMap = (Map<Vertex, Integer>) response.getResult().getData();
- assertEquals(1, deserializedMap.size());
-
- final Vertex deserializedMarko = deserializedMap.keySet().iterator().next();
- assertEquals("marko", deserializedMarko.iterators().valueIterator("name").next().toString());
- assertEquals(1, deserializedMarko.id());
- assertEquals(Vertex.DEFAULT_LABEL, deserializedMarko.label());
- assertEquals(new Integer(29), (Integer) deserializedMarko.iterators().valueIterator("age").next());
- assertEquals(2, StreamFactory.stream(deserializedMarko.iterators().propertyIterator()).count());
-
- assertEquals(new Integer(1000), deserializedMap.values().iterator().next());
- }
-
- @Test
- public void serializeFullResponseMessage() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final Map<String, Object> metaData = new HashMap<>();
- metaData.put("test", "this");
- metaData.put("one", 1);
-
- final Map<String, Object> attributes = new HashMap<>();
- attributes.put("test", "that");
- attributes.put("two", 2);
-
- final ResponseMessage response = ResponseMessage.build(id)
- .responseMetaData(metaData)
- .code(ResponseStatusCode.SUCCESS)
- .result("some-result")
- .statusAttributes(attributes)
- .statusMessage("worked")
- .create();
-
- final ByteBuf bb = binarySerializer.serializeResponseAsBinary(response, allocator);
- final ResponseMessage deserialized = binarySerializer.deserializeResponse(bb);
-
- assertEquals(id, deserialized.getRequestId());
- assertEquals("this", deserialized.getResult().getMeta().get("test"));
- assertEquals(1, deserialized.getResult().getMeta().get("one"));
- assertEquals("some-result", deserialized.getResult().getData());
- assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
- assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
- assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
- assertEquals("worked", deserialized.getStatus().getMessage());
- }
-
- private void assertCommon(final ResponseMessage response) {
- assertEquals(requestId, response.getRequestId());
- assertEquals(ResponseStatusCode.SUCCESS, response.getStatus().getCode());
- }
-
- private ResponseMessage convertBinary(final Object toSerialize) throws SerializationException {
- final ByteBuf bb = binarySerializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
- return binarySerializer.deserializeResponse(bb);
- }
-
- private ResponseMessage convertText(final Object toSerialize) throws SerializationException {
- final ByteBuf bb = textSerializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
- return textSerializer.deserializeResponse(bb);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/929a2889/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
index fc133e3..ab983e9 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
@@ -48,7 +48,7 @@ import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLReader;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader;
-import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoReader;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
import org.apache.tinkerpop.gremlin.structure.strategy.GraphStrategy;
import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
import org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph;
@@ -105,7 +105,7 @@ public abstract class AbstractImportCustomizerProvider implements ImportCustomiz
imports.add(GraphReader.class.getPackage().getName() + DOT_STAR);
imports.add(GraphMLReader.class.getPackage().getName() + DOT_STAR);
imports.add(GraphSONReader.class.getPackage().getName() + DOT_STAR);
- imports.add(KryoReader.class.getPackage().getName() + DOT_STAR);
+ imports.add(GryoReader.class.getPackage().getName() + DOT_STAR);
// algorithms
imports.add(AbstractGenerator.class.getPackage().getName() + DOT_STAR);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/929a2889/gremlin-server/conf/gremlin-server-classic.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-classic.yaml b/gremlin-server/conf/gremlin-server-classic.yaml
index c34f652..e216c1b 100644
--- a/gremlin-server/conf/gremlin-server-classic.yaml
+++ b/gremlin-server/conf/gremlin-server-classic.yaml
@@ -31,8 +31,8 @@ scriptEngines: {
staticImports: [java.lang.Math.PI],
scripts: [scripts/generate-classic.groovy]}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 }
- - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true }}
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0 }
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }}
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
threadPoolBoss: 1
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/929a2889/gremlin-server/conf/gremlin-server-modern.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-modern.yaml b/gremlin-server/conf/gremlin-server-modern.yaml
index d94c3a8..940b48d 100644
--- a/gremlin-server/conf/gremlin-server-modern.yaml
+++ b/gremlin-server/conf/gremlin-server-modern.yaml
@@ -31,8 +31,8 @@ scriptEngines: {
staticImports: [java.lang.Math.PI],
scripts: [scripts/generate-modern.groovy]}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 }
- - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true }}
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0 }
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }}
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
threadPoolBoss: 1
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/929a2889/gremlin-server/conf/gremlin-server-neo4j.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-neo4j.yaml b/gremlin-server/conf/gremlin-server-neo4j.yaml
index 01a68e9..0b33bdb 100644
--- a/gremlin-server/conf/gremlin-server-neo4j.yaml
+++ b/gremlin-server/conf/gremlin-server-neo4j.yaml
@@ -34,8 +34,8 @@ scriptEngines: {
imports: [java.lang.Math],
staticImports: [java.lang.Math.PI]}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 }
- - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true }}
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0 }
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }}
- { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 }
processors:
- { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/929a2889/gremlin-server/conf/gremlin-server.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server.yaml b/gremlin-server/conf/gremlin-server.yaml
index 97ce3c5..40f2c88 100644
--- a/gremlin-server/conf/gremlin-server.yaml
+++ b/gremlin-server/conf/gremlin-server.yaml
@@ -34,8 +34,8 @@ scriptEngines: {
imports: [java.lang.Math],
staticImports: [java.lang.Math.PI]}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 }
- - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true }}
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0 }
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }}
- { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 }
- { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0 }
processors:
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/929a2889/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java
index 765ad28..6bb9509 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinAdditionPerformanceTest.java
@@ -75,7 +75,7 @@ public class GremlinAdditionPerformanceTest extends AbstractGremlinServerPerform
@BenchmarkOptions(benchmarkRounds = 20, warmupRounds = 1, concurrency = BenchmarkOptions.CONCURRENCY_AVAILABLE_CORES)
@Test
public void webSocketsGremlinConcurrentAlternateSerialization() throws Exception {
- final Serializers[] mimes = new Serializers[]{Serializers.JSON, Serializers.JSON_V1D0, Serializers.KRYO_V1D0};
+ final Serializers[] mimes = new Serializers[]{Serializers.JSON, Serializers.JSON_V1D0, Serializers.GRYO_V1D0};
final Serializers mimeType = mimes[rand.nextInt(3)];
System.out.println(mimeType);
final Cluster cluster = Cluster.build("localhost")
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/929a2889/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index d03536a..3d9e258 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -24,8 +24,8 @@ import org.apache.tinkerpop.gremlin.driver.Result;
import org.apache.tinkerpop.gremlin.driver.ResultSet;
import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderKryoSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0;
+import org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer;
+import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
import org.apache.tinkerpop.gremlin.util.TimeUtil;
@@ -239,7 +239,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
public void shouldSerializeToStringWhenRequested() throws Exception {
final Map<String, Object> m = new HashMap<>();
m.put("serializeResultToString", true);
- final KryoMessageSerializerV1d0 serializer = new KryoMessageSerializerV1d0();
+ final GryoMessageSerializerV1d0 serializer = new GryoMessageSerializerV1d0();
serializer.configure(m, null);
final Cluster cluster = Cluster.build().serializer(serializer).create();
@@ -256,8 +256,8 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldDeserializeWithCustomClasses() throws Exception {
final Map<String, Object> m = new HashMap<>();
- m.put("custom", Arrays.asList(String.format("%s;%s", JsonBuilder.class.getCanonicalName(), JsonBuilderKryoSerializer.class.getCanonicalName())));
- final KryoMessageSerializerV1d0 serializer = new KryoMessageSerializerV1d0();
+ m.put("custom", Arrays.asList(String.format("%s;%s", JsonBuilder.class.getCanonicalName(), JsonBuilderGryoSerializer.class.getCanonicalName())));
+ final GryoMessageSerializerV1d0 serializer = new GryoMessageSerializerV1d0();
serializer.configure(m, null);
final Cluster cluster = Cluster.build().serializer(serializer).create();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/929a2889/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
index 7bb082e..124408f 100644
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
+++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
@@ -34,8 +34,8 @@ scriptEngines: {
imports: [java.lang.Math],
staticImports: [java.lang.Math.PI]}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { custom: [groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderKryoSerializer]}}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0, config: { serializeResultToString: true}}
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { custom: [groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true}}
- { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 }
- { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0 }
processors:
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/929a2889/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml
index 6c583cb..59b38e1 100644
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml
+++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml
@@ -34,7 +34,7 @@ scriptEngines: {
imports: [java.lang.Math],
staticImports: [java.lang.Math.PI]}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 }
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0 }
- { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerGremlinV1d0 }
- { className: org.apache.tinkerpop.gremlin.driver.ser.JsonMessageSerializerV1d0 }
processors:
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/929a2889/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGraphProvider.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGraphProvider.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGraphProvider.java
index 15fb629..d29b367 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGraphProvider.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGraphProvider.java
@@ -20,7 +20,7 @@ package org.apache.tinkerpop.gremlin;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
-import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoReader;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
@@ -109,11 +109,11 @@ public abstract class AbstractGraphProvider implements GraphProvider {
}
protected void readIntoGraph(final Graph g, final String path) throws IOException {
- final File workingDirectory = TestHelper.makeTestDataPath(this.getClass(), "kryo-working-directory");
+ final File workingDirectory = TestHelper.makeTestDataPath(this.getClass(), "gryo-working-directory");
if (!workingDirectory.exists()) workingDirectory.mkdirs();
- final GraphReader reader = KryoReader.build()
+ final GraphReader reader = GryoReader.build()
.workingDirectory(workingDirectory.getAbsolutePath())
- .mapper(g.io().kryoMapper().create())
+ .mapper(g.io().gryoMapper().create())
.create();
try (final InputStream stream = AbstractGremlinTest.class.getResourceAsStream(path)) {
reader.readGraph(stream, g);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/929a2889/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
index 20e6f8e..b893891 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
@@ -107,13 +107,13 @@ public @interface LoadGraphWith {
public String location() {
switch (this) {
case CLASSIC:
- return RESOURCE_PATH_PREFIX + "tinkerpop-classic.gio";
+ return RESOURCE_PATH_PREFIX + "tinkerpop-classic.kryo";
case CREW:
- return RESOURCE_PATH_PREFIX + "tinkerpop-crew.gio";
+ return RESOURCE_PATH_PREFIX + "tinkerpop-crew.kryo";
case MODERN:
- return RESOURCE_PATH_PREFIX + "tinkerpop-modern.gio";
+ return RESOURCE_PATH_PREFIX + "tinkerpop-modern.kryo";
case GRATEFUL:
- return RESOURCE_PATH_PREFIX + "grateful-dead.gio";
+ return RESOURCE_PATH_PREFIX + "grateful-dead.kryo";
}
throw new RuntimeException("No file for this GraphData type");
@@ -135,7 +135,7 @@ public @interface LoadGraphWith {
}
}
- public static final String RESOURCE_PATH_PREFIX = "/org/apache/tinkerpop/gremlin/structure/io/kryo/";
+ public static final String RESOURCE_PATH_PREFIX = "/org/apache/tinkerpop/gremlin/structure/io/gryo/";
/**
* The name of the resource to load with full path.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/929a2889/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphWritePerformanceTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphWritePerformanceTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphWritePerformanceTest.java
index b490aab..8c34f41 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphWritePerformanceTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphWritePerformanceTest.java
@@ -29,7 +29,7 @@ import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLWriter;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
-import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoWriter;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
@@ -94,8 +94,8 @@ public class GraphWritePerformanceTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.GRATEFUL)
@BenchmarkOptions(benchmarkRounds = 10, warmupRounds = 0, concurrency = BenchmarkOptions.CONCURRENCY_SEQUENTIAL)
- public void writeKryo() throws Exception {
- final GraphWriter writer = KryoWriter.build().create();
+ public void writeGryo() throws Exception {
+ final GraphWriter writer = GryoWriter.build().create();
final OutputStream os = new ByteArrayOutputStream();
writer.writeGraph(os, g);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/929a2889/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java
index 6b06382..a5d03a1 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java
@@ -47,10 +47,10 @@ import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
import org.apache.tinkerpop.gremlin.structure.io.graphson.LegacyGraphSONReader;
-import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoMapper;
-import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoReader;
-import org.apache.tinkerpop.gremlin.structure.io.kryo.KryoWriter;
-import org.apache.tinkerpop.gremlin.structure.io.kryo.VertexByteArrayInputStream;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.VertexByteArrayInputStream;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
import org.apache.tinkerpop.gremlin.util.StreamFactory;
@@ -304,12 +304,12 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_ANY_IDS)
- public void shouldProperlySerializeCustomIdWithKryo() throws Exception {
+ public void shouldProperlySerializeCustomIdWithGryo() throws Exception {
g.addVertex(T.id, new CustomId("vertex", UUID.fromString("AF4B5965-B176-4552-B3C1-FBBE2F52C305")));
- final KryoMapper kryo = KryoMapper.build().addCustom(CustomId.class).create();
+ final GryoMapper gryo = GryoMapper.build().addCustom(CustomId.class).create();
- final KryoWriter writer = KryoWriter.build().mapper(kryo).create();
- final KryoReader reader = KryoReader.build().mapper(kryo).create();
+ final GryoWriter writer = GryoWriter.build().mapper(gryo).create();
+ final GryoReader reader = GryoReader.build().mapper(gryo).create();
final Configuration configuration = graphProvider.newGraphConfiguration("readGraph", this.getClass(), name.getMethodName());
graphProvider.clear(configuration);
@@ -335,8 +335,8 @@ public class IoTest extends AbstractGremlinTest {
graphProvider.clear(configuration);
final Graph g1 = graphProvider.openTestGraph(configuration);
- final KryoReader reader = g.io().kryoReader().create();
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoReader reader = g.io().gryoReader().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
GraphMigrator.migrateGraph(g, g1, reader, writer);
@@ -355,8 +355,8 @@ public class IoTest extends AbstractGremlinTest {
graphProvider.clear(configuration);
final Graph g1 = graphProvider.openTestGraph(configuration);
- final KryoReader reader = g.io().kryoReader().create();
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoReader reader = g.io().gryoReader().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
GraphMigrator.migrateGraph(g, g1, reader, writer);
@@ -373,15 +373,15 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_NUMERIC_IDS)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
- public void shouldReadWriteModernToKryo() throws Exception {
+ public void shouldReadWriteModernToGryo() throws Exception {
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeGraph(os, g);
final Configuration configuration = graphProvider.newGraphConfiguration("readGraph", this.getClass(), name.getMethodName());
graphProvider.clear(configuration);
final Graph g1 = graphProvider.openTestGraph(configuration);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readGraph(bais, g1);
}
@@ -400,14 +400,14 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_NUMERIC_IDS)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
- public void shouldReadWriteModernToKryoToFileWithHelpers() throws Exception {
- final File f = TestHelper.generateTempFile(this.getClass(), name.getMethodName(), ".gio");
+ public void shouldReadWriteModernToGryoToFileWithHelpers() throws Exception {
+ final File f = TestHelper.generateTempFile(this.getClass(), name.getMethodName(), ".kryo");
try {
- g.io().writeKryo(f.getAbsolutePath());
+ g.io().writeGryo(f.getAbsolutePath());
final Configuration configuration = graphProvider.newGraphConfiguration("readGraph", this.getClass(), name.getMethodName());
final Graph g1 = graphProvider.openTestGraph(configuration);
- g1.io().readKryo(f.getAbsolutePath());
+ g1.io().readGryo(f.getAbsolutePath());
// by making this lossy for float it will assert floats for doubles
assertModernGraph(g1, true, false);
@@ -426,17 +426,17 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_NUMERIC_IDS)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
- public void shouldReadWriteCrewToKryo() throws Exception {
+ public void shouldReadWriteCrewToGryo() throws Exception {
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeGraph(os, g);
final Configuration configuration = graphProvider.newGraphConfiguration("readGraph", this.getClass(), name.getMethodName());
graphProvider.clear(configuration);
final Graph g1 = graphProvider.openTestGraph(configuration);
- final KryoReader reader = KryoReader.build()
- .mapper(g.io().kryoMapper().create())
+ final GryoReader reader = GryoReader.build()
+ .mapper(g.io().gryoMapper().create())
.workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readGraph(bais, g1);
@@ -457,15 +457,15 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_NUMERIC_IDS)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
- public void shouldReadWriteClassicToKryo() throws Exception {
+ public void shouldReadWriteClassicToGryo() throws Exception {
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeGraph(os, g);
final Configuration configuration = graphProvider.newGraphConfiguration("readGraph", this.getClass(), name.getMethodName());
graphProvider.clear(configuration);
final Graph g1 = graphProvider.openTestGraph(configuration);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readGraph(bais, g1);
}
@@ -579,17 +579,17 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_FLOAT_VALUES)
- public void shouldReadWriteEdgeToKryoUsingFloatProperty() throws Exception {
+ public void shouldReadWriteEdgeToGryoUsingFloatProperty() throws Exception {
final Vertex v1 = g.addVertex(T.label, "person");
final Vertex v2 = g.addVertex(T.label, "person");
final Edge e = v1.addEdge("friend", v2, "weight", 0.5f, "acl", "rw");
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeEdge(os, e);
final AtomicBoolean called = new AtomicBoolean(false);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readEdge(bais, detachedEdge -> {
assertEquals(e.id(), detachedEdge.id());
@@ -615,17 +615,17 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldReadWriteEdgeToKryo() throws Exception {
+ public void shouldReadWriteEdgeToGryo() throws Exception {
final Vertex v1 = g.addVertex(T.label, "person");
final Vertex v2 = g.addVertex(T.label, "person");
final Edge e = v1.addEdge("friend", v2, "weight", 0.5d, "acl", "rw");
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeEdge(os, e);
final AtomicBoolean called = new AtomicBoolean(false);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readEdge(bais, detachedEdge -> {
assertEquals(e.id(), detachedEdge.id());
@@ -649,17 +649,17 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldReadWriteDetachedEdgeAsReferenceToKryo() throws Exception {
+ public void shouldReadWriteDetachedEdgeAsReferenceToGryo() throws Exception {
final Vertex v1 = g.addVertex(T.label, "person");
final Vertex v2 = g.addVertex(T.label, "person");
final Edge e = DetachedFactory.detach(v1.addEdge("friend", v2, "weight", 0.5d, "acl", "rw"), false);
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeEdge(os, e);
final AtomicBoolean called = new AtomicBoolean(false);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readEdge(bais, detachedEdge -> {
assertEquals(e.id(), detachedEdge.id());
@@ -683,17 +683,17 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldReadWriteDetachedEdgeToKryo() throws Exception {
+ public void shouldReadWriteDetachedEdgeToGryo() throws Exception {
final Vertex v1 = g.addVertex(T.label, "person");
final Vertex v2 = g.addVertex(T.label, "person");
final Edge e = DetachedFactory.detach(v1.addEdge("friend", v2, "weight", 0.5d, "acl", "rw"), true);
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeEdge(os, e);
final AtomicBoolean called = new AtomicBoolean(false);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readEdge(bais, detachedEdge -> {
assertEquals(e.id(), detachedEdge.id());
@@ -895,18 +895,18 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_SERIALIZABLE_VALUES)
- public void shouldSupportUUIDInKryo() throws Exception {
+ public void shouldSupportUUIDInGryo() throws Exception {
final UUID id = UUID.randomUUID();
final Vertex v1 = g.addVertex(T.label, "person");
final Vertex v2 = g.addVertex(T.label, "person");
final Edge e = v1.addEdge("friend", v2, "uuid", id);
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeEdge(os, e);
final AtomicBoolean called = new AtomicBoolean(false);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readEdge(bais, detachedEdge -> {
assertEquals(e.id(), detachedEdge.id());
@@ -933,18 +933,18 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_FLOAT_VALUES)
- public void shouldReadWriteVertexNoEdgesToKryoUsingFloatProperty() throws Exception {
+ public void shouldReadWriteVertexNoEdgesToGryoUsingFloatProperty() throws Exception {
final Vertex v1 = g.addVertex("name", "marko", "acl", "rw");
final Vertex v2 = g.addVertex();
v1.addEdge("friends", v2, "weight", 0.5f);
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeVertex(os, v1);
final AtomicBoolean called = new AtomicBoolean(false);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais, detachedVertex -> {
assertEquals(v1.id(), detachedVertex.id());
@@ -965,17 +965,17 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldReadWriteVertexNoEdgesToKryo() throws Exception {
+ public void shouldReadWriteVertexNoEdgesToGryo() throws Exception {
final Vertex v1 = g.addVertex("name", "marko", "acl", "rw");
final Vertex v2 = g.addVertex();
v1.addEdge("friends", v2, "weight", 0.5d);
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeVertex(os, v1);
final AtomicBoolean called = new AtomicBoolean(false);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais, detachedVertex -> {
assertEquals(v1.id(), detachedVertex.id());
@@ -996,18 +996,18 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldReadWriteDetachedVertexNoEdgesToKryo() throws Exception {
+ public void shouldReadWriteDetachedVertexNoEdgesToGryo() throws Exception {
final Vertex v1 = g.addVertex("name", "marko", "acl", "rw");
final Vertex v2 = g.addVertex();
v1.addEdge("friends", v2, "weight", 0.5d);
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
final DetachedVertex dv = DetachedFactory.detach(v1, true);
writer.writeVertex(os, dv);
final AtomicBoolean called = new AtomicBoolean(false);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais, detachedVertex -> {
assertEquals(v1.id(), detachedVertex.id());
@@ -1028,18 +1028,18 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldReadWriteDetachedVertexAsReferenceNoEdgesToKryo() throws Exception {
+ public void shouldReadWriteDetachedVertexAsReferenceNoEdgesToGryo() throws Exception {
final Vertex v1 = g.addVertex("name", "marko", "acl", "rw");
final Vertex v2 = g.addVertex();
v1.addEdge("friends", v2, "weight", 0.5d);
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
final DetachedVertex dv = DetachedFactory.detach(v1, false);
writer.writeVertex(os, dv);
final AtomicBoolean called = new AtomicBoolean(false);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais, detachedVertex -> {
assertEquals(v1.id(), detachedVertex.id());
@@ -1060,18 +1060,18 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_MULTI_PROPERTIES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_META_PROPERTIES)
- public void shouldReadWriteVertexMultiPropsNoEdgesToKryo() throws Exception {
+ public void shouldReadWriteVertexMultiPropsNoEdgesToGryo() throws Exception {
final Vertex v1 = g.addVertex("name", "marko", "name", "mark", "acl", "rw");
v1.property("propsSquared", 123, "x", "a", "y", "b");
final Vertex v2 = g.addVertex();
v1.addEdge("friends", v2, "weight", 0.5d);
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeVertex(os, v1);
final AtomicBoolean called = new AtomicBoolean(false);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais, detachedVertex -> {
assertEquals(v1.id(), detachedVertex.id());
@@ -1229,13 +1229,13 @@ public class IoTest extends AbstractGremlinTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.CLASSIC)
- public void shouldReadWriteVerticesNoEdgesToKryoManual() throws Exception {
+ public void shouldReadWriteVerticesNoEdgesToGryoManual() throws Exception {
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeVertices(os, g.V().has("age", Compare.gt, 30));
final AtomicInteger called = new AtomicInteger(0);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final VertexByteArrayInputStream vbais = new VertexByteArrayInputStream(new ByteArrayInputStream(os.toByteArray()))) {
reader.readVertex(new ByteArrayInputStream(vbais.readVertexBytes().toByteArray()),
@@ -1257,13 +1257,13 @@ public class IoTest extends AbstractGremlinTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
- public void shouldReadWriteVerticesNoEdgesToKryo() throws Exception {
+ public void shouldReadWriteVerticesNoEdgesToGryo() throws Exception {
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeVertices(os, g.V().has("age", Compare.gt, 30));
final AtomicInteger called = new AtomicInteger(0);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
final Iterator<Vertex> itty = reader.readVertices(bais, null,
@@ -1315,19 +1315,19 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldReadWriteVertexWithOUTOUTEdgesToKryo() throws Exception {
+ public void shouldReadWriteVertexWithOUTOUTEdgesToGryo() throws Exception {
final Vertex v1 = g.addVertex("name", "marko", T.label, "person");
final Vertex v2 = g.addVertex(T.label, "person");
final Edge e = v1.addEdge("friends", v2, "weight", 0.5d);
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeVertex(os, v1, Direction.OUT);
final AtomicBoolean calledVertex = new AtomicBoolean(false);
final AtomicBoolean calledEdge = new AtomicBoolean(false);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais, Direction.OUT, detachedVertex -> {
@@ -1411,20 +1411,20 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldReadWriteVertexWithININEdgesToKryo() throws Exception {
+ public void shouldReadWriteVertexWithININEdgesToGryo() throws Exception {
final Vertex v1 = g.addVertex("name", "marko", T.label, "person");
final Vertex v2 = g.addVertex(T.label, "person");
final Edge e = v2.addEdge("friends", v1, "weight", 0.5d);
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeVertex(os, v1, Direction.IN);
final AtomicBoolean calledVertex = new AtomicBoolean(false);
final AtomicBoolean calledEdge = new AtomicBoolean(false);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais, Direction.IN, detachedVertex -> {
assertEquals(v1.id(), detachedVertex.id());
@@ -1508,7 +1508,7 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldReadWriteVertexWithBOTHBOTHEdgesToKryo() throws Exception {
+ public void shouldReadWriteVertexWithBOTHBOTHEdgesToGryo() throws Exception {
final Vertex v1 = g.addVertex("name", "marko", T.label, "person");
final Vertex v2 = g.addVertex(T.label, "person");
@@ -1516,14 +1516,14 @@ public class IoTest extends AbstractGremlinTest {
final Edge e2 = v1.addEdge("friends", v2, "weight", 1.0d);
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeVertex(os, v1, Direction.BOTH);
final AtomicBoolean calledVertex = new AtomicBoolean(false);
final AtomicBoolean calledEdge1 = new AtomicBoolean(false);
final AtomicBoolean calledEdge2 = new AtomicBoolean(false);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais, Direction.BOTH, detachedVertex -> {
assertEquals(v1.id(), detachedVertex.id());
@@ -1699,7 +1699,7 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldReadWriteVertexWithBOTHINEdgesToKryo() throws Exception {
+ public void shouldReadWriteVertexWithBOTHINEdgesToGryo() throws Exception {
final Vertex v1 = g.addVertex("name", "marko", T.label, "person");
final Vertex v2 = g.addVertex(T.label, "person");
@@ -1707,13 +1707,13 @@ public class IoTest extends AbstractGremlinTest {
v1.addEdge("friends", v2, "weight", 1.0d);
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeVertex(os, v1, Direction.BOTH);
final AtomicBoolean vertexCalled = new AtomicBoolean(false);
final AtomicBoolean edge1Called = new AtomicBoolean(false);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais, Direction.IN, detachedVertex -> {
assertEquals(v1.id(), detachedVertex.id());
@@ -1805,7 +1805,7 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldReadWriteVertexWithBOTHOUTEdgesToKryo() throws Exception {
+ public void shouldReadWriteVertexWithBOTHOUTEdgesToGryo() throws Exception {
final Vertex v1 = g.addVertex("name", "marko", T.label, "person");
final Vertex v2 = g.addVertex(T.label, "person");
@@ -1813,13 +1813,13 @@ public class IoTest extends AbstractGremlinTest {
final Edge e2 = v1.addEdge("friends", v2, "weight", 1.0d);
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeVertex(os, v1, Direction.BOTH);
final AtomicBoolean vertexCalled = new AtomicBoolean(false);
final AtomicBoolean edgeCalled = new AtomicBoolean(false);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais, Direction.OUT, detachedVertex -> {
assertEquals(v1.id(), detachedVertex.id());
@@ -1911,16 +1911,16 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldReadWriteVertexWithOUTBOTHEdgesToKryo() throws Exception {
+ public void shouldReadWriteVertexWithOUTBOTHEdgesToGryo() throws Exception {
final Vertex v1 = g.addVertex("name", "marko");
final Vertex v2 = g.addVertex();
v1.addEdge("friends", v2, "weight", 0.5d);
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeVertex(os, v1, Direction.OUT);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais,
Direction.BOTH,
@@ -1935,16 +1935,16 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldReadWriteVertexWithINBOTHEdgesToKryo() throws Exception {
+ public void shouldReadWriteVertexWithINBOTHEdgesToGryo() throws Exception {
final Vertex v1 = g.addVertex("name", "marko");
final Vertex v2 = g.addVertex();
v2.addEdge("friends", v1, "weight", 0.5d);
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeVertex(os, v1, Direction.IN);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais,
Direction.BOTH,
@@ -1959,16 +1959,16 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldReadWriteVertexWithINOUTEdgesToKryo() throws Exception {
+ public void shouldReadWriteVertexWithINOUTEdgesToGryo() throws Exception {
final Vertex v1 = g.addVertex("name", "marko");
final Vertex v2 = g.addVertex();
v2.addEdge("friends", v1, "weight", 0.5d);
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeVertex(os, v1, Direction.IN);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais,
Direction.OUT,
@@ -1983,16 +1983,16 @@ public class IoTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldReadWriteVertexWithOUTINEdgesToKryo() throws Exception {
+ public void shouldReadWriteVertexWithOUTINEdgesToGryo() throws Exception {
final Vertex v1 = g.addVertex("name", "marko");
final Vertex v2 = g.addVertex();
v1.addEdge("friends", v2, "weight", 0.5d);
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final KryoWriter writer = g.io().kryoWriter().create();
+ final GryoWriter writer = g.io().gryoWriter().create();
writer.writeVertex(os, v1, Direction.IN);
- final KryoReader reader = g.io().kryoReader().workingDirectory(File.separator + "tmp").create();
+ final GryoReader reader = g.io().gryoReader().workingDirectory(File.separator + "tmp").create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais,
Direction.OUT,
@@ -2527,7 +2527,7 @@ public class IoTest extends AbstractGremlinTest {
private UUID elementId;
private CustomId() {
- // required no-arg for kryo serialization
+ // required no-arg for gryo serialization
}
public CustomId(final String cluster, final UUID elementId) {