From c3ce490f6104576942808a88fdae1e6e7f2b3a2e Mon Sep 17 00:00:00 2001 From: liningrui Date: Wed, 20 Feb 2019 17:59:56 +0800 Subject: [PATCH] Let vertex and edge adapt simple json properties Implement #36 Change-Id: I500976931c50fbab384dbd71dbd839aa69dc42d3 --- src/main/java/com/baidu/hugegraph/client/RestClient.java | 3 --- src/main/java/com/baidu/hugegraph/driver/HugeClient.java | 2 +- .../java/com/baidu/hugegraph/example/BatchExample.java | 6 ------ .../java/com/baidu/hugegraph/example/SingleExample.java | 7 ------- .../com/baidu/hugegraph/serializer/PathDeserializer.java | 4 ---- .../com/baidu/hugegraph/serializer/VertexDeserializer.java | 2 +- .../com/baidu/hugegraph/structure/gremlin/ResultSet.java | 2 -- src/test/java/com/baidu/hugegraph/unit/RestResultTest.java | 2 -- 8 files changed, 2 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/baidu/hugegraph/client/RestClient.java b/src/main/java/com/baidu/hugegraph/client/RestClient.java index 40bb31a2..36efa56d 100644 --- a/src/main/java/com/baidu/hugegraph/client/RestClient.java +++ b/src/main/java/com/baidu/hugegraph/client/RestClient.java @@ -24,9 +24,7 @@ import com.baidu.hugegraph.exception.ServerException; import com.baidu.hugegraph.rest.RestResult; import com.baidu.hugegraph.serializer.PathDeserializer; -import com.baidu.hugegraph.serializer.VertexDeserializer; import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; import com.fasterxml.jackson.databind.module.SimpleModule; public class RestClient extends com.baidu.hugegraph.rest.RestClient { @@ -35,7 +33,6 @@ public class RestClient extends com.baidu.hugegraph.rest.RestClient { static { SimpleModule module = new SimpleModule(); - module.addDeserializer(Vertex.class, new VertexDeserializer()); module.addDeserializer(Path.class, new PathDeserializer()); RestResult.registerModule(module); } diff --git a/src/main/java/com/baidu/hugegraph/driver/HugeClient.java b/src/main/java/com/baidu/hugegraph/driver/HugeClient.java index ce0b5ce8..f052a376 100644 --- a/src/main/java/com/baidu/hugegraph/driver/HugeClient.java +++ b/src/main/java/com/baidu/hugegraph/driver/HugeClient.java @@ -96,7 +96,7 @@ private void initManagers(RestClient client, String graph) { private void checkServerApiVersion() { VersionUtil.Version apiVersion = VersionUtil.Version.of( this.version.getApiVersion()); - VersionUtil.check(apiVersion, "0.33", "0.34", + VersionUtil.check(apiVersion, "0.34", "0.35", "hugegraph-api in server"); } diff --git a/src/main/java/com/baidu/hugegraph/example/BatchExample.java b/src/main/java/com/baidu/hugegraph/example/BatchExample.java index 010437d8..77a6b49b 100644 --- a/src/main/java/com/baidu/hugegraph/example/BatchExample.java +++ b/src/main/java/com/baidu/hugegraph/example/BatchExample.java @@ -61,12 +61,6 @@ public static void main(String[] args) { .ifNotExist() .create(); - schema.indexLabel("personByName") - .onV("person").by("name") - .secondary() - .ifNotExist() - .create(); - schema.indexLabel("softwareByPrice") .onV("software").by("price") .range() diff --git a/src/main/java/com/baidu/hugegraph/example/SingleExample.java b/src/main/java/com/baidu/hugegraph/example/SingleExample.java index 99aa6e17..d127c2f3 100644 --- a/src/main/java/com/baidu/hugegraph/example/SingleExample.java +++ b/src/main/java/com/baidu/hugegraph/example/SingleExample.java @@ -63,13 +63,6 @@ public static void main(String[] args) throws IOException { .ifNotExist() .create(); - schema.indexLabel("personByName") - .onV("person") - .by("name") - .secondary() - .ifNotExist() - .create(); - schema.indexLabel("personByCity") .onV("person") .by("city") diff --git a/src/main/java/com/baidu/hugegraph/serializer/PathDeserializer.java b/src/main/java/com/baidu/hugegraph/serializer/PathDeserializer.java index a7900d59..732ca5f4 100644 --- a/src/main/java/com/baidu/hugegraph/serializer/PathDeserializer.java +++ b/src/main/java/com/baidu/hugegraph/serializer/PathDeserializer.java @@ -32,7 +32,6 @@ import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.node.JsonNodeType; public class PathDeserializer extends JsonDeserializer { @@ -41,9 +40,6 @@ public class PathDeserializer extends JsonDeserializer { public PathDeserializer() { this.mapper = new ObjectMapper(); - SimpleModule module = new SimpleModule(); - module.addDeserializer(Vertex.class, new VertexDeserializer()); - this.mapper.registerModule(module); } @Override diff --git a/src/main/java/com/baidu/hugegraph/serializer/VertexDeserializer.java b/src/main/java/com/baidu/hugegraph/serializer/VertexDeserializer.java index 8b8ad733..8a8d36e9 100644 --- a/src/main/java/com/baidu/hugegraph/serializer/VertexDeserializer.java +++ b/src/main/java/com/baidu/hugegraph/serializer/VertexDeserializer.java @@ -17,7 +17,7 @@ public class VertexDeserializer extends JsonDeserializer { private final ObjectMapper mapper; - public VertexDeserializer() { + private VertexDeserializer() { this.mapper = new ObjectMapper(); } diff --git a/src/main/java/com/baidu/hugegraph/structure/gremlin/ResultSet.java b/src/main/java/com/baidu/hugegraph/structure/gremlin/ResultSet.java index 750e8e89..4c069ebe 100644 --- a/src/main/java/com/baidu/hugegraph/structure/gremlin/ResultSet.java +++ b/src/main/java/com/baidu/hugegraph/structure/gremlin/ResultSet.java @@ -26,7 +26,6 @@ import com.baidu.hugegraph.rest.SerializeException; import com.baidu.hugegraph.serializer.PathDeserializer; -import com.baidu.hugegraph.serializer.VertexDeserializer; import com.baidu.hugegraph.structure.graph.Edge; import com.baidu.hugegraph.structure.graph.Path; import com.baidu.hugegraph.structure.graph.Vertex; @@ -46,7 +45,6 @@ public class ResultSet { static { SimpleModule module = new SimpleModule(); - module.addDeserializer(Vertex.class, new VertexDeserializer()); module.addDeserializer(Path.class, new PathDeserializer()); mapper.registerModule(module); } diff --git a/src/test/java/com/baidu/hugegraph/unit/RestResultTest.java b/src/test/java/com/baidu/hugegraph/unit/RestResultTest.java index f930d38c..81bc2f72 100644 --- a/src/test/java/com/baidu/hugegraph/unit/RestResultTest.java +++ b/src/test/java/com/baidu/hugegraph/unit/RestResultTest.java @@ -13,7 +13,6 @@ import com.baidu.hugegraph.rest.RestResult; import com.baidu.hugegraph.serializer.PathDeserializer; -import com.baidu.hugegraph.serializer.VertexDeserializer; import com.baidu.hugegraph.structure.constant.Cardinality; import com.baidu.hugegraph.structure.constant.DataType; import com.baidu.hugegraph.structure.constant.Frequency; @@ -43,7 +42,6 @@ public class RestResultTest { @BeforeClass public static void init() { SimpleModule module = new SimpleModule(); - module.addDeserializer(Vertex.class, new VertexDeserializer()); module.addDeserializer(Path.class, new PathDeserializer()); RestResult.registerModule(module); }