From ae7266d007dbf6d77bb285a576c16b6a5c015b65 Mon Sep 17 00:00:00 2001
From: vaughn <vaughn@apache.org>
Date: Thu, 22 Dec 2022 22:22:34 +0800
Subject: [PATCH] chore: reflactor code

---
 .../hugegraph/backend/query/ConditionQueryFlatten.java     | 7 ++-----
 .../apache/hugegraph/traversal/optimize/HugeGraphStep.java | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQueryFlatten.java b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQueryFlatten.java
index 8034870668..df749014df 100644
--- a/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQueryFlatten.java
+++ b/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQueryFlatten.java
@@ -262,15 +262,12 @@ private static List<ConditionQuery> flattenRelations(ConditionQuery query) {
             }
         }
         relations = optimizeRelations(relations);
-        List<ConditionQuery> conditionQueries = new ArrayList<>();
         if (relations != null) {
             ConditionQuery cq = newQueryFromRelations(query, relations);
             cq.query(nonRelations);
-            conditionQueries.add(cq);
-            return conditionQueries;
+            return ImmutableList.of(cq);
         }
-        conditionQueries.add(query);
-        return conditionQueries;
+        return ImmutableList.of(query);
     }
 
     private static Relations optimizeRelations(Relations relations) {
diff --git a/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeGraphStep.java b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeGraphStep.java
index b4caec4cf1..8045d44627 100644
--- a/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeGraphStep.java
+++ b/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeGraphStep.java
@@ -73,7 +73,7 @@ public HugeGraphStep(final GraphStep<S, E> originGraphStep) {
 
     protected long count() {
         if (this.ids == null) {
-            return 0;
+            return 0L;
         }
 
         if (this.returnsVertex()) {