adapt java-client: support cpyher query api

hugegraph-client/src/main/java/com/baidu/hugegraph/api/gremlin/CypherAPI.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017 HugeGraph Authors
+ *
+ * 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 com.baidu.hugegraph.api.gremlin;
+
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.client.RestClient;
+import com.baidu.hugegraph.rest.RestResult;
+import com.baidu.hugegraph.structure.constant.HugeType;
+import com.baidu.hugegraph.structure.gremlin.Response;
+
+public class CypherAPI extends API {
+
+    private static final String PATH = "graphs/%s/cypher";
+
+    public CypherAPI(RestClient client, String graph) {
+        super(client);
+        this.path(PATH, graph);
+    }
+
+    @Override
+    protected String type() {
+        return HugeType.CYPHER.string();
+    }
+
+    public Response post(String cypher) {
+        RestResult result = this.client.post(this.path(), cypher);
+        return result.readObject(Response.class);
+    }
+}

hugegraph-client/src/main/java/com/baidu/hugegraph/driver/CypherManager.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2017 HugeGraph Authors
+ *
+ * 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 com.baidu.hugegraph.driver;
+
+import com.baidu.hugegraph.api.gremlin.CypherAPI;
+import com.baidu.hugegraph.client.RestClient;
+import com.baidu.hugegraph.structure.gremlin.Response;
+import com.baidu.hugegraph.structure.gremlin.ResultSet;
+
+public class CypherManager {
+
+    private final GraphManager graphManager;
+    private final CypherAPI cypherAPI;
+
+    public CypherManager(RestClient client, String graph,
+                         GraphManager graphManager) {
+        this.graphManager = graphManager;
+        this.cypherAPI = new CypherAPI(client, graph);
+    }
+
+    public ResultSet execute(String cypher) {
+        Response response = this.cypherAPI.post(cypher);
+        response.graphManager(this.graphManager);
+        // TODO: Can add some checks later
+        return response.result();
+    }
+}

hugegraph-client/src/main/java/com/baidu/hugegraph/driver/HugeClient.java

@@ -40,6 +40,7 @@ public class HugeClient implements Closeable {
     private SchemaManager schema;
     private GraphManager graph;
     private GremlinManager gremlin;
+    private CypherManager cypher;
     private TraverserManager traverser;
     private VariablesManager variable;
     private JobManager job;
@@ -97,6 +98,7 @@ private void initManagers(RestClient client, String graph) {
         this.schema = new SchemaManager(client, graph);
         this.graph = new GraphManager(client, graph);
         this.gremlin = new GremlinManager(client, graph, this.graph);
+        this.cypher = new CypherManager(client, graph, this.graph);
         this.traverser = new TraverserManager(client, this.graph);
         this.variable = new VariablesManager(client, graph);
         this.job = new JobManager(client, graph);
@@ -108,7 +110,7 @@ private void initManagers(RestClient client, String graph) {
     private void checkServerApiVersion() {
         VersionUtil.Version apiVersion = VersionUtil.Version.of(
                                          this.version.getApiVersion());
-        VersionUtil.check(apiVersion, "0.38", "0.68",
+        VersionUtil.check(apiVersion, "0.38", "0.70",
                           "hugegraph-api in server");
         this.client.apiVersion(apiVersion);
     }
@@ -129,6 +131,10 @@ public GremlinManager gremlin() {
         return this.gremlin;
     }
 
+    public CypherManager cypher() {
+        return this.cypher;
+    }
+
     public TraverserManager traverser() {
         return this.traverser;
     }

hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/HugeType.java

@@ -60,7 +60,10 @@ public enum HugeType {
     VERSION(230, "versions"),
 
     // Metrics
-    METRICS(240, "metrics");
+    METRICS(240, "metrics"),
+
+    // Cypher
+    CYPHER(250, "cypher");
 
     private int code;
     private String name = null;

hugegraph-client/src/test/java/com/baidu/hugegraph/BaseClientTest.java

@@ -10,6 +10,7 @@
 import org.junit.BeforeClass;
 
 import com.baidu.hugegraph.driver.AuthManager;
+import com.baidu.hugegraph.driver.CypherManager;
 import com.baidu.hugegraph.driver.GraphManager;
 import com.baidu.hugegraph.driver.GraphsManager;
 import com.baidu.hugegraph.driver.GremlinManager;
@@ -77,6 +78,11 @@ public static GremlinManager gremlin() {
         return client.gremlin();
     }
 
+    public static CypherManager cypher() {
+        Assert.assertNotNull("Not opened client", client);
+        return client.cypher();
+    }
+
     public static TraverserManager traverser() {
         Assert.assertNotNull("Not opened client", client);
         return client.traverser();

hugegraph-client/src/test/java/com/baidu/hugegraph/api/CypherApiTest.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2017 HugeGraph Authors
+ *
+ * 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 com.baidu.hugegraph.api;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.baidu.hugegraph.structure.gremlin.ResultSet;
+import com.baidu.hugegraph.testutil.Assert;
+
+public class CypherApiTest extends BaseApiTest {
+
+    @BeforeClass
+    public static void prepareSchema() {
+        BaseApiTest.initPropertyKey();
+        BaseApiTest.initVertexLabel();
+        BaseApiTest.initEdgeLabel();
+    }
+
+    @Before
+    public void prepareData() {
+        BaseApiTest.initVertex();
+        BaseApiTest.initEdge();
+    }
+
+    @Test
+    public void testCreate() {
+        String cypher = "CREATE (n:person { name : 'test', age: 20, city: 'Hefei' }) return n";
+        ResultSet resultSet = cypher().execute(cypher);
+        Assert.assertEquals(1, resultSet.size());
+    }
+
+    @Test
+    public void testRelationQuery() {
+        String cypher = "MATCH (n:person)-[r:knows]->(friend:person)\n" +
+                        "WHERE n.name = 'marko'\n" +
+                        "RETURN n, friend.name AS friend";
+
+        ResultSet resultSet = cypher().execute(cypher);
+        Assert.assertEquals(2, resultSet.size());
+    }
+}