improve log message

Change-Id: Iaf6441969871bb0c71a550e59160078aca7b02e3
apache · Sep 16, 2019 · 4bc97f8 · 4bc97f8
1 parent 2efaa84
commit 4bc97f8
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/EdgeLabelAPI.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/EdgeLabelAPI.java
@@ -35,6 +35,7 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 
 import com.baidu.hugegraph.HugeGraph;
@@ -107,11 +108,15 @@ public String update(@Context GraphManager manager,
     public String list(@Context GraphManager manager,
                        @PathParam("graph") String graph,
                        @QueryParam("names") List<String> names) {
-        LOG.debug("Graph [{}] get edge labels by names {}", graph, names);
+        if (CollectionUtils.isEmpty(names)) {
+            LOG.debug("Graph [{}] list edge labels", graph);
+        } else {
+            LOG.debug("Graph [{}] get edge labels by names {}", graph, names);
+        }
 
         HugeGraph g = graph(manager, graph);
         List<EdgeLabel> labels;
-        if (names == null || names.isEmpty()) {
+        if (CollectionUtils.isEmpty(names)) {
             labels = g.schema().getEdgeLabels();
         } else {
             labels = new ArrayList<>(names.size());

diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/IndexLabelAPI.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/IndexLabelAPI.java
@@ -34,6 +34,7 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 
 import com.baidu.hugegraph.HugeGraph;
@@ -82,19 +83,23 @@ public String create(@Context GraphManager manager,
     public String list(@Context GraphManager manager,
                        @PathParam("graph") String graph,
                        @QueryParam("names") List<String> names) {
-        LOG.debug("Graph [{}] get index labels by names {}", graph, names);
+        if (CollectionUtils.isEmpty(names)) {
+            LOG.debug("Graph [{}] list index labels", graph);
+        } else {
+            LOG.debug("Graph [{}] get index labels by names {}", graph, names);
+        }
 
         HugeGraph g = graph(manager, graph);
         List<IndexLabel> labels;
-        if (names == null || names.isEmpty()) {
+        if (CollectionUtils.isEmpty(names)) {
             labels = g.schema().getIndexLabels();
         } else {
             labels = new ArrayList<>(names.size());
             for (String name : names) {
                 labels.add(g.schema().getIndexLabel(name));
             }
         }
-        return manager.serializer(g).writeIndexlabels(labels);
+        return manager.serializer(g).writeIndexlabels(mapIndexLabels(labels));
     }
 
     @GET

diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/PropertyKeyAPI.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/PropertyKeyAPI.java
@@ -35,6 +35,7 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 
 import com.baidu.hugegraph.HugeGraph;
@@ -108,11 +109,15 @@ public String update(@Context GraphManager manager,
     public String list(@Context GraphManager manager,
                        @PathParam("graph") String graph,
                        @QueryParam("names") List<String> names) {
-        LOG.debug("Graph [{}] get property keys by names {}", graph, names);
+        if (CollectionUtils.isEmpty(names)) {
+            LOG.debug("Graph [{}] list property keys", graph);
+        } else {
+            LOG.debug("Graph [{}] get property keys by names {}", graph, names);
+        }
 
         HugeGraph g = graph(manager, graph);
         List<PropertyKey> propKeys;
-        if (names == null || names.isEmpty()) {
+        if (CollectionUtils.isEmpty(names)) {
             propKeys = g.schema().getPropertyKeys();
         } else {
             propKeys = new ArrayList<>(names.size());

diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/VertexLabelAPI.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/schema/VertexLabelAPI.java
@@ -35,6 +35,7 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 
 import com.baidu.hugegraph.HugeGraph;
@@ -110,11 +111,15 @@ public String update(@Context GraphManager manager,
     public String list(@Context GraphManager manager,
                        @PathParam("graph") String graph,
                        @QueryParam("names") List<String> names) {
-        LOG.debug("Graph [{}] get vertex labels by names {}", graph, names);
+        if (CollectionUtils.isEmpty(names)) {
+            LOG.debug("Graph [{}] list vertex labels", graph);
+        } else {
+            LOG.debug("Graph [{}] get vertex labels by names {}", graph, names);
+        }
 
         HugeGraph g = graph(manager, graph);
         List<VertexLabel> labels;
-        if (names == null || names.isEmpty()) {
+        if (CollectionUtils.isEmpty(names)) {
             labels = g.schema().getVertexLabels();
         } else {
             labels = new ArrayList<>(names.size());