Refactor(client): adjust GraphAPI with better application

Author: sadwitdastreetz

hugegraph-client/src/main/java/org/apache/hugegraph/api/graphs/GraphsAPI.java

@@ -203,69 +203,20 @@ public void mode(String graph, GraphMode mode) {
         this.client.put(joinPath(this.path(), graph, MODE), null, mode);
     }
 
-    public void mode(String graph, String graphSpace, GraphMode mode) {
+    public void mode(String graphSpace, String graph, GraphMode mode) {
         // NOTE: Must provide id for PUT. If you use "graph/mode", "/" will
         // be encoded to "%2F". So use "mode" here, although inaccurate.
         this.client.put(joinPath(this.path(), graphSpace, graph, MODE), null, mode);
     }
 
-    public GraphMode mode(String graph, String graphSpace) {
-        RestResult result = this.client.get(joinPath(this.path(), graphSpace, graph), MODE);
-        @SuppressWarnings("unchecked")
-        Map<String, String> mode = result.readObject(Map.class);
-        String value = mode.get(MODE);
-        if (value == null) {
-            throw new InvalidResponseException("Invalid response, expect 'mode' in response");
-        }
-        try {
-            return GraphMode.valueOf(value);
-        } catch (IllegalArgumentException e) {
-            throw new InvalidResponseException("Invalid GraphMode value '%s'", value);
-        }
-    }
-
-
-    public GraphMode mode(String graph) {
-        RestResult result = this.client.get(joinPath(this.path(), graph), MODE);
-        @SuppressWarnings("unchecked")
-        Map<String, String> mode = result.readObject(Map.class);
-        String value = mode.get(MODE);
-        if (value == null) {
-            throw new InvalidResponseException("Invalid response, expect 'mode' in response");
-        }
-        try {
-            return GraphMode.valueOf(value);
-        } catch (IllegalArgumentException e) {
-            throw new InvalidResponseException("Invalid GraphMode value '%s'", value);
-        }
-    }
-
-    public void readMode(String graph, String graphSpace, GraphReadMode readMode) {
+    public void readMode(String graphSpace, String graph, GraphReadMode readMode) {
         this.client.checkApiVersion("0.59", "graph read mode");
         // NOTE: Must provide id for PUT. If you use "graph/graph_read_mode", "/"
         // will be encoded to "%2F". So use "graph_read_mode" here, although
         // inaccurate.
         this.client.put(joinPath(this.path(), graphSpace, graph, GRAPH_READ_MODE), null, readMode);
     }
 
-    public GraphReadMode readMode(String graph, String graphSpace) {
-        this.client.checkApiVersion("0.59", "graph read mode");
-        RestResult result = this.client.get(joinPath(this.path(), graphSpace, graph),
-                                            GRAPH_READ_MODE);
-        @SuppressWarnings("unchecked")
-        Map<String, String> readMode = result.readObject(Map.class);
-        String value = readMode.get(GRAPH_READ_MODE);
-        if (value == null) {
-            throw new InvalidResponseException("Invalid response, expect 'graph_read_mode' " +
-                                               "in response");
-        }
-        try {
-            return GraphReadMode.valueOf(value);
-        } catch (IllegalArgumentException e) {
-            throw new InvalidResponseException("Invalid GraphReadMode value '%s'", value);
-        }
-    }
-
     public void readMode(String graph, GraphReadMode readMode) {
         this.client.checkApiVersion("0.59", "graph read mode");
         // NOTE: Must provide id for PUT. If you use "graph/graph_read_mode", "/"
@@ -274,23 +225,47 @@ public void readMode(String graph, GraphReadMode readMode) {
         this.client.put(joinPath(this.path(), graph, GRAPH_READ_MODE), null, readMode);
     }
 
-    public GraphReadMode readMode(String graph) {
-        this.client.checkApiVersion("0.59", "graph read mode");
-        RestResult result = this.client.get(joinPath(this.path(), graph), GRAPH_READ_MODE);
+    private <T extends Enum<T>> T getEnumMode(String graphSpace, String graph,
+                                              String modeKey, Class<T> enumClass) {
+        String path = (graphSpace != null)
+                      ? joinPath(this.path(), graphSpace, graph)
+                      : joinPath(this.path(), graph);
+
+        RestResult result = this.client.get(path, modeKey);
         @SuppressWarnings("unchecked")
-        Map<String, String> readMode = result.readObject(Map.class);
-        String value = readMode.get(GRAPH_READ_MODE);
+        Map<String, String> map = result.readObject(Map.class);
+        String value = map.get(modeKey);
+
         if (value == null) {
-            throw new InvalidResponseException("Invalid response, expect 'graph_read_mode' " +
-                                               "in response");
+            throw new InvalidResponseException(
+                    "Invalid response, expect '%s' in response", modeKey);
         }
         try {
-            return GraphReadMode.valueOf(value);
+            return Enum.valueOf(enumClass, value);
         } catch (IllegalArgumentException e) {
-            throw new InvalidResponseException("Invalid GraphReadMode value '%s'", value);
+            throw new InvalidResponseException(
+                    "Invalid %s value '%s'", enumClass.getSimpleName(), value);
         }
     }
 
+    public GraphMode mode(String graphSpace, String graph) {
+        return getEnumMode(graphSpace, graph, MODE, GraphMode.class);
+    }
+
+    public GraphMode mode(String graph) {
+        return getEnumMode(null, graph, MODE, GraphMode.class);
+    }
+
+    public GraphReadMode readMode(String graphSpace, String graph) {
+        this.client.checkApiVersion("0.59", "graph read mode");
+        return getEnumMode(graphSpace, graph, GRAPH_READ_MODE, GraphReadMode.class);
+    }
+
+    public GraphReadMode readMode(String graph) {
+        this.client.checkApiVersion("0.59", "graph read mode");
+        return getEnumMode(null, graph, GRAPH_READ_MODE, GraphReadMode.class);
+    }
+
     public String clone(String graph, Map<String, Object> body) {
         RestResult result = this.client.post(joinPath(this.path(), graph,
                                                       "clone"), body);

hugegraph-client/src/main/java/org/apache/hugegraph/client/RestClient.java

@@ -49,7 +49,7 @@ public class RestClient extends AbstractRestClient {
     private Version apiVersion = null;
     @Setter
     @Getter
-    private boolean supportGs = true;
+    private boolean supportGs = false;
 
     public RestClient(String url, String username, String password, int timeout) {
         super(url, username, password, timeout * SECOND);

hugegraph-client/src/main/java/org/apache/hugegraph/driver/GraphsManager.java

@@ -143,7 +143,6 @@ public GraphReadMode readMode(String graph) {
         return this.graphsAPI.readMode(graph);
     }
 
-
     public String clone(String graph, Map<String, Object> body) {
         return this.graphsAPI.clone(graph, body);
     }

hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClient.java

@@ -173,18 +173,10 @@ private void checkServerApiVersion() {
         //       0.81 equals to the {latest_api_version} +10
         VersionUtil.check(apiVersion, "0.38", "0.81", "hugegraph-api in server");
         this.client.apiVersion(apiVersion);
-        boolean supportGs = VersionUtil.gte(this.version.getCoreVersion(), "1.7");
+        boolean supportGs = VersionUtil.gte(this.version.getCoreVersion(), "1.7.0");
         this.client.setSupportGs(supportGs);
     }
 
-    public String getGraphSpaceName() {
-        return graphSpaceName;
-    }
-
-    public String getGraphName() {
-        return graphName;
-    }
-
     public GraphsManager graphs() {
         return this.graphs;
     }