Let vertex and edge adapt simple json properties

Implement #36 Change-Id: I500976931c50fbab384dbd71dbd839aa69dc42d3
hugegraph · Mar 13, 2019 · 363df59 · 363df59
1 parent ef118ea
commit 363df59
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 27 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.baidu.hugegraph</groupId>
     <artifactId>hugegraph-client</artifactId>
-    <version>1.6.8</version>
+    <version>1.6.9</version>
     <packaging>jar</packaging>
 
     <name>hugegraph-client</name>
@@ -112,7 +112,7 @@
                         <manifestEntries>
                             <!-- Must be on one line, otherwise the automatic
                                  upgrade script cannot replace the version number -->
-                            <Implementation-Version>1.6.8.0</Implementation-Version>
+                            <Implementation-Version>1.6.9.0</Implementation-Version>
                         </manifestEntries>
                     </archive>
                 </configuration>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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<Path> {
@@ -41,9 +40,6 @@ public class PathDeserializer extends JsonDeserializer<Path> {
 
     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/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
@@ -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);
     }