fix: useless ring detection removed valid path (#1723 )

* remove useless ring detection due to it will remove valid path * limit max depth to 5000 to avoid stackoverflow
improve raft module and test (#1721 )
2022-01-12 22:42:10 +08:00 · 2022-01-12 22:42:09 +08:00 · 2022-01-12 22:42:09 +08:00 · 2022-01-12 22:42:09 +08:00 · 2022-01-12 22:42:09 +08:00 · 2022-01-12 22:42:09 +08:00
2099 changed files with 35623 additions and 226746 deletions
--- a/.asf.yaml
+++ b/.asf.yaml
@ -1,60 +0,0 @@
-#
-# 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.
-#
-
-github:
-  features:
-    # Enable issue management
-    issues: true
-    # Enable wiki for documentation
-    wiki: true
-    # Enable projects for project management boards
-    projects: true
-  description: A graph database that supports more than 100+ billion data, high performance and scalability (Include OLTP Engine & REST-API & Backends)
-  homepage: https://hugegraph.apache.org
-  del_branch_on_merge: true
-  #labels:
-  enabled_merge_buttons:
-    merge:  false
-    rebase: true
-    squash: true
-  protected_branches:
-    master:
-      required_status_checks:
-        # strict means "Require PR to be up-to-date before merging". (enable when branch unstable)
-        strict: false
-        # contexts are the names of checks that must pass (now only enable the basic check)
-        contexts:
-          - Analyze (java)
-          - CodeQL
-          - check-license
-          - build-server (memory, 11)
-          - build-commons (11)
-      required_pull_request_reviews:
-        dismiss_stale_reviews: true
-        require_code_owner_reviews: false
-        required_approving_review_count: 2
-
-# refer https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features#Git.asf.yamlfeatures-Notificationsettingsforrepositories
-notifications:
-  # use https://selfserve.apache.org to manage it
-  pullrequests_status: issues@hugegraph.apache.org
-  pullrequests_comment: issues@hugegraph.apache.org
-  pullrequests_bot_dependabot: issues@hugegraph.apache.org
-  issues: issues@hugegraph.apache.org
-  issues_status: dev@hugegraph.apache.org
-  issues_comment: issues@hugegraph.apache.org
-  discussions: dev@hugegraph.apache.org
--- a/.editorconfig
+++ b/.editorconfig
@ -1,99 +0,0 @@
-#
-# 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.
-#
-
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-max_line_length = 100
-ij_wrap_on_typing = true
-ij_visual_guides = 100
-
-
-[*.{java,xml,py}]
-indent_style = space
-indent_size = 4
-
-[*.{java,xml}]
-# Ignore the IDEA unsupported warning & it works well (indeed)
-continuation_indent_size = 8
-
-[*.md]
-max_line_length = off
-
-[*.java]
-ij_java_doc_add_p_tag_on_empty_lines = true
-ij_java_doc_do_not_wrap_if_one_line = true
-ij_java_annotation_parameter_wrap = normal
-ij_java_align_multiline_annotation_parameters = true
-ij_java_class_count_to_use_import_on_demand = 100
-ij_java_names_count_to_use_import_on_demand = 100
-ij_java_imports_layout = $*, |, java.**, |, javax.**, |, org.**, |, com.**, |, *
-
-ij_java_line_comment_at_first_column = false
-ij_java_align_multiline_chained_methods = true
-ij_java_align_multiline_parameters_in_calls = true
-ij_java_align_multiline_binary_operation = true
-ij_java_align_multiline_assignment = true
-ij_java_align_multiline_ternary_operation = true
-ij_java_align_multiline_throws_list = true
-ij_java_align_multiline_extends_list = true
-ij_java_align_multiline_array_initializer_expression = true
-
-ij_java_call_parameters_wrap = normal
-ij_java_method_parameters_wrap = normal
-ij_java_resource_list_wrap = normal
-ij_java_extends_list_wrap = normal
-ij_java_throws_list_wrap = normal
-ij_java_method_call_chain_wrap = normal
-ij_java_binary_operation_wrap = normal
-ij_java_ternary_operation_wrap = normal
-ij_java_for_statement_wrap = normal
-ij_java_array_initializer_wrap = normal
-ij_java_assignment_wrap = normal
-ij_java_assert_statement_wrap = normal
-ij_java_if_brace_force = if_multiline
-ij_java_do_while_brace_force = always
-ij_java_while_brace_force = if_multiline
-ij_java_for_brace_force = if_multiline
-ij_java_wrap_long_lines = true
-ij_java_parameter_annotation_wrap = normal
-ij_java_enum_constants_wrap = split_into_lines
-
-ij_java_keep_blank_lines_in_declarations = 1
-ij_java_keep_blank_lines_in_code = 1
-ij_java_keep_blank_lines_between_package_declaration_and_header = 1
-ij_java_keep_blank_lines_before_right_brace = 1
-ij_java_blank_lines_around_class = 1
-ij_java_blank_lines_after_class_header = 1
-
-ij_smart_tabs = true
-
-[*.xml]
-max_line_length = 120
-ij_visual_guides = 120
-ij_xml_text_wrap = off
-ij_xml_space_inside_empty_tag = true
-
-[.yaml]
-ij_yaml_spaces_within_braces = false
-ij_yaml_spaces_within_brackets = false
-
-[.properties]
-ij_properties_keep_blank_lines = true
--- a/.gitattributes
+++ b/.gitattributes
@ -1,16 +0,0 @@
-# ignored file when package to source.tgz
-.gitattributes export-ignore
-.gitignore export-ignore
-.asf.yaml export-ignore
-apache-release.sh export-ignore
-.licenserc.yaml export-ignore
-.editorconfig export-ignore
-hugegraph-store/hg-store-dist/src/assembly/static/bin/libjemalloc.so export-ignore
-hugegraph-store/hg-store-dist/src/assembly/static/bin/libjemalloc_aarch64.so export-ignore
-
-# ignored directory
-.github/ export-ignore
-.idea/ export-ignore
-install-dist/scripts/ export-ignore
-hugegraph-commons/hugegraph-dist/ export-ignore
-docker/ export-ignore
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -10,18 +10,18 @@ body:
      value: >-
        ### Note (特别注意) : 

-        > 1. 请先**搜索**现有的[Issues](https://github.com/apache/hugegraph/issues) 与
-        [FAQ](https://hugegraph.apache.org/docs/guides/faq/) 中没有与您相同
+        > 1. 请先**搜索**现有的[Issues](https://github.com/hugegraph/hugegraph/issues) 与
+        [FAQ](https://hugegraph.github.io/hugegraph-doc/guides/faq.html) 中没有与您相同
        / 相关的问题 (请勿重复提交)

        > 2. 我们需要尽可能**详细**的信息来**复现**问题, 越详细的信息 (包括**日志 / 截图 / 配置**等)
        会**越快**被响应和处理

-        > 3. Issue 标题请保留原有分类标签 (例如:`[Bug]`), 长段描述请增加`空行`并使用`序号`标记, 保持排版清晰
+        > 3. Issue 标题请保持原有模板分类(例如:`[Bug]`), 长段描述之间可以增加`空行`或使用`序号`标记, 保持排版清晰

        > 4. 请在对应的模块提交 issue, 缺乏有效信息 / 长时间 (> 14 天) 没有回复的 issue 可能会被 **关闭**
        (更新时会再开启)
-
+  
  - type: dropdown
    attributes:
      label: Bug Type (问题类型)
@ -31,38 +31,36 @@ body:
        - other exception / error (其他异常报错)
        - server status (启动/运行异常)
        - logic (逻辑设计问题)
-        - performance (性能下降)
+        - performence (性能下降)
        - others (please edit later)
-
+  
  - type: checkboxes
    attributes:
      label: Before submit
      options:
-        - label: '我已经确认现有的 [Issues](https://github.com/apache/hugegraph/issues) 与
-         [FAQ](https://hugegraph.apache.org/docs/guides/faq/) 中没有相同 / 重复问题 (I have confirmed 
-         and searched that there are no similar problems in the historical issue and documents)'
+        - label: 我已经确认现有的 [Issues](https://github.com/hugegraph/hugegraph/issues) 与 [FAQ](https://hugegraph.github.io/hugegraph-doc/guides/faq.html) 中没有相同 / 重复问题
          required: true

  - type: textarea
    attributes:
      label: Environment (环境信息)
      description: |
-        > server version could get from [rest-api](https://hugegraph.apache.org/docs/clients/restful-api/) (http://localhost:8080/versions)
+        > server version could get from [rest-api](https://hugegraph.github.io/hugegraph-doc/clients/restful-api/other.html) (http://localhost:8080/versions)
      value: |
-        - Server Version: 1.0.0 (Apache Release Version)
+        - Server Version: v0.11.x
        - Backend: RocksDB x nodes, HDD or SSD 
-        - OS: xx CPUs, xx G RAM, Ubuntu 2x.x / CentOS 7.x 
+        - OS: xx CPUs, xx G RAM, Centos 7.x 
        - Data Size:  xx vertices, xx edges <!-- (like 1000W 点, 9000W 边) -->
    validations:
      required: true
-
+  
  - type: textarea
    attributes:
      label: Expected & Actual behavior (期望与实际表现)
      description: |
        > we can refer [How to create a minimal reproducible Example](https://stackoverflow.com/help/minimal-reproducible-example) (如何提供最简的可复现用例)
-        > if possible, please provide **screenshots** / Pic or `GIF` (请提供清晰的截图, 动图录屏更佳)
-      placeholder: |
+        > if possible, please provide screenshots or GIF (请提供清晰的截图, 动图录屏更佳)
+      placeholder: |        
        type the main problem here 
        
        ```java
@ -71,7 +69,7 @@ body:
        ```
    validations:
      required: true
-
+  
  - type: textarea
    attributes:
      label: Vertex/Edge example (问题点 / 边数据举例)
@ -86,7 +84,7 @@ body:
          "vertex": { "id": "xxx" }
        }
      render: javascript
-
+  
  - type: textarea
    attributes:
      label: Schema [VertexLabel, EdgeLabel, IndexLabel] (元数据结构)
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -2,9 +2,9 @@ blank_issues_enabled: false

 # 设置提 issue 前的参考文档
 contact_links:
-  - name: HugeGraph Server Doc (EN/CN)
-    url: https://hugegraph.apache.org/docs/quickstart/hugegraph-server/
+  - name: HugeGraph Server Doc
+    url: https://hugegraph.github.io/hugegraph-doc/quickstart/hugegraph-server.html
    about: Please search question here before opening a new issue
-  - name: HugeGraph API Doc (EN/CN)
-    url: https://hugegraph.apache.org/docs/clients/
+  - name: HugeGraph API Doc
+    url: https://hugegraph.github.io/hugegraph-doc/clients/hugegraph-api.html
    about: Please search usage here before opening a new issue
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@ -10,6 +10,6 @@ body:
      label: Feature Description (功能描述)
      description: |
        > 请简要描述新功能 / 需求的使用场景或上下文, 最好能给个具体的例子说明
-      placeholder: type the feature description here
+      placeholder: type the feature description here 
    validations:
      required: true
--- a/.github/ISSUE_TEMPLATE/question_ask.yml
+++ b/.github/ISSUE_TEMPLATE/question_ask.yml
@ -8,18 +8,18 @@ body:
      value: >-
        ### Note (特别注意) : 

-        > 1. 请先**搜索**现有的[Issues](https://github.com/apache/hugegraph/issues) 与
-        [FAQ](https://hugegraph.apache.org/docs/guides/faq/) 中没有与您相同
+        > 1. 请先**搜索**现有的[Issues](https://github.com/hugegraph/hugegraph/issues) 与
+        [FAQ](https://hugegraph.github.io/hugegraph-doc/guides/faq.html) 中没有与您相同
        / 相关的问题 (请勿重复提交)

        > 2. 我们需要尽可能**详细**的信息来**复现**问题, 越详细的信息 (包括**日志 / 截图 / 配置**等)
        会**越快**被响应和处理

-        > 3. Issue 标题请保留原有分类标签 (例如:`[Bug]`), 长段描述请增加`空行`并使用`序号`标记, 保持排版清晰
+        > 3. Issue 标题请保持原有模板分类(例如:`[Bug]`), 长段描述之间可以增加`空行`或使用`序号`标记, 保持排版清晰

        > 4. 请在对应的模块提交 issue, 缺乏有效信息 / 长时间 (> 14 天) 没有回复的 issue 可能会被 **关闭**
        (更新时会再开启)
-
+  
  - type: dropdown
    attributes:
      label: Problem Type (问题类型)
@ -29,40 +29,37 @@ body:
        - server status (启动/运行异常)
        - configs (配置项 / 文档相关)
        - struct / logic (架构 / 逻辑设计问题)
-        - performance (性能优化)
+        - performence (性能优化)
        - other exception / error (其他异常报错)
        - others (please edit later)
-
+  
  - type: checkboxes
    attributes:
      label: Before submit
      options:
-        - label: '我已经确认现有的 [Issues](https://github.com/apache/hugegraph/issues) 与
-         [FAQ](https://hugegraph.apache.org/docs/guides/faq/) 中没有相同 / 重复问题 (I have confirmed 
-         and searched that there are no similar problems in the historical issue and documents)'
+        - label: 我已经确认现有的 [Issues](https://github.com/hugegraph/hugegraph/issues) 与 [FAQ](https://hugegraph.github.io/hugegraph-doc/guides/faq.html) 中没有相同 / 重复问题
          required: true

  - type: textarea
    attributes:
      label: Environment (环境信息)
      description: |
-        > server version could get from [rest-api](https://hugegraph.apache.org/docs/clients/restful-api/) (http://localhost:8080/versions)
+        > server version could get from [rest-api](https://hugegraph.github.io/hugegraph-doc/clients/restful-api/other.html) (http://localhost:8080/versions)
      value: |
-        - Server Version: 1.0.0 (Apache Release Version)
+        - Server Version: v0.11.x
        - Backend: RocksDB x nodes, HDD or SSD 
-        - OS: xx CPUs, xx G RAM, Ubuntu 2x.x / CentOS 7.x 
+        - OS: xx CPUs, xx G RAM, Centos 7.x 
        - Data Size:  xx vertices, xx edges <!-- (like 1000W 点, 9000W 边) -->
    validations:
      required: true
-
+  
  - type: textarea
    attributes:
      label: Your Question (问题描述)
      description: |
-        > 图使用 / 配置相关问题，请优先参考 [REST-API 文档](https://hugegraph.apache.org/docs/clients/restful-api/), 
-        > 以及 [Server 配置文档](https://hugegraph.apache.org/docs/config/)
-        > if possible, please provide **screenshots** / Pic or `GIF` (请提供清晰的截图, 动图录屏更佳)
-      placeholder: |
+        > 图使用 / 配置相关问题，请优先参考 [REST-API 文档](https://hugegraph.github.io/hugegraph-doc/clients/hugegraph-api.html), 以及 [Server 配置文档](https://hugegraph.github.io/hugegraph-doc/config/config-option.html)
+        > if possible, please provide screenshots or GIF (请提供清晰的截图, 动图录屏更佳)
+      placeholder: |        
        type the main problem here 
        
        ```java
@ -71,7 +68,7 @@ body:
        ```
    validations:
      required: true
-
+  
  - type: textarea
    attributes:
      label: Vertex/Edge example (问题点 / 边数据举例)
@ -86,7 +83,7 @@ body:
          "vertex": { "id": "xxx" }
        }
      render: javascript
-
+  
  - type: textarea
    attributes:
      label: Schema [VertexLabel, EdgeLabel, IndexLabel] (元数据结构)
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -1,67 +0,0 @@
-<!-- 
-  Thank you very much for contributing to Apache HugeGraph, we are happy that you want to help us improve it!
-
-  Here are some tips for you:
-    1. If this is your first time, please read the [contributing guidelines](https://github.com/apache/hugegraph/blob/master/CONTRIBUTING.md)
-
-    2. If a PR fix/close an issue, type the message "close xxx" (xxx is the link of related 
-issue) in the content, GitHub will auto link it (Required)
-
-    3. Name the PR title in "Google Commit Format", start with "feat | fix | perf | refactor | doc | chore", 
-      such like: "feat(core): support the PageRank algorithm" or "fix: wrong break in the compute loop" (module is optional)
-      skip it if you are unsure about which is the best component.
-
-    4. One PR address one issue, better not to mix up multiple issues.
-
-    5. Put an `x` in the `[ ]` to mark the item as CHECKED. `[x]` (or click it directly after 
-published)
-->
-
-## Purpose of the PR
-
- close #xxx <!-- or use "fix #xxx", "xxx" is the ID-link of related issue, e.g: close #1024 -->
-
-<!--
-Please explain more context in this section, clarify why the changes are needed. 
-e.g:
- If you propose a new API, clarify the use case for a new API.
- If you fix a bug, you can clarify why it is a bug, and should be associated with an issue.
-->
-
-## Main Changes
-
-<!-- Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue. These change logs are helpful for better and faster reviews.)
-
-For example:
-
- If you introduce a new feature, please show detailed design here or add the link of design documentation.
- If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
- If there is a discussion in the mailing list, please add the link. -->
-
-## Verifying these changes
-
-<!-- Please pick the proper options below -->
-
- [ ] Trivial rework / code cleanup without any test coverage. (No Need)
- [ ] Already covered by existing tests, such as *(please modify tests here)*.
- [ ] Need tests and can be verified as follows:
-    - xxx
-
-## Does this PR potentially affect the following parts?
-
-<!-- DO NOT REMOVE THIS SECTION. CHECK THE PROPER BOX ONLY. -->
-
- [ ]  Dependencies ([add/update license](https://hugegraph.apache.org/docs/contribution-guidelines/contribute/#321-check-licenses) info & [regenerate_dependencies](../hugegraph-server/hugegraph-dist/scripts/dependency/regenerate_known_dependencies.sh)) <!-- Don't forget to add/update the info in "LICENSE" & "NOTICE" files (both in root & dist module) -->
- [ ]  Modify configurations
- [ ]  The public API
- [ ]  Other affects (typed here)
- [ ]  Nope
-
-
-## Documentation Status
-
-<!-- DO NOT REMOVE THIS SECTION. CHECK THE PROPER BOX ONLY. -->
-
- [ ]  `Doc - TODO` <!-- Your PR changes impact docs and you will update later -->
- [ ]  `Doc - Done` <!-- Related docs have been already added or updated -->
- [ ]  `Doc - No Need` <!-- Your PR changes don't impact/need docs -->
--- a/.github/configs/settings.xml
+++ b/.github/configs/settings.xml
@ -1,43 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd">
-    <servers>
-        <server>
-            <id>github</id>
-            <username>${env.GITHUB_ACTOR}</username>
-            <password>${env.GITHUB_TOKEN}</password>
-        </server>
-    </servers>
-
-    <profiles>
-        <profile>
-            <id>local-repo</id>
-            <repositories>
-                <repository>
-                    <id>central</id>
-                    <url>https://repo.maven.apache.org/maven2</url>
-                    <releases>
-                        <enabled>true</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </repository>
-                <repository>
-                    <id>staged-releases</id>
-                    <url>https://repository.apache.org/content/groups/staging/</url>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>staged-releases</id>
-                    <url>https://repository.apache.org/content/groups/staging/</url>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
-    </profiles>
-
-    <activeProfiles>
-        <activeProfile>local-repo</activeProfile>
-    </activeProfiles>
-</settings>
--- a/.github/outdated/cla.yml
+++ b/.github/outdated/cla.yml
@ -1,35 +0,0 @@
-name: "CLA Assistant"
-on:
-  issue_comment:
-    types: [created]
-  pull_request_target:
-    types: [opened,closed,synchronize]
-
-jobs:
-  CLAssistant:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "CLA Assistant"
-        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
-        uses: cla-assistant/github-action@v2.1.3-beta
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # the below token should have repo scope and must be manually added by you in the repository's secret
-          PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-        with:
-          path-to-signatures: '.github/cla-signatures/cla.json'
-          path-to-document: 'https://github.com/hugegraph/hugegraph-doc/blob/master/CLA.md' # e.g. a CLA or a DCO document
-          custom-allsigned-prcomment: '**Good**! All Contributors have signed the [CLA](https://github.com/hugegraph/hugegraph-doc/blob/master/CLA.md).'
-          # branch should not be protected
-          branch: 'cla-assist'
-          allowlist: bot*
-          lock-pullrequest-aftermerge: false
-
-         # the following are the optional inputs - If the optional inputs are not given, then default values will be taken
-          #remote-organization-name: enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository)
-          #remote-repository-name:  enter the  remote repository name where the signatures should be stored (Default is storing the signatures in the same repository)
-          #create-file-commit-message: 'For example: Creating file for storing CLA Signatures'
-          #signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo'
-          #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign'
-          #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
-          #use-dco-flag: true - If you are using DCO instead of CLA
--- a/.github/workflows/check-dependencies.yml
+++ b/.github/workflows/check-dependencies.yml
@ -1,56 +0,0 @@
-name: "3rd-party"
-
-on:
-  push:
-    branches:
-      - /^release-.*$/
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  dependency-check:
-    runs-on: ubuntu-latest
-    env:
-      USE_STAGE: 'true' # Whether to include the stage repository.
-      SCRIPT_DEPENDENCY: install-dist/scripts/dependency
-    steps:
-      - name: Checkout source
-        uses: actions/checkout@v4
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-
-      - name: use staged maven repo settings
-        if: ${{ env.USE_STAGE == 'true' }}
-        run: |
-          cp $HOME/.m2/settings.xml /tmp/settings.xml
-          mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml
-
-      - name: mvn install
-        run: |
-          mvn install -Dmaven.test.skip=true -ntp
-      - name: generate current dependencies
-        run: |
-          bash $SCRIPT_DEPENDENCY/regenerate_known_dependencies.sh current-dependencies.txt
-      - name: check third dependencies
-        run: |
-          bash $SCRIPT_DEPENDENCY/check_dependencies.sh
-
-  dependency-review:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Checkout Repository'
-        uses: actions/checkout@v4
-      - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v3
-        # Refer: https://github.com/actions/dependency-review-action
-        with:
-          # TODO: reset critical to low before releasing
-          fail-on-severity: critical
-          # Action will fail if dependencies don't match the list
-          #allow-licenses: Apache-2.0, MIT
-          #deny-licenses: GPL-3.0, AGPL-1.0, AGPL-3.0, LGPL-2.0, CC-BY-3.0
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -0,0 +1,92 @@
+name: hugegraph ci
+
+on:
+  push:
+    branches:
+      - master
+      - 'release-*'
+      - 'test-*'
+  pull_request:
+    branches:
+      - '**'
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    env:
+      TRAVIS_DIR: hugegraph-dist/src/assembly/travis
+      REPORT_DIR: target/site/jacoco
+      BACKEND: ${{ matrix.BACKEND }}
+      TRIGGER_BRANCH_NAME: ${{ github.ref_name }}
+      HEAD_BRANCH_NAME: ${{ github.head_ref }}
+      BASE_BRANCH_NAME: ${{ github.base_ref }}
+      TARGET_BRANCH_NAME: ${{ github.base_ref != '' && github.base_ref || github.ref_name }}
+      RELEASE_BRANCH: ${{ startsWith(github.ref_name, 'release-') || startsWith(github.ref_name, 'test-') || startsWith(github.base_ref, 'release-') }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        BACKEND: [memory, cassandra, scylladb, hbase, rocksdb, mysql, postgresql]
+        JAVA_VERSION: ['8']
+
+    steps:
+      - name: Install JDK ${{ matrix.JAVA_VERSION }}
+        uses: actions/setup-java@v2
+        with:
+          java-version: ${{ matrix.JAVA_VERSION }}
+          distribution: 'zulu'
+
+      - name: Cache Maven packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+
+      - name: Compile
+        run: |
+          mvn compile -Dmaven.javadoc.skip=true | grep -v "Downloading\|Downloaded"
+
+      - name: Prepare env and service
+        run: |
+          $TRAVIS_DIR/install-backend.sh $BACKEND
+
+      - name: Init MySQL Env
+        if: ${{ env.BACKEND == 'mysql' }}
+        uses: mirromutth/mysql-action@v1.1
+        with:
+          host port: 3306 # Optional, default value is 3306. The port of host
+          container port: 3306 # Optional, default value is 3306. The port of container
+          character set server: 'utf8mb4' # Optional, default value is 'utf8mb4'. The '--character-set-server' option for mysqld
+          collation server: 'utf8mb4_general_ci' # Optional, default value is 'utf8mb4_general_ci'. The '--collation-server' option for mysqld
+          mysql version: '5.7' # Optional, default value is "latest". The version of the MySQL
+          mysql database: 'test' # Optional, default value is "test". The specified database which will be create
+          mysql root password: "******" # Required if "mysql user" is empty, default is empty. The root superuser password
+          #mysql user: 'root' # Required if "mysql root password" is empty, default is empty. The superuser for the specified database. Can use secrets, too
+          #mysql password: ${{ secrets.DatabasePassword }} # Required if "mysql user" exists. The password for the "mysql user"
+
+      - name: Run test
+        run: |
+          $TRAVIS_DIR/run-core-test.sh $BACKEND
+          $TRAVIS_DIR/run-api-test.sh $BACKEND $REPORT_DIR
+          $TRAVIS_DIR/run-unit-test.sh $BACKEND
+
+      - name: Run Raft test
+        if: ${{ env.BACKEND == 'rocksdb' }}
+        run: |
+          $TRAVIS_DIR/run-api-test-for-raft.sh $BACKEND $REPORT_DIR
+
+      - name: Run TinkerPop test
+        if: ${{ env.RELEASE_BRANCH == 'true' }}
+        run: |
+          $TRAVIS_DIR/run-tinkerpop-test.sh $BACKEND tinkerpop
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v1
+        with:
+          file: ${{ env.REPORT_DIR }}/*.xml
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@ -1,71 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ master, release-* ]
-  pull_request:
-  # The branches below must be a subset of the branches above
-  # branches: [ master ] # enable in all PRs
-  schedule:
-    - cron: '33 0 * * 5'
-
-jobs:
-  analyze:
-    env:
-      USE_STAGE: 'true' # Whether to include the stage repository.
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'java' ]
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup Java JDK
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: '11'
-
-      - name: use staged maven repo settings
-        if: ${{ env.USE_STAGE == 'true' }}
-        run: |
-          cp $HOME/.m2/settings.xml /tmp/settings.xml
-          mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
-
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
-
-      #- run: |
-      #   make bootstrap
-      #   make release
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
--- a/.github/workflows/commons-ci.yml
+++ b/.github/workflows/commons-ci.yml
@ -1,64 +0,0 @@
-name: "HugeGraph-Commons CI"
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - master
-      - /^release-.*$/
-      - /^test-.*$/
-  pull_request:
-
-jobs:
-  build-commons:
-    runs-on: ubuntu-latest
-    env:
-      # TODO: reset use stage to false later
-      USE_STAGE: 'true' # Whether to include the stage repository.
-
-    strategy:
-      fail-fast: false
-      matrix:
-        JAVA_VERSION: ['11']
-
-    steps:
-      - name: Install JDK ${{ matrix.JAVA_VERSION }}
-        uses: actions/setup-java@v3
-        with:
-          java-version: ${{ matrix.JAVA_VERSION }}
-          distribution: 'zulu'
-
-      - name: Cache Maven packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 2
-
-      - name: Use staged maven repo settings
-        if: ${{ env.USE_STAGE == 'true' }}
-        run: |
-          cp $HOME/.m2/settings.xml /tmp/settings.xml
-          cp -vf .github/configs/settings.xml $HOME/.m2/settings.xml && cat $HOME/.m2/settings.xml
-
-      - name: Compile
-        run: |
-          mvn compile -Dmaven.javadoc.skip=true -ntp
-
-      - name: Run common test
-        run: |
-          mvn test -pl hugegraph-commons/hugegraph-common -Dtest=UnitTestSuite
-
-      - name: Run rpc test
-        run: |
-          mvn test -pl hugegraph-commons/hugegraph-rpc -Dtest=UnitTestSuite
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3.0.0
-        with:
-          file: target/jacoco.xml
--- a/.github/workflows/licence-checker.yml
+++ b/.github/workflows/licence-checker.yml
@ -1,31 +0,0 @@
-name: "License Checker"
-
-on:
-  push:
-    branches:
-      - master
-      - 'release-*'
-  pull_request:
-
-jobs:
-  check-license:
-    runs-on: ubuntu-latest
-    env:
-      USE_STAGE: 'true' # Whether to include the stage repository.
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Check License Header
-        uses: apache/skywalking-eyes@main
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          log: info
-          token: ${{ github.token }}
-          config: .licenserc.yaml
-
-      - name: License Check (RAT)
-        run: |
-          mvn apache-rat:check -ntp
-          find ./ -name rat.txt -print0 | xargs -0 -I file cat file > merged-rat.txt
-          grep "Binaries" merged-rat.txt -C 3 && cat merged-rat.txt
--- a/.github/workflows/pd-store-ci.yml
+++ b/.github/workflows/pd-store-ci.yml
@ -1,219 +0,0 @@
-name: "HugeGraph-PD & Store & Hstore CI"
-
-on:
-  push:
-    branches:
-      - master
-      - 'release-*'
-      - 'test-*'
-  pull_request:
-
-# TODO: consider merge to one ci.yml file
-jobs:
-  pd:
-    runs-on: ubuntu-latest
-    env:
-      # TODO: avoid duplicated env setup in pd & store
-      # TODO: reset use stage to false later
-      USE_STAGE: 'true' # Whether to include the stage repository.
-      # TODO: remove outdated env
-      TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis
-      REPORT_DIR: target/site/jacoco
-
-    steps:
-      - name: Install JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'zulu'
-
-      - name: Cache Maven packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 5
-
-      - name: use staged maven repo settings
-        if: ${{ env.USE_STAGE == 'true' }}
-        run: |
-          cp $HOME/.m2/settings.xml /tmp/settings.xml
-          mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml
-
-      - name: Run common test
-        run: |
-          mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-common-test -DskipCommonsTests=true
-
-      - name: Run core test
-        run: |
-          mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-core-test -DskipCommonsTests=true
-
-      # The above tests do not require starting a PD instance.
-
-      - name: Package
-        run: |
-          mvn clean package -U -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp
-
-      - name: Prepare env and service
-        run: |
-          $TRAVIS_DIR/start-pd.sh
-
-      - name: Run client test
-        run: |
-          mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-client-test -DskipCommonsTests=true
-
-      - name: Run rest test
-        run: |
-          mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-rest-test -DskipCommonsTests=true
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3.0.0
-        with:
-          file: ${{ env.REPORT_DIR }}/*.xml
-
-  store:
-    # TODO: avoid duplicated env setup
-    runs-on: ubuntu-latest
-    env:
-      USE_STAGE: 'true' # Whether to include the stage repository.
-      # TODO: remove outdated env
-      TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis
-      REPORT_DIR: target/site/jacoco
-
-    steps:
-      - name: Install JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'zulu'
-
-      - name: Cache Maven packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 5
-
-      - name: use staged maven repo settings
-        if: ${{ env.USE_STAGE == 'true' }}
-        run: |
-          cp $HOME/.m2/settings.xml /tmp/settings.xml
-          mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml
-
-      - name: Package
-        run: |
-          mvn clean package -U -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp
-
-      - name: Prepare env and service
-        run: |
-          $TRAVIS_DIR/start-pd.sh
-          $TRAVIS_DIR/start-store.sh
-
-      - name: Run common test
-        run: |
-          mvn test -pl hugegraph-store/hg-store-test -am -P store-common-test -DskipCommonsTests=true
-
-      - name: Run client test
-        run: |
-          mvn test -pl hugegraph-store/hg-store-test -am -P store-client-test -DskipCommonsTests=true
-
-      - name: Run core test
-        run: |
-          mvn test -pl hugegraph-store/hg-store-test -am -P store-core-test -DskipCommonsTests=true
-
-      - name: Run rocksdb test
-        run: |
-          mvn test -pl hugegraph-store/hg-store-test -am -P store-rocksdb-test -DskipCommonsTests=true
-
-      - name: Run server test
-        run: |
-          mvn test -pl hugegraph-store/hg-store-test -am -P store-server-test -DskipCommonsTests=true
-
-      - name: Run raft-core test
-        run: |
-          mvn test -pl hugegraph-store/hg-store-test -am -P store-raftcore-test -DskipCommonsTests=true
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3.0.0
-        with:
-          file: ${{ env.REPORT_DIR }}/*.xml
-
-  hstore:
-    # TODO: avoid duplicated env setup
-    runs-on: ubuntu-latest
-    env:
-      USE_STAGE: 'true' # Whether to include the stage repository.
-      TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis
-      REPORT_DIR: target/site/jacoco
-      BACKEND: hstore
-      RELEASE_BRANCH: ${{ startsWith(github.ref_name, 'release-') || startsWith(github.ref_name, 'test-') || startsWith(github.base_ref, 'release-') }}
-
-    steps:
-      - name: Install JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'zulu'
-
-      - name: Cache Maven packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 2
-
-      - name: use staged maven repo settings
-        if: ${{ env.USE_STAGE == 'true' }}
-        run: |
-          cp $HOME/.m2/settings.xml /tmp/settings.xml
-          mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml
-
-      - name: Package
-        run: |
-          mvn clean package -U -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp
-
-      - name: Prepare env and service
-        run: |
-          $TRAVIS_DIR/install-backend.sh $BACKEND
-
-      - name: Run unit test
-        run: |
-          $TRAVIS_DIR/run-unit-test.sh $BACKEND
-
-      - name: Run core test
-        run: |
-          $TRAVIS_DIR/run-core-test.sh $BACKEND
-
-      - name: Run api test
-        run: |
-          $TRAVIS_DIR/run-api-test.sh $BACKEND $REPORT_DIR
-
-      - name: Run raft test
-        if: ${{ env.BACKEND == 'rocksdb' }}
-        run: |
-          $TRAVIS_DIR/run-api-test-for-raft.sh $BACKEND $REPORT_DIR
-
-      - name: Run TinkerPop test
-        if: ${{ env.RELEASE_BRANCH == 'true' }}
-        run: |
-          $TRAVIS_DIR/run-tinkerpop-test.sh $BACKEND tinkerpop
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3.0.0
-        with:
-          file: ${{ env.REPORT_DIR }}/*.xml
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -17,27 +17,23 @@ jobs:
          distribution: 'zulu'

      - name: Cache Maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v2
        with:
          path: ~/.m2
          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
          restore-keys: ${{ runner.os }}-m2

      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
        with:
          fetch-depth: 2

      - name: Package
        run: |
-          mvn clean package -DskipTests -ntp
+          mvn clean package -DskipTests
+          mv "$(find hugegraph-*.tar.gz | head -1)" hugegraph-${TAG_NAME/#v/}.tar.gz

-      - name: Rename file
-        if: contains(env.TAG_NAME, "-")
-        run: mv "$(find hugegraph-*.tar.gz | head -1)" hugegraph-${TAG_NAME/#v/}.tar.gz
-
-      - name: Upload to GitHub
-        uses: xresloader/upload-to-github-release@master
+      - uses: xresloader/upload-to-github-release@master
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
--- a/.github/workflows/server-ci.yml
+++ b/.github/workflows/server-ci.yml
@ -1,101 +0,0 @@
-name: "HugeGraph-Server CI"
-
-on:
-  push:
-    branches:
-      - master
-      - 'release-*'
-      - 'test-*'
-  pull_request:
-
-jobs:
-  build-server:
-    # TODO: we need test & replace it to ubuntu-24.04 or ubuntu-latest
-    runs-on: ubuntu-20.04
-    env:
-      # TODO: reset use stage to false later
-      USE_STAGE: 'true' # Whether to include the stage repository.
-      TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis
-      REPORT_DIR: target/site/jacoco
-      BACKEND: ${{ matrix.BACKEND }}
-      TRIGGER_BRANCH_NAME: ${{ github.ref_name }}
-      HEAD_BRANCH_NAME: ${{ github.head_ref }}
-      BASE_BRANCH_NAME: ${{ github.base_ref }}
-      TARGET_BRANCH_NAME: ${{ github.base_ref != '' && github.base_ref || github.ref_name }}
-      RELEASE_BRANCH: ${{ startsWith(github.ref_name, 'release-') || startsWith(github.ref_name, 'test-') }}
-      RAFT_MODE: ${{ startsWith(github.head_ref, 'test') || startsWith(github.head_ref, 'raft') }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        BACKEND: [ memory, rocksdb, hbase, cassandra, mysql, postgresql, scylladb ]
-        JAVA_VERSION: [ '11' ]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 5
-
-      # TODO: Remove this step after install-backend.sh updated
-      - name: Install Java8 for backend
-        uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: 'zulu'
-
-      - name: Prepare backend environment
-        run: |
-          $TRAVIS_DIR/install-backend.sh $BACKEND && jps -l
-
-      - name: Install Java ${{ matrix.JAVA_VERSION }}
-        uses: actions/setup-java@v3
-        with:
-          java-version: ${{ matrix.JAVA_VERSION }}
-          distribution: 'zulu'
-
-      - name: Cache Maven packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-
-      - name: Use staged maven repo settings
-        if: ${{ env.USE_STAGE == 'true' }}
-        run: |
-          cp $HOME/.m2/settings.xml /tmp/settings.xml
-          cp -vf .github/configs/settings.xml $HOME/.m2/settings.xml && cat $HOME/.m2/settings.xml
-
-      - name: Compile
-        run: |
-          mvn clean compile -U -Dmaven.javadoc.skip=true -ntp
-
-      - name: Run unit test
-        run: |
-          $TRAVIS_DIR/run-unit-test.sh $BACKEND
-
-      - name: Run core test
-        run: |
-          $TRAVIS_DIR/run-core-test.sh $BACKEND
-
-      - name: Run api test
-        run: |
-          $TRAVIS_DIR/run-api-test.sh $BACKEND $REPORT_DIR
-
-      # TODO: disable raft test in normal PR due to the always timeout problem
-      - name: Run raft test
-        if: ${{ env.RAFT_MODE == 'true' && env.BACKEND == 'rocksdb' }}
-        run: |
-          $TRAVIS_DIR/run-api-test-for-raft.sh $BACKEND $REPORT_DIR
-
-      - name: Run TinkerPop test
-        if: ${{ env.RELEASE_BRANCH == 'true' }}
-        run: |
-          $TRAVIS_DIR/run-tinkerpop-test.sh $BACKEND tinkerpop
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          file: ${{ env.REPORT_DIR }}/*.xml
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@ -1,4 +1,4 @@
-name: "Mark stale issues and pull requests"
+name: Mark stale issues and pull requests

 on:
  schedule:
@ -20,8 +20,8 @@ jobs:
        stale-pr-message: 'Due to the lack of activity, the current pr is marked as stale and will be closed after 180 days, any update will remove the stale label'
        stale-issue-label: 'inactive'
        stale-pr-label: 'inactive'
-        exempt-issue-labels: 'feature,bug,enhancement,improvement,todo,guide,doc,help wanted,security'
-        exempt-pr-labels: 'feature,bug,enhancement,improvement,todo,guide,doc,help wanted,security'
+        exempt-issue-labels: 'feature,bug,enhancement,improvement,wontfix,todo'
+        exempt-pr-labels: 'feature,bug,enhancement,improvement,wontfix,todo'
        exempt-all-milestones: true

        days-before-issue-stale: 15
@ -29,7 +29,7 @@ jobs:
        days-before-pr-stale: 30
        days-before-pr-close: 180
        operations-per-run: 10
-        start-date: '2016-10-01T00:00:00Z'
+        start-date: '2018-10-01T00:00:00Z'

        exempt-all-assignees: true
        remove-stale-when-updated: true
--- a/.gitignore
+++ b/.gitignore
@ -1,51 +1,6 @@
-target/
-**.db
-logs/
-ui
-node_modules
-upload-files/
-demo*
-gen-java
-*.class
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-.svn
-
-### IntelliJ IDEA ###
-.idea/*
-!.idea/vcs.xml
-!.idea/icon.png
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/nbdist/
-/.nb-gradle/
-dist/
-build/
-
-### VS Code ###
-.vscode/
-
-# misc
 .DS_Store
-*/.DS_Store
-**/*.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
+*.iml
+*.iws
 *.orig
 *.rej
 **/.keep
@ -55,35 +10,12 @@ build/
 *.swp
 *.log
 *.pyc
-
-# maven ignore
-apache-hugegraph-*/
-output/
-*.war
-*.zip
-*.tar
-*.tar.gz*
-tree.txt
-*.versionsBackup
-.flattened-pom.xml
-
-
-# eclipse ignore
-.settings/
-
-# temp ignore
-*.cache
-*.diff
-*.patch
-*.tmp
-
-# system ignore
-Thumbs.db
-hs_err_pid*
-# mobile Tools for Java (J2ME)
-.mtj.tmp/
-# blueJ files
-*.ctxt
-
-# docker volumes ignore
-hugegraph-server/hugegraph-dist/docker/data/
+.idea
+.svn
+.classpath
+.project
+.settings
+target
+gen-java
+build
+node*
--- a/.idea/icon.png
+++ b/.idea/icon.png
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
-  -->
-
-<project version="4">
-  <component name="IssueNavigationConfiguration">
-    <option name="links">
-      <list>
-        <IssueNavigationLink>
-          <option name="issueRegexp" value="#(\d+)" />
-          <!--
-            GitHub share the sequence number of issues and pull requests, and it will redirect to
-            the right place when the the sequence number not match kind.
-           -->
-          <option name="linkRegexp" value="https://github.com/apache/hugegraph/pull/$1" />
-        </IssueNavigationLink>
-      </list>
-    </option>
-  </component>
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@ -1,107 +0,0 @@
-#
-# 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.
-#
-
-header: # `header` section is configurations for source codes license header.
-  license:
-    spdx-id: Apache-2.0 # the spdx id of the license, it's convenient when your license is standard SPDX license.
-    copyright-owner: Apache Software Foundation # the copyright owner to replace the [owner] in the `spdx-id` template.
-    content: | # `license` will be used as the content when `fix` command needs to insert a license header.
-      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.
-    # `pattern` is optional regexp if all the file headers are the same as `license` or the license of `spdx-id` and `copyright-owner`.
-    pattern: |
-      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.
-  paths: # `paths` are the path list that will be checked (and fixed) by license-eye, default is ['**'].
-    - '**'
-
-  paths-ignore: # `paths-ignore` are the path list that will be ignored by license-eye.
-    - '.gitignore'
-    - '.gitattributes'
-    - 'LICENSE'
-    - 'NOTICE'
-    - 'DISCLAIMER'
-    - '**/*.versionsBackup'
-    - '**/*.versionsBackup'
-    - '**/*.proto'
-    - '**/*.log'
-    - '**/*.txt'
-    - '**/*.json'
-    - '**/*.conf'
-    - '**/*.map'
-    - '**/*.properties'
-    - '**/RaftRequests.java'
-    - 'dist/**/*'
-    - 'hugegraph-server/hugegraph-dist'
-    - '**/assembly/static/bin/hugegraph.service'
-    - 'scripts/dev/reviewers'
-    - 'scripts/dev/reviewers'
-    - '**/*.md'
-    - '**/dependency-reduced-pom.xml'
-    - '**/logs/*.log'
-    - '**/META-INF/**/*'
-    - '**/target/*'
-    - 'style/*'
-    - 'ChangeLog'
-    - 'CONFIG.ini'
-    - 'GROUPS'
-    - 'OWNERS'
-    - '.github/**/*'
-    - '**/*.iml'
-    - '**/*.iws'
-    - '**/*.ipr'
-    - '**/META-INF/MANIFEST.MF'
-    - '.repository/**'
-    - '**/.flattened-pom.xml'
-    - 'hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/SnowflakeIdGenerator.java'
-    - 'hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeScriptTraversal.java'
-    - 'hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/type/Nameable.java'
-    - 'hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Cardinality.java'
-    - 'hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/util/StringEncoding.java'
-    - 'hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/ProcessBasicSuite.java'
-    - 'hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/StructureBasicSuite.java'
-    - 'hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherOpProcessor.java'
-    - 'hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherPlugin.java'
-  comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`.
-
-  # license-location-threshold specifies the index threshold where the license header can be located,
-  # after all, a "header" cannot be TOO far from the file start.
-  license-location-threshold: 80
--- a/.github/outdated/.travis.yml
+++ b/.github/outdated/.travis.yml
@ -115,7 +115,7 @@ env:
  global:
    - RELEASE_BRANCH=^release-.*$
    - RELEASE_TAG=^v[0-9]\..*$
-    - TRAVIS_DIR=hugegraph-server/hugegraph-dist/src/assembly/travis
+    - TRAVIS_DIR=hugegraph-dist/src/assembly/travis
    - DEPLOYED=0
    - secure: dYmFTVeEtRzLNaHp9ToTV/+CkTD0/rEj+K7dRN8wsv/yg4pbqwnyWbSXcqMlj6iNFzAz3nPbmFLCvAWON9/SMN9iJIT6x/xfcf+LqCT8QWczo2nc9xeX144ij2VHX1Drvtk5fRTMaTXRfWEQIrjqx2yrJTIdrXWzWSaZLFv1CRCUizEiGGCePnzUWxx9dBypNyC6IaH6lIv8uN5E6+10SYhb7UJGjWUMDg1bCeW9X7X2wg4QpsGDzlGFXT2EBPU/dAb5attTAtW8dKxrCZqZJTPWe0BarXDBR4PO15BC+a0V1g8LwexedtDjJeFRcGPaJ5NN4d3jDSusCzt5Jf4U0Wa1gDRMVTU3jT+KYkm5eoV4wOZMySobjh6VpQH/LyL0QTDy5apRPAxw+wO+tc91P+nkJmnlr3pN8abtMZ6NciZizUBYQRgR/m2Ir0stvtbZxBQOATuPtBgNDKiDgVdSYcRJzSqYEMFOn35AvsDZ9aUsyC8k29PCUZ0gQO2Is6cV1ClFBnM52hfU9XX0gu+NviSnYNGvcokod8z9VjGtnM7V3LYjqXSFqO9kkMbOmkME1tD2Bh/klw2/OM+2tBBZiAgxB89st5jSUHI4a2hpUyaQBezJUcU9t2vVT/zAVEIqzw2PDxkMU7t0n6L1x+qUIUTG/WynfIni5msxuR7HoiU=
    - secure: XbX6AX5zDPc2PcWYAMW+6fazqRRUqpgQkt4eXUugLuVIYZBmJ0WqncEhJ4+mdwOGPIhnP2HsOaSeK2eE/O+iLY2XpBFbugoBgm9VaZlCC4CY1gRNHaanYg64Lrm3NPY3n08IHRMazHqMpJwUqNO+OG/6QwkepULQLj5Rluf716AoXHa7IEJhAIrwr+OXQvdEaJdUXlS1lRycXVeYtOewl7qYxCO4dD4RMhPlNykh9KEK7fd5wnPkiUsp1SwF4g5XsaLvGXmT/qQ1nj8oa9Caej/iaj6HMKG3BO057mq4KK5JDxTPWhBueNpEkUwldAnrMhYWLRnNf4IyjUsaB/Pmi6HspzcaiORPLYwPmdvLGGSnYwbtO+fAHebgpgOnj/vGmRmY4YtIkYdFtbPBI0HpbGB77tqNRFCe/5deLrjx0hXJBfoKTy7d42SI1eBhNR0svZYUHkSfuXwly6hMTlH1DN/bumMFxfXDkY9PFHlzV1Mn3vb9BxKTaP88hJsWk7JqgniqUF7EWAc0EhHMbJct2gC0pDc95z4Yy9391n7/XWJErhIdYon1Ukds5+a43xFXoy76gR4LuMDpzzCnutMjhC2yDuGaZx/DfkPBb5JFU7SHtTKj05zb73Moogi7qqbH8jwcwoSfogAKyrIAWTcAgvJ2LVnRzwdsiLTc6MEagiM=
--- a/.github/outdated/APACHE_PROPOSAL.md
+++ b/.github/outdated/APACHE_PROPOSAL.md
@ -2,17 +2,17 @@

 ## Abstract

-HugeGraph is a high-performance scalable graph database.
+HugeGraph is a high performance scalable graph database.

 ## Proposal

-HugeGraph is a large-scale and easy-to-use graph database. In the cases of 100+ billion data (vertices and edges), HugeGraph has complete HTAP capabilities built into its internal system. The design goal of HugeGraph is to achieve a balance between availability, performance, and cost.
+HugeGraph is a large-scale and easy-to-use graph database. In the cases of 100+ billion data (vertices and edges), HugeGraph has complete HTAP capabilities built in its internal system. The design goal of HugeGraph is to achieve a balance between availability, performance and cost.

-We believe that the HugeGraph project will benefit the open-source community if HugeGraph is introduced into the Apache Software Foundation.
+We believe that the HugeGraph project will benefit the open source community if HugeGraph is introduced into the Apache Software Foundation.

 ### Background

-HugeGraph graph database was initially developed at Baidu, the leading search engine company in China. HugeGraph was designed to solve the large-scale graph analysis requirements for the task of anti-fraud. Relational databases are usually at a disadvantage in dealing with relational analysis, due to slow join performance, especially in the case of a large-scale graph with multiple dimensions and deep association relationships. Graph databases are in general considered a good alternative in dealing with large-scale relational analysis.
+HugeGraph graph database was initially developed at Baidu, the leading search engine company in China. HugeGraph was designed to solve the large-scale graph analysis requirements for the task of anti-fraud. Relational databases are usually at a disadvantage in dealing with relational analysis, due to slow join performance, especially in the case of a large-scale graph with multiple dimensions and deep association relationships. Graph databases are in general considered a good alternative in dealing with large scale relational analysis.

 ### Rationale

@ -23,7 +23,7 @@ Generally, most graph databases can only process up to 1-billion-scale graphs, b
 Although most of the main development of HugeGraph has been completed, there are several areas that still need future development. Some areas we want to focus on in the Apache incubation stage include:

 - Higher graph computing loading performance: the current architecture (especially the separation of computing and storage) brings greater flexibility and cost savings, but with some performance overhead, which needs to be improved.
- RocksDB-based sharding storage development, based on the affinity architecture of query and storage. Since RocksDB is known for its good performance, but currently HugeGraph only supports the raft-based replication mode, we plan to support scale-out and distributed atomic transactions for RocksDB-based storage.
+- RocksDB-based sharding storage development, based on the affinity architecture of query and storage. Since RocksDB is known for its good performance, but currently HugeGraph only supports the raft-based replication mode. We plan to support scale-out and distributed atomic transactions for RocksDB-based storage.
 - Parallel OLTP query: at present, HugeGraph can perform parallel OLAP graph-computing, but the OLTP query only supports parallel execution on a single machine. In certain scenarios, the OLTP query needs to be implemented in parallel on multiple machines.
 - Higher-performance queries: such as supporting faster query optimization, parallel primitive collections, and fine-grained caching strategies.
 - Better usability: more OLTP/OLAP algorithms, APIs and toolchains, rich UI, etc...
@ -34,57 +34,57 @@ Although most of the main development of HugeGraph has been completed, there are

 #### Meritocracy

-HugeGraph was incubated at Baidu in 2016 and open-sourced on [GitHub](https://github.com/hugegraph/hugegraph) in 2018. The project (including sub-projects) now has 30+ contributors from many companies. Some of these contributors become committers, and the project has hundreds of known users around the world. We will follow Apache's Meritocracy way to re-organize the community roles. We have set up the PPMC Team and Committer Team. Of course, contributions are welcomed and highly valued. New contributors are guided and reviewed by existing PMC members. When an active contributor has submitted enough good patches, PMC will start a vote to promote him/her to become a member of the Committer Team or PMC Team.
+HugeGraph was incubated at Baidu in 2016 and open sourced on [GitHub](https://github.com/hugegraph/hugegraph) in 2018. The project(include sub-projects) now has 30+ contributors from many companies. Some of these contributors become committers, and the project has hundreds of known users around the world. We will follow Apache's Meritocracy way to re-organize the community roles. We have set up the PPMC Team and Committer Team. Of course, contributions are welcomed and highly valued. New contributors are guided and reviewed by existing PMC members. When an active contributor has submitted enough good patches, PMC will start a vote to promote him/her to become a member of Committer Team or PMC Team.

 #### Community

-Baidu has been building a community around HugeGraph users and developers for the last 3 years, and now we make use of GitHub as code hosting and community communication. The most of core developers are from Baidu. Besides, there are 10+ contributors from other companies such as NetEase, 360, Iflytek, and Huya. We hope to grow the base of contributors by inviting all those who offer contributions through The Apache Way. 
+Baidu has been building a community around HugeGraph users and developers for the last 3 years, and now we make use of GitHub as code hosting and community communication. The most of core developers are from Baidu. Besides, there are 10+ contributors from other companies such as NetEase, 360, Iflytek and Huya. We hope to grow the base of contributors by inviting all those who offer contributions through The Apache Way. 

 #### Core Developers

-The core developers are all experienced open-source developers. They have operated the HugeGraph Community for 3 years, and they are contributors to Linux kernel, OpenStack, Ceph, RocksDB, Apache TinkerPop, Apache Hadoop, and Apache Groovy.
+The core developers are all experienced open source developers. They have operated the HugeGraph Community for 3 years, and they are contributors of Linux kernel, OpenStack, Ceph, RocksDB, Apache TinkerPop, Apache Hadoop and Apache Groovy.

 #### Alignment

-HugeGraph implements the API of [Apache TinkerPop](https://tinkerpop.apache.org/), which defines the [Gremlin](https://tinkerpop.apache.org/gremlin.html). Gremlin is a powerful graph traversal language, and various complicated graph queries can be accomplished through Gremlin. The TinkerPop ecosystem based on Java is relatively mature in terms of graph databases. We use Java language, which is developed efficient and stable, to develop upper-level components like graph engine, graph computing, graph API, and graph tools; and we manage storage through JNI which is able to freely manage memory and execute efficiently.
+HugeGraph implements the API of [Apache TinkerPop](https://tinkerpop.apache.org/), which defines the [Gremlin](https://tinkerpop.apache.org/gremlin.html). Gremlin is a powerful graph traversal language, and various complicated graph queries can be accomplished through Gremlin. The TinkerPop ecosystem based on Java is relatively mature in terms of graph databases. We use Java language, which is developed efficient and stable, to develop upper-level components like graph engine, graph computing, graph API and graph tools; and we manage storage through JNI which is able to freely manage memory and execute efficiently.

 ### Known Risks

 #### Project Name

-We have checked and believe the name is [suitable](https://github.com/hugegraph/hugegraph/issues/1646) and the project has legal permission to continue using its current name. There are no other projects found using this name through Google Search.
+We have checked and believe the name is [suitable](https://github.com/hugegraph/hugegraph/issues/1646) and the project has legal permission to continue using its current name. There is no other projects found using this name through Google search.

 #### Relationship with Titan/Janus Graph

-In the early stage of the project, we referred to the storage structure of Titan/Janus Graph, some folks thought that HugeGraph was forked from Titan/Janus. In fact, HugeGraph is not based on these projects. HugeGraph is developed completely from scratch and in the process it addressed many new challenges. Certainly, the project was inspired by Titan/Janus and we are really grateful for these inspirations.
+In the early stage of the project, we referred to the storage structure of Titan/Janus Graph, some folks thought that HugeGraph was forked from Titan/Janus. In fact, HugeGraph is not based on these projects. HugeGraph is developed completely from scratch and in the process it addressed many new challenges. Certainly, the project was inspired by Titan/Janus and we are really gratitious for such inspirations.

 ### Orphaned products

-Due to a small and limited number of committers, the project has a relatively small risk of becoming an orphan project. However, the committers have been operating the HugeGraph Community for 3 years in the spirit of open-source, and continue to develop new contributors to participate.
+Due to a small and limited number of committers, the project has a relatively small risk of becoming an orphan project. However, the committers have been operating the HugeGraph Community for 3 years in the spirit of open source, and continue to develop new contributors to participate.

-#### Inexperience with Open-Source
+#### Inexperience with Open Source:

-HugeGraph has been open-sourced on GitHub for 3 years, during which committers submitted code and documents in full compliance with open-source specifications and requirements.
+HugeGraph has been open sourced on GitHub for 3 years, during which committers submitted code and documents in full compliance with open source specifications and requirements.

-#### Length of Incubation
+#### Length of Incubation:

 Expect to enter incubation in 4 months and graduate in about 2 years.

-#### Homogenous Developers
+#### Homogenous Developers:

-The developers on the current list come from several different companies plus many independent volunteers, but the most of committers are from Baidu. The developers are geographically concentrated in China now. They are experienced with working in a distributed environment in other open-source projects, e.g. OpenStack.
+The developers on the current list come from several different companies plus many independent volunteers, but the most of committers are from Baidu. The developers are geographically concentrated in China now. They are experienced with working in a distributed environment in other open source projects, e.g. OpenStack.

-#### Reliance on Salaried Developers
+#### Reliance on Salaried Developers:

 Most of the developers are paid by their employer to contribute to this project. Given some volunteer developers and the committers' sense of ownership for the code, the project could continue even if no salaried developers contributed to the project.

-#### Relationships with Other Apache Products
+#### Relationships with Other Apache Products:

 HugeGraph follows the Apache TinkerPop specification, uses Apache Commons, Apache HttpClient, and Apache HttpCore to implement the basic functions. Users can choose Apache Cassandra or Apache HBase as one of the storage backends of HugeGraph.

-#### An Excessive Fascination with the Apache Brand
+#### An Excessive Fascination with the Apache Brand:

-Although we expect that the Apache brand may help attract more contributors, our interest in starting this project is based on the factors mentioned in the fundamentals section. We are interested in joining ASF to increase our connections in the open-source world. Based on extensive collaboration, it is possible to build a community of developers and committers that live longer than the founder.
+Although we expect that the Apache brand may help attract more contributors, our interest in starting this project is based on the factors mentioned in the fundamentals section. We are interested in joining ASF to increase our connections in the open source world. Based on extensive collaboration, it is possible to build a community of developers and committers that live longer than the founder.

 ### Documentation

@ -94,18 +94,18 @@ HugeGraph documentation is provided on https://hugegraph.github.io/hugegraph-doc

 This project consists of 2 core sub-projects and 2 other sub-projects, all of which are hosted by [GitHub hugegraph organization](https://github.com/orgs/hugegraph/repositories) since 2018. The codes are already under Apache License Version 2.0. The git address of sub-project repositories are as follows:

-1. The graph database repository `hugegraph`, core sub-project, including graph server, graph engine, and graph storage: https://github.com/hugegraph/hugegraph
+1. The graph database repository `hugegraph`, core sub-project, including graph server, graph engine and graph storage: https://github.com/hugegraph/hugegraph
 2. The graph computing repository `hugegraph-computer`, core sub-project, including graph computing and graph algorithms: https://github.com/hugegraph/hugegraph-computer
 3. The common functions repository `hugegraph-commons`: https://github.com/hugegraph/hugegraph-commons
 4. The ecosystem repository `hugegraph-toolchain`, including `hugegraph-client`, `hugegraph-loader`, `hugegraph-tools`, `hugegraph-hubble`, `hugegraph-test`, `hugegraph-doc`: https://github.com/hugegraph/hugegraph-toolchain

 ### Source and Intellectual Property Submission Plan

-The code is currently under Apache License Version 2.0, and it was verified there were no intellectual property or license issues when it was open-sourced by Baidu in 2018. Baidu will provide SGA and all committers will sign ICLA after HugeGraph is accepted into the Incubator.
+The codes are currently under Apache License Version 2.0, and have been verified there is no intellectual property or license issues when being released to open source by Baidu in 2018. Baidu will provide SGA and all committers will sign ICLA after HugeGraph is accepted into the Incubator.

-#### External Dependencies
+#### External Dependencies:

-As all dependencies are managed by Apache Maven, none of the external libraries need to be packaged in a source distribution. All dependencies have Apache compatible licenses except for 4 dependencies: MySQL Connector (GPL), word (GPL), JBoss Logging 3 (LGPL), and jnr-posix (LGPL+GPL), we will remove these dependencies in the future.
+As all dependencies are managed by Apache Maven, none of the external libraries need to be packaged in a source distribution. All dependencies have Apache compatible licenses except for 4 dependencies: MySQL Connector(GPL), word(GPL), JBoss Logging 3(LGPL) and jnr-posix(LGPL+GPL), we will remove these dependencies in future.

 HugeGraph has the following external [dependencies](https://github.com/hugegraph/hugegraph/issues/1632):

@ -259,7 +259,7 @@ None

 ### Required Resources

-#### Mailing lists
+#### Mailing lists:

 - hugegraph-dev: [dev@hugegraph.incubator.apache.org](mailto:dev@hugegraph.incubator.apache.org) for development and users discussions.
 - hugegraph-private: [private@hugegraph.incubator.apache.org](mailto:private@hugegraph.incubator.apache.org) for PPMC discussions.
@ -276,13 +276,13 @@ None
 3. `hugegraph-commons`: https://github.com/hugegraph/hugegraph-commons.git
 4. `hugegraph-toolchain`: https://github.com/hugegraph/hugegraph-toolchain.git

-#### Issue Tracking
+#### Issue Tracking:

-The community would like to continue using [GitHub Issues](https://github.com/hugegraph/hugegraph/issues) (but will move to github.com/apache/).
+The community would like to continue using [GitHub Issues](https://github.com/hugegraph/hugegraph/issues) (but will moved to github.com/apache/).

-#### Other Resources
+#### Other Resources:

- The community has already chosen [GitHub actions](https://github.com/hugegraph/hugegraph/actions) as continuous integration tools.
+- The community has already choosed [GitHub actions](https://github.com/hugegraph/hugegraph/actions) as continuous integration tools.
 - The community has already used [codecov](https://github.com/marketplace/codecov) to check code coverage.
 - The community has already used [mvn repository](https://mvnrepository.com/search?q=hugegraph) as binary package release platform.

@ -302,17 +302,17 @@ The community would like to continue using [GitHub Issues](https://github.com/hu

 ### Sponsors

-#### Champion
+#### Champion:

 - Willem Ning Jiang (ningjiang at apache dot org)

-#### Nominated Mentors
+#### Nominated Mentors:

 - Trista Pan (panjuan at apache dot org)
 - Lidong Dai (lidongdai at apache dot org)
 - Xiangdong Huang (hxd at apache dot org)
 - Yu Li (liyu at apache dot org)

-#### Sponsoring Entity
+#### Sponsoring Entity:

 We are expecting the Apache Incubator could sponsor this project.
--- a/BUILDING.md
+++ b/BUILDING.md
@ -1,35 +1,28 @@
-Building HugeGraph
+Building hugegraph
 --------------

 Required:

-* Java 11
-* Maven 3.5+
-
-To build without executing tests: `mvn clean package -Dmaven.test.skip=true`
-
-## Building in IDEA
+* Java 8 (0.9 and later)
+* Maven

 To build without executing tests:

-1. Click on "File" -> "Open", choose your project location.
-2. Open maven view by click "View" -> "Tool Windows" -> "Maven Projects".
-3. Choose root module "hugegraph: Distributed Graph Database", unfold the menu of "Lifecycle".
-4. Click the "Toggle 'Skip Tests' Mode" button which is located on the top navibar of "Maven Projects" window to skip tests.
-5. Double click "package" or "install" to build a project.
+```
+mvn clean 
+mvn package -DskipTests
+```

-Could also refer [Dev-In-IDEA](https://hugegraph.apache.org/docs/contribution-guidelines/hugegraph-server-idea-setup/) for more details.
+## Building on Eclipse IDE
+Note that this has only been tested on Eclipse Neon.2 Release (4.6.2) with m2e (1.7.0.20160603-1933) and m2e-wtp (1.3.1.20160831-1005) plugin.

-## Building in Eclipse
-
-> Note: this has only been tested on Eclipse Neon.2 Release (4.6.2) with m2e (1.7.0.20160603-1933) and m2e-wtp (1.3.1.20160831-1005) plugin.

 To build without executing tests:

 1. Right-click on your project -> "Run As..." -> "Run Configurations..."
 2. On "Goals", populate with `install`
 3. Select the options `Update Snapshots` and `Skip Tests`
-4. Before clicking "Run", make sure that Eclipse knows where `JAVA_HOME` is. In the same window, go to "Environment" tab and click "New".
+4. Before clicking "Run", make sure that Eclipse knows where `JAVA_HOME` is. On same window, go to "Environment" tab and click "New".
 5. Under "Name:", add `JAVA_HOME`
 6. Under "Value:", add the path where `java` is located
 7. Click "OK"
@ -39,3 +32,14 @@ To find the Java binary in your environment, run the appropriate command for you
 * Linux/macOS: `which java`
 * Windows: `for %i in (java.exe) do @echo. %~$PATH:i`

+## Building on IDEA
+
+To build without executing tests:
+
+1. Click on "File" -> "Open", choose your project location.
+2. Open maven view by click "View" -> "Tool Windows" -> "Maven Porjects".
+3. Choose root module "hugegraph: Distributed Graph Database", unfold the 
+menu of "Lifecycle".
+4. Click the "Toggle 'Skip Tests' Mode" button which is located on the top
+navibar of "Maven Projects" window to skip tests.
+5. Double click "package" or "install" to build project.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,31 +1,24 @@
 # How to Contribute to HugeGraph

-> Refer [website-doc](https://hugegraph.apache.org/docs/contribution-guidelines/) for the latest information.
-
-Thanks for taking the time to contribute!
-As an open source project, HugeGraph is looking forward to being contributed from everyone, and we are also grateful to all the contributors.
+Thanks for taking the time to contribute! As an open source project, HugeGraph is looking forward to be contributed from everyone, and we are also grateful to all of the contributors.

 The following is a contribution guide for HugeGraph:

-<img width="884" alt="image" src="https://user-images.githubusercontent.com/9625821/159643158-8bf72c0a-93c3-4a58-8912-7b2ab20ced1d.png">
-
 ## 1. Preparation

-**Recommended**: You can use [GitHub desktop](https://desktop.github.com/) to greatly simplify the PR process.
-
 We can contribute by reporting issues, submitting code patches or any other feedback.

 Before submitting the code, we need to do some preparation:

-1. Sign up or login to GitHub: [https://github.com](https://github.com)
+1. Sign up or login to GitHub:  [https://github.com](https://github.com)

-2. Fork HugeGraph repo from GitHub: [https://github.com/apache/incubator-hugegraph/fork](https://github.com/apache/incubator-hugegraph/fork)
+2. Fork HugeGraph repo from GitHub: [https://github.com/hugegraph/hugegraph/fork](https://github.com/hugegraph/hugegraph/fork)

-3. Clone code from fork repo to local: [https://github.com/${GITHUB_USER_NAME}/incubator-hugegraph](https://github.com/${GITHUB_USER_NAME}/incubator-hugegraph)
+3. Clone code from fork repo to local: [https://github.com/${GITHUB_USER_NAME}/hugegraph](https://github.com/${GITHUB_USER_NAME}/hugegraph)

   ```shell
   # clone code from remote to local repo
-   git clone https://github.com/${GITHUB_USER_NAME}/incubator-hugegraph.git hugegraph
+   git clone https://github.com/${GITHUB_USER_NAME}/hugegraph
   ```

 4. Configure local HugeGraph repo
@ -34,22 +27,26 @@ Before submitting the code, we need to do some preparation:
   cd hugegraph

   # add upstream to synchronize the latest code
-   git remote add hugegraph https://github.com/apache/incubator-hugegraph
+   git remote add hugegraph https://github.com/hugegraph/hugegraph

   # set name and email to push code to github
   git config user.name "{full-name}" # like "Jermy Li"
-   git config user.email "{email-address-of-github}" # like "jermy@apache.org"
+   git config user.email "{email-address-of-github}" # like "jermy@gmail.com"
   ```

+5. Sign the HugeGraph CLA: [https://cla-assistant.io/hugegraph/hugegraph](https://cla-assistant.io/hugegraph/hugegraph)
+
+Optional: You can use [Github desktop](https://desktop.github.com/) to greatly simplify the commit and update process.
+
 ## 2. Create an Issue on GitHub

-If you encounter bugs or have any questions, please go to [GitHub Issues](https://github.com/apache/incubator-hugegraph/issues) to report them and feel free to [create an issue](https://github.com/apache/incubator-hugegraph/issues/new).
+If you encounter bugs or have any questions, please go to [GitHub Issues](https://github.com/hugegraph/hugegraph/issues) to report them and feel free to [create an issue](https://github.com/hugegraph/hugegraph/issues/new).

 ## 3. Make changes of code locally

 #### 3.1 Create a new branch

-Please don't use master branch for development. Instead, we should create a new branch:
+Please don't use master branch for development. Instead we should create a new branch:

 ```shell
 # checkout master branch
@ -66,26 +63,12 @@ Assume that we need to modify some files like "HugeGraph.java" and "HugeFactory.

 ```shell
 # modify code to fix a bug
-vim hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/HugeGraph.java
-vim hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/HugeFactory.java
+vim hugegraph-core/src/main/java/com/baidu/hugegraph/HugeGraph.java
+vim hugegraph-core/src/main/java/com/baidu/hugegraph/HugeFactory.java
 # run test locally (optional)
 mvn test -Pcore-test,memory
 ```
-Note: To be consistent with the code style easily, if you use [IDEA](https://www.jetbrains.com/idea/) as your IDE, you can directly [import](https://www.jetbrains.com/help/idea/configuring-code-style.html) our code style [configuration file](./hugegraph-style.xml). 
-
-##### 3.2.1 Check licenses
-If we want to add new third-party dependencies to the `HugeGraph` project, we need to do the following things:
-1. Find the third-party dependent repository, put the dependent `license` file into [./hugegraph-dist/release-docs/licenses/](https://github.com/apache/incubator-hugegraph/tree/master/hugegraph-dist/release-docs/licenses) path.
-2. Declare the dependency in [./hugegraph-server/hugegraph-dist/release-docs/LICENSE](https://github.com/apache/incubator-hugegraph/blob/master/hugegraph-server/hugegraph-dist/release-docs/LICENSE) `LICENSE` information.
-3. Find the NOTICE file in the repository and append it to [./hugegraph-server/hugegraph-dist/release-docs/NOTICE](https://github.com/apache/incubator-hugegraph/blob/master/hugegraph-server/hugegraph-dist/release-docs/NOTICE) file (skip this step if there is no NOTICE file).
-4. Execute locally [./hugegraph-server/hugegraph-dist/scripts/dependency/regenerate_known_dependencies.sh](https://github.com/apache/incubator-hugegraph/blob/master/hugegraph-server/hugegraph-dist/scripts/dependency/regenerate_known_dependencies.sh) to update the dependency list [known-dependencies.txt](https://github.com/apache/incubator-hugegraph/blob/master/hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt) (or manually update).
-
-**Example**: A new third-party dependency is introduced into the project -> `ant-1.9.1.jar`
- The project source code is located at: https://github.com/apache/ant/tree/rel/1.9.1
- LICENSE file: https://github.com/apache/ant/blob/rel/1.9.1/LICENSE
- NOTICE file: https://github.com/apache/ant/blob/rel/1.9.1/NOTICE
-
-The license information of `ant-1.9.1.jar` needs to be specified in the LICENSE file, and the notice information needs to be specified in the NOTICE file. The detailed LICENSE file corresponding to ant-1.9.1.jar needs to be copied to our licenses/ directory. Finally, update the known-dependencies.txt file.
+Note: In order to be consistent with the code style easily, if you use [IDEA](https://www.jetbrains.com/idea/) as your IDE, you can directly [import](https://www.jetbrains.com/help/idea/configuring-code-style.html) our code style [configuration file](./hugegraph-style.xml). 

 #### 3.3 Commit changes to git repo

@ -93,8 +76,8 @@ After the code has been completed, we submit them to the local git repo:

 ```shell
 # add files to local git index
-git add hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/HugeGraph.java
-git add hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/HugeFactory.java
+git add hugegraph-core/src/main/java/com/baidu/hugegraph/HugeGraph.java
+git add hugegraph-core/src/main/java/com/baidu/hugegraph/HugeFactory.java
 # commit to local git repo
 git commit
 ```
@ -107,7 +90,7 @@ Fix bug: run deploy multiple times
 fix #ISSUE_ID
 ```

->  Please remember to fill in the issue id, which GitHub generated after issue creation.
+>  Please remember to fill in the issue id, which was generated by GitHub after issue creation.

 #### 3.4 Push commit to GitHub fork repo

@ -118,22 +101,16 @@ Push the local commit to GitHub fork repo:
 git push origin bugfix-branch:bugfix-branch
 ```

-Note that since GitHub requires submitting code through `username + token` (instead of using `username + password` directly), you need to create a GitHub token from https://github.com/settings/tokens:
-<img width="1280" alt="image" src="https://user-images.githubusercontent.com/9625821/163524204-7fe0e6bf-9c8b-4b1a-ac65-6a0ac423eb16.png">
-
 ## 4. Create a Pull Request

-Go to the web page of GitHub fork repo, there would be a chance to create a Pull Request after pushing to a new branch, click the button "Compare & pull request" to do it. Then edit the description for proposed changes, which can just be copied from the commit message.
-
-Note: please make sure the email address you used to submit the code is bound to the GitHub account. For how to bind the email address, please refer to https://github.com/settings/emails:
-<img width="1280" alt="image" src="https://user-images.githubusercontent.com/9625821/163522445-2a50a72a-dea2-434f-9868-3a0d40d0d037.png">
+Go to the web page of GitHub fork repo, there would be a chance to create a Pull Request after pushing to a new branch, just click button "Compare & pull request" to do it. Then edit the description for proposed changes, which can just be copied from the commit message.

 ## 5. Code review

 Maintainers will start the code review after all the **automatic** checks are passed:

 - Check: Contributor License Agreement is signed
- Check: Travis CI builds are passed (automatically Test and Deploy)
+- Check: Travis CI builds is passed (automatically Test and Deploy)

 The commit will be accepted and merged if there is no problem after review.

@ -148,11 +125,9 @@ If we have not passed the review, don't be discouraged. Usually a commit needs t
 After the further changes, we submit them to the local repo:

 ```shell
-# commit all updated files in a new commit,
-# please feel free to enter any appropriate commit message, note that
-# we will squash all commits in the pull request as one commit when
-# merging into the master branch.
-git commit -a
+# commit all updated files in amend mode
+# instead of creating a new commit
+git commit -a --amend
 ```

 > If there are conflicts that prevent the code from being merged, we need to rebase on master branch:
@ -173,8 +148,8 @@ And push it to GitHub fork repo again:
 git push -f origin bugfix-branch:bugfix-branch
 ```

-GitHub will automatically update the Pull Request after we push it, wait for code review.
+Github will automatically update the Pull Request after we push it, just wait for code review.

-For Any question, please contact us through [dev@hugegraph.apache.org](mailto:dev@hugegraph.apache.org) ([subscriber](https://hugegraph.apache.org/docs/contribution-guidelines/subscribe/) only)
+Any question please contact to us through [hugegraph@googlegroups.com](mailto:hugegraph@googlegroups.com) or [other contact information](https://hugegraph.github.io/hugegraph-doc/).


--- a/7
+++ b/7
@ -1,7 +0,0 @@
-Apache HugeGraph (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, 
-and decision making process have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness or stability of the code, 
-it does indicate that the project has yet to be fully endorsed by the ASF.
--- a/51
+++ b/51
@ -0,0 +1,51 @@
+FROM ubuntu:xenial
+
+LABEL maintainer="HugeGraph Docker Maintainers <hugegraph@googlegroups.com>"
+
+ENV PKG_URL https://github.com/hugegraph
+
+# 1. Install needed dependencies of GraphServer & RocksDB
+RUN set -x \
+    && apt-get -q update \
+    && apt-get -q install -y --no-install-recommends --no-install-suggests \
+       curl \
+       lsof \
+       g++ \
+       gcc \
+       openjdk-8-jdk \
+    && apt-get clean
+    # && rm -rf /var/lib/apt/lists/*
+
+# 2. Init HugeGraph Sever
+# (Optional) You can set the ip of github to speed up the local build
+# && echo "192.30.253.112 github.com\n151.101.44.249 github.global.ssl.fastly.net" >> /etc/hosts \
+ENV SERVER_VERSION 0.10.4
+RUN set -e \
+    && mkdir -p /root/hugegraph-server \
+    && curl -L -S ${PKG_URL}/hugegraph/releases/download/v${SERVER_VERSION}/hugegraph-${SERVER_VERSION}.tar.gz -o /root/server.tar.gz \
+    && tar xzf /root/server.tar.gz --strip-components 1 -C /root/hugegraph-server \
+    && rm /root/server.tar.gz \
+    && cd /root/hugegraph-server/ \
+    && sed -i "s/^restserver.url.*$/restserver.url=http:\/\/0.0.0.0:8080/g" ./conf/rest-server.properties \
+    && sed -n '63p' ./bin/start-hugegraph.sh | grep "&" > /dev/null && sed -i 63{s/\&$/#/g} ./bin/start-hugegraph.sh \
+    && sed -n '74p' ./bin/start-hugegraph.sh | grep "exit" > /dev/null && sed -i 74{s/^/#/g} ./bin/start-hugegraph.sh \
+    && ./bin/init-store.sh
+
+# 3. Prepare for HugeGraph Studio
+ENV STUDIO_VERSION 0.10.0
+# (Optional) You can set the ip of github to speed up the local build
+# && echo "192.30.253.112 github.com\n151.101.44.249 github.global.ssl.fastly.net" >> /etc/hosts \
+RUN set -e \
+    && mkdir -p /root/hugegraph-studio \
+    && curl -L -S ${PKG_URL}/hugegraph-studio/releases/download/v${STUDIO_VERSION}/hugegraph-studio-${STUDIO_VERSION}.tar.gz -o /root/studio.tar.gz \
+    && tar xzf /root/studio.tar.gz --strip-components 1 -C /root/hugegraph-studio \
+    && rm /root/studio.tar.gz \
+    && cd /root/hugegraph-studio/ \
+    && sed -i "s/^studio.server.host.*$/studio.server.host=0.0.0.0/g" ./conf/hugegraph-studio.properties \
+    && sed -i "s/^graph.server.host.*$/graph.server.host=0.0.0.0/g" ./conf/hugegraph-studio.properties
+
+EXPOSE 8080 8088
+WORKDIR /root
+VOLUME /root
+
+ENTRYPOINT ["./hugegraph-server/bin/start-hugegraph.sh"]
--- a/18
+++ b/18
@ -1,4 +1,4 @@
-                                 Apache License
+Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

@ -200,19 +200,3 @@
   See the License for the specific language governing permissions and
   limitations under the License.

-========================================================================
-Apache 2.0 licenses
-========================================================================
-
-The following components are provided under the Apache License. See project link for details.
-The text of each license is the standard Apache 2.0 license.
-
-hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/StructureBasicSuite.java from https://github.com/apache/tinkerpop
-hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/tinkerpop/ProcessBasicSuite.java from https://github.com/apache/tinkerpop
-hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/SnowflakeIdGenerator.java from https://github.com/twitter-archive/snowflake
-hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/HugeScriptTraversal.java from https://github.com/apache/tinkerpop
-hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/type/Nameable.java from https://github.com/JanusGraph/janusgraph
-hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/type/define/Cardinality.java from https://github.com/JanusGraph/janusgraph
-hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/util/StringEncoding.java from https://github.com/JanusGraph/janusgraph
-hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherOpProcessor.java from https://github.com/opencypher/cypher-for-gremlin
-hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherPlugin.java from https://github.com/opencypher/cypher-for-gremlin
--- a/55
+++ b/55
@ -1,55 +0,0 @@
-Apache HugeGraph(incubating)
-Copyright 2022-2024 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-The initial codebase was donated to the ASF by HugeGraph Authors, copyright 2017-2021.
-
-
-----------------------------------------------------------------------
-This product contains code form the Apache TinkerPop Project:
-----------------------------------------------------------------------
-Apache TinkerPop
-Copyright 2015-2022 The Apache Software Foundation.
-
------------------------------------------------------------------------
-Activiti
------------------------------------------------------------------------
-Activiti BPM Platform
-Copyright 2010-2014 Alfresco Software, Ltd.
-
-gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
-contains DelegatingXMLStreamWriter.java and IndentingXMLStreamWriter.java from
-https://github.com/Activiti/Activiti/tree/activiti-5.16/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter
-
------------------------------------------------------------------------
-Apache Kerby
------------------------------------------------------------------------
-Apache Kerby
-Copyright 2015-2017 The Apache Software Foundation
-
-gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/JaasKrbUtil.java
-from
-https://github.com/apache/directory-kerby/blob/kerby-all-1.0.0/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java
-
-
-----------------------------------------------------------------------
-This product contains code form the JanusGraph Project:
-----------------------------------------------------------------------
-==============================================================
- JanusGraph: Distributed Graph Database
- Copyright 2012 with JanusGraph Authors
-==============================================================
-
-This product includes software developed by JanusGraph contributors listed
-in CONTRIBUTORS.txt; JanusGraph copyright holders are listed in AUTHORS.txt.
-
-This product is based on Titan, originally developed by Aurelius (acquired by
-DataStax) and the following individuals:
-
- * Matthias Broecheler
- * Dan LaRocque
- * Marko A. Rodriguez
- * Stephen Mallette
- * Pavel Yaskevich
--- a/README.md
+++ b/README.md
@ -1,98 +1,35 @@
-<h1 align="center">
-    <img width="720" alt="hugegraph-logo" src="https://github.com/apache/incubator-hugegraph/assets/38098239/e02ffaed-4562-486b-ba8f-e68d02bb0ea6" style="zoom:100%;" />
-</h1>
-
-<h3 align="center">A graph database that supports more than 10 billion data, high performance and scalability</h3>
-
-<div align="center">
+# HugeGraph

 [![License](https://img.shields.io/badge/license-Apache%202-0E78BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
-[![HugeGraph-CI](https://github.com/apache/incubator-hugegraph/actions/workflows/ci.yml/badge.svg)](https://github.com/apache/incubator-hugegraph/actions/workflows/ci.yml)
-[![License checker](https://github.com/apache/incubator-hugegraph/actions/workflows/licence-checker.yml/badge.svg)](https://github.com/apache/incubator-hugegraph/actions/workflows/licence-checker.yml)
-[![GitHub Releases Downloads](https://img.shields.io/github/downloads/apache/hugegraph/total.svg)](https://github.com/apache/hugegraph/releases)
-
-</div>
-
-## What is Apache HugeGraph?
-
-[HugeGraph](https://hugegraph.apache.org/) is a fast-speed and highly-scalable [graph database](https://en.wikipedia.org/wiki/Graph_database). 
-Billions of vertices and edges can be easily stored into and queried from HugeGraph due to its excellent OLTP ability. 
-As compliance to [Apache TinkerPop 3](https://tinkerpop.apache.org/) framework, various complicated graph queries can be 
-achieved through [Gremlin](https://tinkerpop.apache.org/gremlin.html)(a powerful graph traversal language).
+[![Build Status](https://github.com/hugegraph/hugegraph/actions/workflows/ci.yml/badge.svg?branch=release-0.12)](https://github.com/hugegraph/hugegraph/actions/workflows/ci.yml)
+[![Codecov](https://codecov.io/gh/hugegraph/hugegraph/branch/release-0.12/graph/badge.svg)](https://codecov.io/gh/hugegraph/hugegraph)
+[![Github Releases Downloads](https://img.shields.io/github/downloads/hugegraph/hugegraph/v0.12.0/total.svg)](https://github.com/hugegraph/hugegraph/releases)

+HugeGraph is a fast-speed and highly-scalable [graph database](https://en.wikipedia.org/wiki/Graph_database). Billions of vertices and edges can be easily stored into and queried from HugeGraph due to its excellent OLTP ability. As compliance to [Apache TinkerPop 3](https://tinkerpop.apache.org/) framework, various complicated graph queries can be accomplished through [Gremlin](https://tinkerpop.apache.org/gremlin.html)(a powerful graph traversal language).

 ## Features

- Compliance to [Apache TinkerPop 3](https://tinkerpop.apache.org/), support [Gremlin](https://tinkerpop.apache.org/gremlin.html) & [Cypher](https://en.wikipedia.org/wiki/Cypher) language
+- Compliance to [Apache TinkerPop 3](https://tinkerpop.apache.org/), supporting [Gremlin](https://tinkerpop.apache.org/gremlin.html)
 - Schema Metadata Management, including VertexLabel, EdgeLabel, PropertyKey and IndexLabel
 - Multi-type Indexes, supporting exact query, range query and complex conditions combination query
- Plug-in Backend Store Driver Framework, support `RocksDB`, `Cassandra`, `HBase`, `ScyllaDB`, and `MySQL/Postgre` now and easy to add another backend store driver if needed
- Integration with `Flink/Spark/HDFS`, and friendly to connect other big data platforms
+- Plug-in Backend Store Driver Framework, supporting RocksDB, Cassandra, ScyllaDB, HBase and MySQL now and easy to add other backend store driver if needed
+- Integration with Hadoop/Spark

+## Learn More

-## Quick Start
-
-### 1. Docker Way (Convenient for Test)
-
-We can use `docker run -itd --name=graph -p 8080:8080 hugegraph/hugegraph` to quickly start an inner 
-HugeGraph server with `RocksDB` (in backgrounds) for **test/dev**.
-You can visit [doc page](https://hugegraph.apache.org/docs/quickstart/hugegraph-server/#3-deploy) or
-the [README](hugegraph-server/hugegraph-dist/docker/README.md) for more details. ([Docker Compose](./hugegraph-server/hugegraph-dist/docker/example))
-
-> Note:
->  
-> 1. The docker image of hugegraph is a convenience release, but not **official distribution** artifacts. You can find more details from [ASF Release Distribution Policy](https://infra.apache.org/release-distribution.html#dockerhub).
-> 
-> 2. Recommend to use `release tag`(like `1.2.0`) for the stable version. Use `latest` tag to experience the newest functions in development.
-
-### 2. Download Way
-
-Visit [Download Page](https://hugegraph.apache.org/docs/download/download/) and refer the [doc](https://hugegraph.apache.org/docs/quickstart/hugegraph-server/#32-download-the-binary-tar-tarball) 
-to download the latest release package and start the server.
-
-### 3. Source Building Way
-
-Visit [Source Building Page](https://hugegraph.apache.org/docs/quickstart/hugegraph-server/#33-source-code-compilation) and follow the 
-steps to build the source code and start the server.
-
-The project [doc page](https://hugegraph.apache.org/docs/) contains more information on HugeGraph
-and provides detailed documentation for users. (Structure / Usage / API / Configs...)
-
-And here are links of other **HugeGraph** component/repositories:
-1. [hugegraph-toolchain](https://github.com/apache/hugegraph-toolchain) (graph tools **[loader](https://github.com/apache/incubator-hugegraph-toolchain/tree/master/hugegraph-loader)/[dashboard](https://github.com/apache/incubator-hugegraph-toolchain/tree/master/hugegraph-hubble)/[tool](https://github.com/apache/incubator-hugegraph-toolchain/tree/master/hugegraph-tools)/[client](https://github.com/apache/incubator-hugegraph-toolchain/tree/master/hugegraph-client)**)
-2. [hugegraph-computer](https://github.com/apache/hugegraph-computer) (integrated **graph computing** system)
-3. [hugegraph-commons](https://github.com/apache/hugegraph-commons) (**common & rpc** libs)
-4. [hugegraph-website](https://github.com/apache/hugegraph-doc) (**doc & website** code)
-5. [hugegraph-ai](https://github.com/apache/incubator-hugegraph-ai) (integrated **Graph AI/LLM/KG** system)
-
-## License
-
-HugeGraph is licensed under [Apache 2.0 License](LICENSE).
-
+The [project homepage](https://hugegraph.github.io/hugegraph-doc/) contains more information on HugeGraph and provides links to documentation, getting-started guides and release downloads.

 ## Contributing

- Welcome to contribute to HugeGraph, please see [`How to Contribute`](CONTRIBUTING.md) & [Guidelines](https://hugegraph.apache.org/docs/contribution-guidelines/) for more information.  
- Note: It's recommended to use [GitHub Desktop](https://desktop.github.com/) to greatly simplify the PR and commit process.  
- Thank you to all the people who already contributed to HugeGraph!
+Welcome to contribute to HugeGraph, please see [`How to Contribute`](CONTRIBUTING.md) for more information.

-[![contributors graph](https://contrib.rocks/image?repo=apache/hugegraph)](https://github.com/apache/incubator-hugegraph/graphs/contributors)
+## License

+HugeGraph is licensed under Apache 2.0 License.

 ## Thanks

 HugeGraph relies on the [TinkerPop](http://tinkerpop.apache.org) framework, we refer to the storage structure of Titan and the schema definition of DataStax. 
 Thanks to TinkerPop, thanks to Titan, thanks to DataStax. Thanks to all other organizations or authors who contributed to the project.

-You are welcome to contribute to HugeGraph, 
-and we are looking forward to working with you to build an excellent open-source community.
-
-
-## Contact Us
-
- [GitHub Issues](https://github.com/apache/incubator-hugegraph/issues): Feedback on usage issues and functional requirements (quick response)
- - Feedback Email: [dev@hugegraph.apache.org](mailto:dev@hugegraph.apache.org) ([subscriber](https://hugegraph.apache.org/docs/contribution-guidelines/subscribe/) only)
- - WeChat public account: Apache HugeGraph, welcome to scan this QR code to follow us.
-
- <img src="https://github.com/apache/incubator-hugegraph-doc/blob/master/assets/images/wechat.png?raw=true" alt="QR png" width="300"/>
-
+You are welcome to contribute to HugeGraph, and we are looking forward to working with you to build an excellent open source community.
--- a/hugegraph-commons/hugegraph-common/build.sh
+++ b/hugegraph-commons/hugegraph-common/build.sh
@ -20,4 +20,5 @@ export MAVEN_HOME=/home/scmtools/buildkit/maven/apache-maven-3.3.9/
 export JAVA_HOME=/home/scmtools/buildkit/java/jdk1.8.0_25/
 export PATH=$JAVA_HOME/bin:$MAVEN_HOME/bin:$PATH

-mvn clean test -Dtest=UnitTestSuite
+mvn clean compile
+
--- a/docker/configs/application-pd0.yml
+++ b/docker/configs/application-pd0.yml
@ -1,63 +0,0 @@
-#
-# 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.
-#
-
-spring:
-  application:
-    name: hugegraph-pd
-
-management:
-  metrics:
-    export:
-      prometheus:
-        enabled: true
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-
-logging:
-  config: 'file:./conf/log4j2.xml'
-license:
-  verify-path: ./conf/verify-license.json
-  license-path: ./conf/hugegraph.license
-grpc:
-  port: 8686
-  host: 127.0.0.1
-
-server:
-  port: 8620
-
-pd:
-  data-path: ./pd_data
-  patrol-interval: 1800
-  initial-store-count: 3
-  initial-store-list: 127.0.0.1:8500,127.0.0.1:8501,127.0.0.1:8502
-
-raft:
-  address: 127.0.0.1:8610
-  peers-list: 127.0.0.1:8610,127.0.0.1:8611,127.0.0.1:8612
-
-store:
-  max-down-time: 172800
-  monitor_data_enabled: true
-  monitor_data_interval: 1 minute
-  monitor_data_retention: 1 day
-  initial-store-count: 1
-
-partition:
-  default-shard-count: 1
-  store-max-shard-count: 12
--- a/docker/configs/application-pd1.yml
+++ b/docker/configs/application-pd1.yml
@ -1,63 +0,0 @@
-#
-# 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.
-#
-
-spring:
-  application:
-    name: hugegraph-pd
-
-management:
-  metrics:
-    export:
-      prometheus:
-        enabled: true
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-
-logging:
-  config: 'file:./conf/log4j2.xml'
-license:
-  verify-path: ./conf/verify-license.json
-  license-path: ./conf/hugegraph.license
-grpc:
-  port: 8687
-  host: 127.0.0.1
-
-server:
-  port: 8621
-
-pd:
-  data-path: ./pd_data
-  patrol-interval: 1800
-  initial-store-count: 3
-  initial-store-list: 127.0.0.1:8500,127.0.0.1:8501,127.0.0.1:8502
-
-raft:
-  address: 127.0.0.1:8611
-  peers-list: 127.0.0.1:8610,127.0.0.1:8611,127.0.0.1:8612
-
-store:
-  max-down-time: 172800
-  monitor_data_enabled: true
-  monitor_data_interval: 1 minute
-  monitor_data_retention: 1 day
-  initial-store-count: 1
-
-partition:
-  default-shard-count: 1
-  store-max-shard-count: 12
--- a/docker/configs/application-pd2.yml
+++ b/docker/configs/application-pd2.yml
@ -1,63 +0,0 @@
-#
-# 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.
-#
-
-spring:
-  application:
-    name: hugegraph-pd
-
-management:
-  metrics:
-    export:
-      prometheus:
-        enabled: true
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-
-logging:
-  config: 'file:./conf/log4j2.xml'
-license:
-  verify-path: ./conf/verify-license.json
-  license-path: ./conf/hugegraph.license
-grpc:
-  port: 8688
-  host: 127.0.0.1
-
-server:
-  port: 8622
-
-pd:
-  data-path: ./pd_data
-  patrol-interval: 1800
-  initial-store-count: 3
-  initial-store-list: 127.0.0.1:8500,127.0.0.1:8501,127.0.0.1:8502
-
-raft:
-  address: 127.0.0.1:8612
-  peers-list: 127.0.0.1:8610,127.0.0.1:8611,127.0.0.1:8612
-
-store:
-  max-down-time: 172800
-  monitor_data_enabled: true
-  monitor_data_interval: 1 minute
-  monitor_data_retention: 1 day
-  initial-store-count: 1
-
-partition:
-  default-shard-count: 1
-  store-max-shard-count: 12
--- a/docker/configs/application-store0.yml
+++ b/docker/configs/application-store0.yml
@ -1,57 +0,0 @@
-#
-# 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.
-#
-
-pdserver:
-  address: 127.0.0.1:8686,127.0.0.1:8687,127.0.0.1:8688
-
-management:
-  metrics:
-    export:
-      prometheus:
-        enabled: true
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-
-grpc:
-  host: 127.0.0.1
-  port: 8500
-  netty-server:
-    max-inbound-message-size: 1000MB
-raft:
-  disruptorBufferSize: 1024
-  address: 127.0.0.1:8510
-  max-log-file-size: 600000000000
-  snapshotInterval: 1800
-server:
-  port: 8520
-
-app:
-  data-path: ./storage
-
-spring:
-  application:
-    name: store-node-grpc-server
-  profiles:
-    active: default
-    include: pd
-
-logging:
-  config: 'file:./conf/log4j2.xml'
-  level:
-    root: info
--- a/docker/configs/application-store1.yml
+++ b/docker/configs/application-store1.yml
@ -1,57 +0,0 @@
-#
-# 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.
-#
-
-pdserver:
-  address: 127.0.0.1:8686,127.0.0.1:8687,127.0.0.1:8688
-
-management:
-  metrics:
-    export:
-      prometheus:
-        enabled: true
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-
-grpc:
-  host: 127.0.0.1
-  port: 8501
-  netty-server:
-    max-inbound-message-size: 1000MB
-raft:
-  disruptorBufferSize: 1024
-  address: 127.0.0.1:8511
-  max-log-file-size: 600000000000
-  snapshotInterval: 1800
-server:
-  port: 8521
-
-app:
-  data-path: ./storage
-
-spring:
-  application:
-    name: store-node-grpc-server
-  profiles:
-    active: default
-    include: pd
-
-logging:
-  config: 'file:./conf/log4j2.xml'
-  level:
-    root: info
--- a/docker/configs/application-store2.yml
+++ b/docker/configs/application-store2.yml
@ -1,57 +0,0 @@
-#
-# 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.
-#
-
-pdserver:
-  address: 127.0.0.1:8686,127.0.0.1:8687,127.0.0.1:8688
-
-management:
-  metrics:
-    export:
-      prometheus:
-        enabled: true
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-
-grpc:
-  host: 127.0.0.1
-  port: 8502
-  netty-server:
-    max-inbound-message-size: 1000MB
-raft:
-  disruptorBufferSize: 1024
-  address: 127.0.0.1:8512
-  max-log-file-size: 600000000000
-  snapshotInterval: 1800
-server:
-  port: 8522
-
-app:
-  data-path: ./storage
-
-spring:
-  application:
-    name: store-node-grpc-server
-  profiles:
-    active: default
-    include: pd
-
-logging:
-  config: 'file:./conf/log4j2.xml'
-  level:
-    root: info
--- a/docker/configs/server1-conf/graphs/hugegraph.properties
+++ b/docker/configs/server1-conf/graphs/hugegraph.properties
@ -1,19 +0,0 @@
-# auth config: org.apache.hugegraph.auth.HugeFactoryAuthProxy
-gremlin.graph=org.apache.hugegraph.HugeFactory
-
-# cache config
-vertex.cache_type=l2
-edge.cache_type=l2
-
-store=hugegraph
-backend=hstore
-serializer=binary
-
-# pd config
-pd.peers=127.0.0.1:8686,127.0.0.1:8687,127.0.0.1:8688
-
-# task config
-task.scheduler_type=local
-task.schedule_period=10
-task.retry=0
-task.wait_timeout=10
--- a/docker/configs/server1-conf/gremlin-driver-settings.yaml
+++ b/docker/configs/server1-conf/gremlin-driver-settings.yaml
@ -1,25 +0,0 @@
-#
-# 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.
-#
-hosts: [localhost]
-port: 8181
-serializer: {
-  className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0,
-  config: {
-    serializeResultToString: false,
-    ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-  }
-}
--- a/docker/configs/server1-conf/gremlin-server.yaml
+++ b/docker/configs/server1-conf/gremlin-server.yaml
@ -1,127 +0,0 @@
-#
-# 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.
-#
-# host and port of gremlin server, need to be consistent with host and port in rest-server.properties
-host: 127.0.0.1
-port: 8181
-
-# timeout in ms of gremlin query
-evaluationTimeout: 30000
-
-channelizer: org.apache.tinkerpop.gremlin.server.channel.WsAndHttpChannelizer
-# don't set graph at here, this happens after support for dynamically adding graph
-graphs: {
-}
-scriptEngines: {
-  gremlin-groovy: {
-    staticImports: [
-      org.opencypher.gremlin.process.traversal.CustomPredicates.*',
-      org.opencypher.gremlin.traversal.CustomFunctions.*
-    ],
-    plugins: {
-      org.apache.hugegraph.plugin.HugeGraphGremlinPlugin: {},
-      org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
-      org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {
-        classImports: [
-          java.lang.Math,
-          org.apache.hugegraph.backend.id.IdGenerator,
-          org.apache.hugegraph.type.define.Directions,
-          org.apache.hugegraph.type.define.NodeRole,
-          org.apache.hugegraph.masterelection.GlobalMasterInfo,
-          org.apache.hugegraph.util.DateUtil,
-          org.apache.hugegraph.traversal.algorithm.CollectionPathsTraverser,
-          org.apache.hugegraph.traversal.algorithm.CountTraverser,
-          org.apache.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser,
-          org.apache.hugegraph.traversal.algorithm.CustomizePathsTraverser,
-          org.apache.hugegraph.traversal.algorithm.FusiformSimilarityTraverser,
-          org.apache.hugegraph.traversal.algorithm.HugeTraverser,
-          org.apache.hugegraph.traversal.algorithm.JaccardSimilarTraverser,
-          org.apache.hugegraph.traversal.algorithm.KneighborTraverser,
-          org.apache.hugegraph.traversal.algorithm.KoutTraverser,
-          org.apache.hugegraph.traversal.algorithm.MultiNodeShortestPathTraverser,
-          org.apache.hugegraph.traversal.algorithm.NeighborRankTraverser,
-          org.apache.hugegraph.traversal.algorithm.PathsTraverser,
-          org.apache.hugegraph.traversal.algorithm.PersonalRankTraverser,
-          org.apache.hugegraph.traversal.algorithm.SameNeighborTraverser,
-          org.apache.hugegraph.traversal.algorithm.ShortestPathTraverser,
-          org.apache.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser,
-          org.apache.hugegraph.traversal.algorithm.SubGraphTraverser,
-          org.apache.hugegraph.traversal.algorithm.TemplatePathsTraverser,
-          org.apache.hugegraph.traversal.algorithm.steps.EdgeStep,
-          org.apache.hugegraph.traversal.algorithm.steps.RepeatEdgeStep,
-          org.apache.hugegraph.traversal.algorithm.steps.WeightedEdgeStep,
-          org.apache.hugegraph.traversal.optimize.ConditionP,
-          org.apache.hugegraph.traversal.optimize.Text,
-          org.apache.hugegraph.traversal.optimize.TraversalUtil,
-          org.opencypher.gremlin.traversal.CustomFunctions,
-          org.opencypher.gremlin.traversal.CustomPredicate
-        ],
-        methodImports: [
-          java.lang.Math#*,
-          org.opencypher.gremlin.traversal.CustomPredicate#*,
-          org.opencypher.gremlin.traversal.CustomFunctions#*
-        ]
-      },
-      org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {
-        files: [scripts/empty-sample.groovy]
-      }
-    }
-  }
-}
-serializers:
-  - {className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1,
-     config: {
-       serializeResultToString: false,
-       ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-     }
-  }
-  - {className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0,
-     config: {
-       serializeResultToString: false,
-       ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-     }
-  }
-  - {className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0,
-     config: {
-       serializeResultToString: false,
-       ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-     }
-  }
-  - {className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0,
-     config: {
-       serializeResultToString: false,
-       ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-     }
-  }
-metrics: {
-  consoleReporter: {enabled: false, interval: 180000},
-  csvReporter: {enabled: false, interval: 180000, fileName: ./metrics/gremlin-server-metrics.csv},
-  jmxReporter: {enabled: false},
-  slf4jReporter: {enabled: false, interval: 180000},
-  gangliaReporter: {enabled: false, interval: 180000, addressingMode: MULTICAST},
-  graphiteReporter: {enabled: false, interval: 180000}
-}
-maxInitialLineLength: 4096
-maxHeaderSize: 8192
-maxChunkSize: 8192
-maxContentLength: 65536
-maxAccumulationBufferComponents: 1024
-resultIterationBatchSize: 64
-writeBufferLowWaterMark: 32768
-writeBufferHighWaterMark: 65536
-ssl: {
-  enabled: false
-}
--- a/docker/configs/server1-conf/remote-objects.yaml
+++ b/docker/configs/server1-conf/remote-objects.yaml
@ -1,30 +0,0 @@
-#
-# 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.
-#
-hosts: [localhost]
-port: 8181
-serializer: {
-  className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0,
-  config: {
-    serializeResultToString: false,
-    # The duplication of HugeGraphIoRegistry is meant to fix a bug in the
-    # 'org.apache.tinkerpop.gremlin.driver.Settings:from(Configuration)' method.
-    ioRegistries: [
-      org.apache.hugegraph.io.HugeGraphIoRegistry,
-      org.apache.hugegraph.io.HugeGraphIoRegistry
-    ]
-  }
-}
--- a/docker/configs/server1-conf/remote.yaml
+++ b/docker/configs/server1-conf/remote.yaml
@ -1,25 +0,0 @@
-#
-# 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.
-#
-hosts: [localhost]
-port: 8181
-serializer: {
-  className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0,
-  config: {
-    serializeResultToString: false,
-    ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-  }
-}
--- a/docker/configs/server1-conf/rest-server.properties
+++ b/docker/configs/server1-conf/rest-server.properties
@ -1,28 +0,0 @@
-# bind url
-restserver.url=http://127.0.0.1:8081
-# gremlin server url, need to be consistent with host and port in gremlin-server.yaml
-gremlinserver.url=http://127.0.0.1:8181
-
-graphs=./conf/graphs
-
-# configuration of arthas
-arthas.telnet_port=8562
-arthas.http_port=8561
-arthas.ip=127.0.0.1
-arthas.disabled_commands=jad
-
-# authentication configs
-# choose 'org.apache.hugegraph.auth.StandardAuthenticator' or
-# 'org.apache.hugegraph.auth.ConfigAuthenticator'
-#auth.authenticator=
-
-# rpc server configs for multi graph-servers or raft-servers
-rpc.server_host=127.0.0.1
-rpc.server_port=8091
-
-# lightweight load balancing (beta)
-server.id=server-1
-server.role=master
-
-# slow query log
-log.slow_query_threshold=1000
--- a/docker/configs/server2-conf/graphs/hugegraph.properties
+++ b/docker/configs/server2-conf/graphs/hugegraph.properties
@ -1,19 +0,0 @@
-# auth config: org.apache.hugegraph.auth.HugeFactoryAuthProxy
-gremlin.graph=org.apache.hugegraph.HugeFactory
-
-# cache config
-vertex.cache_type=l2
-edge.cache_type=l2
-
-store=hugegraph
-backend=hstore
-serializer=binary
-
-# pd config
-pd.peers=127.0.0.1:8686,127.0.0.1:8687,127.0.0.1:8688
-
-# task config
-task.scheduler_type=local
-task.schedule_period=10
-task.retry=0
-task.wait_timeout=10
--- a/docker/configs/server2-conf/gremlin-driver-settings.yaml
+++ b/docker/configs/server2-conf/gremlin-driver-settings.yaml
@ -1,25 +0,0 @@
-#
-# 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.
-#
-hosts: [localhost]
-port: 8182
-serializer: {
-  className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0,
-  config: {
-    serializeResultToString: false,
-    ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-  }
-}
--- a/docker/configs/server2-conf/gremlin-server.yaml
+++ b/docker/configs/server2-conf/gremlin-server.yaml
@ -1,127 +0,0 @@
-#
-# 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.
-#
-# host and port of gremlin server, need to be consistent with host and port in rest-server.properties
-host: 127.0.0.1
-port: 8182
-
-# timeout in ms of gremlin query
-evaluationTimeout: 30000
-
-channelizer: org.apache.tinkerpop.gremlin.server.channel.WsAndHttpChannelizer
-# don't set graph at here, this happens after support for dynamically adding graph
-graphs: {
-}
-scriptEngines: {
-  gremlin-groovy: {
-    staticImports: [
-      org.opencypher.gremlin.process.traversal.CustomPredicates.*',
-      org.opencypher.gremlin.traversal.CustomFunctions.*
-    ],
-    plugins: {
-      org.apache.hugegraph.plugin.HugeGraphGremlinPlugin: {},
-      org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
-      org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {
-        classImports: [
-          java.lang.Math,
-          org.apache.hugegraph.backend.id.IdGenerator,
-          org.apache.hugegraph.type.define.Directions,
-          org.apache.hugegraph.type.define.NodeRole,
-          org.apache.hugegraph.masterelection.GlobalMasterInfo,
-          org.apache.hugegraph.util.DateUtil,
-          org.apache.hugegraph.traversal.algorithm.CollectionPathsTraverser,
-          org.apache.hugegraph.traversal.algorithm.CountTraverser,
-          org.apache.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser,
-          org.apache.hugegraph.traversal.algorithm.CustomizePathsTraverser,
-          org.apache.hugegraph.traversal.algorithm.FusiformSimilarityTraverser,
-          org.apache.hugegraph.traversal.algorithm.HugeTraverser,
-          org.apache.hugegraph.traversal.algorithm.JaccardSimilarTraverser,
-          org.apache.hugegraph.traversal.algorithm.KneighborTraverser,
-          org.apache.hugegraph.traversal.algorithm.KoutTraverser,
-          org.apache.hugegraph.traversal.algorithm.MultiNodeShortestPathTraverser,
-          org.apache.hugegraph.traversal.algorithm.NeighborRankTraverser,
-          org.apache.hugegraph.traversal.algorithm.PathsTraverser,
-          org.apache.hugegraph.traversal.algorithm.PersonalRankTraverser,
-          org.apache.hugegraph.traversal.algorithm.SameNeighborTraverser,
-          org.apache.hugegraph.traversal.algorithm.ShortestPathTraverser,
-          org.apache.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser,
-          org.apache.hugegraph.traversal.algorithm.SubGraphTraverser,
-          org.apache.hugegraph.traversal.algorithm.TemplatePathsTraverser,
-          org.apache.hugegraph.traversal.algorithm.steps.EdgeStep,
-          org.apache.hugegraph.traversal.algorithm.steps.RepeatEdgeStep,
-          org.apache.hugegraph.traversal.algorithm.steps.WeightedEdgeStep,
-          org.apache.hugegraph.traversal.optimize.ConditionP,
-          org.apache.hugegraph.traversal.optimize.Text,
-          org.apache.hugegraph.traversal.optimize.TraversalUtil,
-          org.opencypher.gremlin.traversal.CustomFunctions,
-          org.opencypher.gremlin.traversal.CustomPredicate
-        ],
-        methodImports: [
-          java.lang.Math#*,
-          org.opencypher.gremlin.traversal.CustomPredicate#*,
-          org.opencypher.gremlin.traversal.CustomFunctions#*
-        ]
-      },
-      org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {
-        files: [scripts/empty-sample.groovy]
-      }
-    }
-  }
-}
-serializers:
-  - {className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1,
-     config: {
-       serializeResultToString: false,
-       ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-     }
-  }
-  - {className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0,
-     config: {
-       serializeResultToString: false,
-       ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-     }
-  }
-  - {className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0,
-     config: {
-       serializeResultToString: false,
-       ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-     }
-  }
-  - {className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0,
-     config: {
-       serializeResultToString: false,
-       ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-     }
-  }
-metrics: {
-  consoleReporter: {enabled: false, interval: 180000},
-  csvReporter: {enabled: false, interval: 180000, fileName: ./metrics/gremlin-server-metrics.csv},
-  jmxReporter: {enabled: false},
-  slf4jReporter: {enabled: false, interval: 180000},
-  gangliaReporter: {enabled: false, interval: 180000, addressingMode: MULTICAST},
-  graphiteReporter: {enabled: false, interval: 180000}
-}
-maxInitialLineLength: 4096
-maxHeaderSize: 8192
-maxChunkSize: 8192
-maxContentLength: 65536
-maxAccumulationBufferComponents: 1024
-resultIterationBatchSize: 64
-writeBufferLowWaterMark: 32768
-writeBufferHighWaterMark: 65536
-ssl: {
-  enabled: false
-}
--- a/docker/configs/server2-conf/log4j2.xml
+++ b/docker/configs/server2-conf/log4j2.xml
@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
-  -->
-<!-- Config will be auto loaded every 60s -->
-<configuration status="error" monitorInterval="60">
-    <properties>
-        <property name="LOG_PATH">logs</property>
-        <property name="FILE_NAME">hugegraph-server</property>
-    </properties>
-
-    <appenders>
-        <Console name="console" target="SYSTEM_OUT">
-            <ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="%-d{yyyy-MM-dd HH:mm:ss} [%t] [%p] %c{1.} - %m%n"/>
-        </Console>
-
-        <!-- Normal server log config -->
-        <RollingRandomAccessFile name="file" fileName="${LOG_PATH}/${FILE_NAME}.log"
-                                 filePattern="${LOG_PATH}/$${date:yyyy-MM}/${FILE_NAME}-%d{yyyy-MM-dd}-%i.log"
-                                 immediateFlush="false">
-            <ThresholdFilter level="TRACE" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="%-d{yyyy-MM-dd HH:mm:ss} [%t] [%p] %c{1.} - %m%n"/>
-            <!-- Trigger after exceeding 1day or 50MB -->
-            <Policies>
-                <SizeBasedTriggeringPolicy size="50MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <!-- Keep 5 files per day & auto delete after over 2GB or 100 files -->
-            <DefaultRolloverStrategy max="5">
-                <Delete basePath="${LOG_PATH}" maxDepth="2">
-                    <IfFileName glob="*/*.log"/>
-                    <!-- Limit log amount & size -->
-                    <IfAny>
-                        <IfAccumulatedFileSize exceeds="2GB"/>
-                        <IfAccumulatedFileCount exceeds="100"/>
-                    </IfAny>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingRandomAccessFile>
-
-        <!-- Separate & compress audit log, buffer size is 512KB -->
-        <RollingRandomAccessFile name="audit" fileName="${LOG_PATH}/audit-${FILE_NAME}.log"
-                                 filePattern="${LOG_PATH}/$${date:yyyy-MM}/audit-${FILE_NAME}-%d{yyyy-MM-dd-HH}-%i.gz"
-                                 bufferSize="524288" immediateFlush="false">
-            <ThresholdFilter level="TRACE" onMatch="ACCEPT" onMismatch="DENY"/>
-            <!-- Use simple format for audit log to speed up -->
-            <PatternLayout pattern="%-d{yyyy-MM-dd HH:mm:ss} - %m%n"/>
-            <!-- Trigger after exceeding 1hour or 500MB -->
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <!-- Keep 2 files per hour & auto delete [after 60 days] or [over 5GB or 500 files] -->
-            <DefaultRolloverStrategy max="2">
-                <Delete basePath="${LOG_PATH}" maxDepth="2">
-                    <IfFileName glob="*/*.gz"/>
-                    <IfLastModified age="60d"/>
-                    <IfAny>
-                        <IfAccumulatedFileSize exceeds="5GB"/>
-                        <IfAccumulatedFileCount exceeds="500"/>
-                    </IfAny>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingRandomAccessFile>
-
-        <!-- Slow query log config -->
-        <RollingRandomAccessFile name="slowQueryLog" fileName="${LOG_PATH}/slow_query.log"
-                                 filePattern="${LOG_PATH}/$${date:yyyy-MM}/slow_query_log-%d{yyyy-MM-dd}-%i.log"
-                                 immediateFlush="false">
-            <ThresholdFilter level="TRACE" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="%-d{yyyy-MM-dd HH:mm:ss} [%t] [%p] %c{1.} - %m%n"/>
-            <!-- Trigger after exceeding 1day or 50MB -->
-            <Policies>
-                <SizeBasedTriggeringPolicy size="50MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <!-- Keep 5 files per day & auto delete after over 2GB or 100 files -->
-            <DefaultRolloverStrategy max="5">
-                <Delete basePath="${LOG_PATH}" maxDepth="2">
-                    <IfFileName glob="*/*.log"/>
-                    <!-- Limit log amount & size -->
-                    <IfAny>
-                        <IfAccumulatedFileSize exceeds="2GB"/>
-                        <IfAccumulatedFileCount exceeds="100"/>
-                    </IfAny>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingRandomAccessFile>
-    </appenders>
-
-    <loggers>
-        <root level="INFO">
-            <appender-ref ref="file"/>
-        </root>
-        <logger name="org.apache.cassandra" level="INFO" additivity="false">
-            <appender-ref ref="file"/>
-        </logger>
-        <logger name="org.apache.hadoop" level="INFO" additivity="false">
-            <appender-ref ref="file"/>
-        </logger>
-        <logger name="org.apache.zookeeper" level="WARN" additivity="false">
-            <appender-ref ref="file"/>
-        </logger>
-        <logger name="com.datastax.driver" level="WARN" additivity="false">
-            <appender-ref ref="file"/>
-        </logger>
-        <logger name="com.alipay.sofa" level="WARN" additivity="false">
-            <appender-ref ref="file"/>
-        </logger>
-        <logger name="io.netty" level="INFO" additivity="false">
-            <appender-ref ref="file"/>
-        </logger>
-        <logger name="org.apache.commons" level="INFO" additivity="false">
-            <appender-ref ref="file"/>
-        </logger>
-        <!-- Use mixed async way to output logs -->
-        <AsyncLogger name="org.apache.hugegraph" level="INFO" additivity="false">
-            <appender-ref ref="file"/>
-        </AsyncLogger>
-        <AsyncLogger name="org.apache.hugegraph.auth" level="INFO" additivity="false">
-            <appender-ref ref="audit"/>
-        </AsyncLogger>
-        <AsyncLogger name="org.apache.hugegraph.api.filter.AuthenticationFilter" level="INFO" additivity="false">
-            <appender-ref ref="audit"/>
-        </AsyncLogger>
-        <AsyncLogger name="org.apache.hugegraph.api.filter.AccessLogFilter" level="INFO" additivity="false">
-            <appender-ref ref="slowQueryLog"/>
-        </AsyncLogger>
-    </loggers>
-</configuration>
--- a/docker/configs/server2-conf/remote-objects.yaml
+++ b/docker/configs/server2-conf/remote-objects.yaml
@ -1,30 +0,0 @@
-#
-# 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.
-#
-hosts: [localhost]
-port: 8182
-serializer: {
-  className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0,
-  config: {
-    serializeResultToString: false,
-    # The duplication of HugeGraphIoRegistry is meant to fix a bug in the
-    # 'org.apache.tinkerpop.gremlin.driver.Settings:from(Configuration)' method.
-    ioRegistries: [
-      org.apache.hugegraph.io.HugeGraphIoRegistry,
-      org.apache.hugegraph.io.HugeGraphIoRegistry
-    ]
-  }
-}
--- a/docker/configs/server2-conf/remote.yaml
+++ b/docker/configs/server2-conf/remote.yaml
@ -1,25 +0,0 @@
-#
-# 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.
-#
-hosts: [localhost]
-port: 8182
-serializer: {
-  className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0,
-  config: {
-    serializeResultToString: false,
-    ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-  }
-}
--- a/docker/configs/server2-conf/rest-server.properties
+++ b/docker/configs/server2-conf/rest-server.properties
@ -1,26 +0,0 @@
-# bind url
-restserver.url=http://127.0.0.1:8082
-# gremlin server url, need to be consistent with host and port in gremlin-server.yaml
-gremlinserver.url=http://127.0.0.1:8182
-
-graphs=./conf/graphs
-
-# configuration of arthas
-arthas.telnet_port=8572
-arthas.http_port=8571
-arthas.ip=127.0.0.1
-arthas.disabled_commands=jad
-
-# authentication configs
-# choose 'org.apache.hugegraph.auth.StandardAuthenticator' or
-# 'org.apache.hugegraph.auth.ConfigAuthenticator'
-#auth.authenticator=
-
-# rpc server configs for multi graph-servers or raft-servers
-rpc.server_host=127.0.0.1
-rpc.server_port=8092
-#rpc.server_timeout=30
-
-# lightweight load balancing (beta)
-server.id=server-2
-server.role=worker
--- a/docker/configs/server3-conf/graphs/hugegraph.properties
+++ b/docker/configs/server3-conf/graphs/hugegraph.properties
@ -1,19 +0,0 @@
-# auth config: org.apache.hugegraph.auth.HugeFactoryAuthProxy
-gremlin.graph=org.apache.hugegraph.HugeFactory
-
-# cache config
-vertex.cache_type=l2
-edge.cache_type=l2
-
-store=hugegraph
-backend=hstore
-serializer=binary
-
-# pd config
-pd.peers=127.0.0.1:8686,127.0.0.1:8687,127.0.0.1:8688
-
-# task config
-task.scheduler_type=local
-task.schedule_period=10
-task.retry=0
-task.wait_timeout=10
--- a/docker/configs/server3-conf/gremlin-driver-settings.yaml
+++ b/docker/configs/server3-conf/gremlin-driver-settings.yaml
@ -1,25 +0,0 @@
-#
-# 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.
-#
-hosts: [localhost]
-port: 8183
-serializer: {
-  className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0,
-  config: {
-    serializeResultToString: false,
-    ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-  }
-}
--- a/docker/configs/server3-conf/gremlin-server.yaml
+++ b/docker/configs/server3-conf/gremlin-server.yaml
@ -1,127 +0,0 @@
-#
-# 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.
-#
-# host and port of gremlin server, need to be consistent with host and port in rest-server.properties
-host: 127.0.0.1
-port: 8183
-
-# timeout in ms of gremlin query
-evaluationTimeout: 30000
-
-channelizer: org.apache.tinkerpop.gremlin.server.channel.WsAndHttpChannelizer
-# don't set graph at here, this happens after support for dynamically adding graph
-graphs: {
-}
-scriptEngines: {
-  gremlin-groovy: {
-    staticImports: [
-      org.opencypher.gremlin.process.traversal.CustomPredicates.*',
-      org.opencypher.gremlin.traversal.CustomFunctions.*
-    ],
-    plugins: {
-      org.apache.hugegraph.plugin.HugeGraphGremlinPlugin: {},
-      org.apache.tinkerpop.gremlin.server.jsr223.GremlinServerGremlinPlugin: {},
-      org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {
-        classImports: [
-          java.lang.Math,
-          org.apache.hugegraph.backend.id.IdGenerator,
-          org.apache.hugegraph.type.define.Directions,
-          org.apache.hugegraph.type.define.NodeRole,
-          org.apache.hugegraph.masterelection.GlobalMasterInfo,
-          org.apache.hugegraph.util.DateUtil,
-          org.apache.hugegraph.traversal.algorithm.CollectionPathsTraverser,
-          org.apache.hugegraph.traversal.algorithm.CountTraverser,
-          org.apache.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser,
-          org.apache.hugegraph.traversal.algorithm.CustomizePathsTraverser,
-          org.apache.hugegraph.traversal.algorithm.FusiformSimilarityTraverser,
-          org.apache.hugegraph.traversal.algorithm.HugeTraverser,
-          org.apache.hugegraph.traversal.algorithm.JaccardSimilarTraverser,
-          org.apache.hugegraph.traversal.algorithm.KneighborTraverser,
-          org.apache.hugegraph.traversal.algorithm.KoutTraverser,
-          org.apache.hugegraph.traversal.algorithm.MultiNodeShortestPathTraverser,
-          org.apache.hugegraph.traversal.algorithm.NeighborRankTraverser,
-          org.apache.hugegraph.traversal.algorithm.PathsTraverser,
-          org.apache.hugegraph.traversal.algorithm.PersonalRankTraverser,
-          org.apache.hugegraph.traversal.algorithm.SameNeighborTraverser,
-          org.apache.hugegraph.traversal.algorithm.ShortestPathTraverser,
-          org.apache.hugegraph.traversal.algorithm.SingleSourceShortestPathTraverser,
-          org.apache.hugegraph.traversal.algorithm.SubGraphTraverser,
-          org.apache.hugegraph.traversal.algorithm.TemplatePathsTraverser,
-          org.apache.hugegraph.traversal.algorithm.steps.EdgeStep,
-          org.apache.hugegraph.traversal.algorithm.steps.RepeatEdgeStep,
-          org.apache.hugegraph.traversal.algorithm.steps.WeightedEdgeStep,
-          org.apache.hugegraph.traversal.optimize.ConditionP,
-          org.apache.hugegraph.traversal.optimize.Text,
-          org.apache.hugegraph.traversal.optimize.TraversalUtil,
-          org.opencypher.gremlin.traversal.CustomFunctions,
-          org.opencypher.gremlin.traversal.CustomPredicate
-        ],
-        methodImports: [
-          java.lang.Math#*,
-          org.opencypher.gremlin.traversal.CustomPredicate#*,
-          org.opencypher.gremlin.traversal.CustomFunctions#*
-        ]
-      },
-      org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {
-        files: [scripts/empty-sample.groovy]
-      }
-    }
-  }
-}
-serializers:
-  - {className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1,
-     config: {
-       serializeResultToString: false,
-       ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-     }
-  }
-  - {className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0,
-     config: {
-       serializeResultToString: false,
-       ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-     }
-  }
-  - {className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0,
-     config: {
-       serializeResultToString: false,
-       ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-     }
-  }
-  - {className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0,
-     config: {
-       serializeResultToString: false,
-       ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-     }
-  }
-metrics: {
-  consoleReporter: {enabled: false, interval: 180000},
-  csvReporter: {enabled: false, interval: 180000, fileName: ./metrics/gremlin-server-metrics.csv},
-  jmxReporter: {enabled: false},
-  slf4jReporter: {enabled: false, interval: 180000},
-  gangliaReporter: {enabled: false, interval: 180000, addressingMode: MULTICAST},
-  graphiteReporter: {enabled: false, interval: 180000}
-}
-maxInitialLineLength: 4096
-maxHeaderSize: 8192
-maxChunkSize: 8192
-maxContentLength: 65536
-maxAccumulationBufferComponents: 1024
-resultIterationBatchSize: 64
-writeBufferLowWaterMark: 32768
-writeBufferHighWaterMark: 65536
-ssl: {
-  enabled: false
-}
--- a/docker/configs/server3-conf/log4j2.xml
+++ b/docker/configs/server3-conf/log4j2.xml
@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
-  -->
-<!-- Config will be auto loaded every 60s -->
-<configuration status="error" monitorInterval="60">
-    <properties>
-        <property name="LOG_PATH">logs</property>
-        <property name="FILE_NAME">hugegraph-server</property>
-    </properties>
-
-    <appenders>
-        <Console name="console" target="SYSTEM_OUT">
-            <ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="%-d{yyyy-MM-dd HH:mm:ss} [%t] [%p] %c{1.} - %m%n"/>
-        </Console>
-
-        <!-- Normal server log config -->
-        <RollingRandomAccessFile name="file" fileName="${LOG_PATH}/${FILE_NAME}.log"
-                                 filePattern="${LOG_PATH}/$${date:yyyy-MM}/${FILE_NAME}-%d{yyyy-MM-dd}-%i.log"
-                                 immediateFlush="false">
-            <ThresholdFilter level="TRACE" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="%-d{yyyy-MM-dd HH:mm:ss} [%t] [%p] %c{1.} - %m%n"/>
-            <!-- Trigger after exceeding 1day or 50MB -->
-            <Policies>
-                <SizeBasedTriggeringPolicy size="50MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <!-- Keep 5 files per day & auto delete after over 2GB or 100 files -->
-            <DefaultRolloverStrategy max="5">
-                <Delete basePath="${LOG_PATH}" maxDepth="2">
-                    <IfFileName glob="*/*.log"/>
-                    <!-- Limit log amount & size -->
-                    <IfAny>
-                        <IfAccumulatedFileSize exceeds="2GB"/>
-                        <IfAccumulatedFileCount exceeds="100"/>
-                    </IfAny>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingRandomAccessFile>
-
-        <!-- Separate & compress audit log, buffer size is 512KB -->
-        <RollingRandomAccessFile name="audit" fileName="${LOG_PATH}/audit-${FILE_NAME}.log"
-                                 filePattern="${LOG_PATH}/$${date:yyyy-MM}/audit-${FILE_NAME}-%d{yyyy-MM-dd-HH}-%i.gz"
-                                 bufferSize="524288" immediateFlush="false">
-            <ThresholdFilter level="TRACE" onMatch="ACCEPT" onMismatch="DENY"/>
-            <!-- Use simple format for audit log to speed up -->
-            <PatternLayout pattern="%-d{yyyy-MM-dd HH:mm:ss} - %m%n"/>
-            <!-- Trigger after exceeding 1hour or 500MB -->
-            <Policies>
-                <SizeBasedTriggeringPolicy size="500MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <!-- Keep 2 files per hour & auto delete [after 60 days] or [over 5GB or 500 files] -->
-            <DefaultRolloverStrategy max="2">
-                <Delete basePath="${LOG_PATH}" maxDepth="2">
-                    <IfFileName glob="*/*.gz"/>
-                    <IfLastModified age="60d"/>
-                    <IfAny>
-                        <IfAccumulatedFileSize exceeds="5GB"/>
-                        <IfAccumulatedFileCount exceeds="500"/>
-                    </IfAny>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingRandomAccessFile>
-
-        <!-- Slow query log config -->
-        <RollingRandomAccessFile name="slowQueryLog" fileName="${LOG_PATH}/slow_query.log"
-                                 filePattern="${LOG_PATH}/$${date:yyyy-MM}/slow_query_log-%d{yyyy-MM-dd}-%i.log"
-                                 immediateFlush="false">
-            <ThresholdFilter level="TRACE" onMatch="ACCEPT" onMismatch="DENY"/>
-            <PatternLayout pattern="%-d{yyyy-MM-dd HH:mm:ss} [%t] [%p] %c{1.} - %m%n"/>
-            <!-- Trigger after exceeding 1day or 50MB -->
-            <Policies>
-                <SizeBasedTriggeringPolicy size="50MB"/>
-                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-            </Policies>
-            <!-- Keep 5 files per day & auto delete after over 2GB or 100 files -->
-            <DefaultRolloverStrategy max="5">
-                <Delete basePath="${LOG_PATH}" maxDepth="2">
-                    <IfFileName glob="*/*.log"/>
-                    <!-- Limit log amount & size -->
-                    <IfAny>
-                        <IfAccumulatedFileSize exceeds="2GB"/>
-                        <IfAccumulatedFileCount exceeds="100"/>
-                    </IfAny>
-                </Delete>
-            </DefaultRolloverStrategy>
-        </RollingRandomAccessFile>
-    </appenders>
-
-    <loggers>
-        <root level="INFO">
-            <appender-ref ref="file"/>
-        </root>
-        <logger name="org.apache.cassandra" level="INFO" additivity="false">
-            <appender-ref ref="file"/>
-        </logger>
-        <logger name="org.apache.hadoop" level="INFO" additivity="false">
-            <appender-ref ref="file"/>
-        </logger>
-        <logger name="org.apache.zookeeper" level="WARN" additivity="false">
-            <appender-ref ref="file"/>
-        </logger>
-        <logger name="com.datastax.driver" level="WARN" additivity="false">
-            <appender-ref ref="file"/>
-        </logger>
-        <logger name="com.alipay.sofa" level="WARN" additivity="false">
-            <appender-ref ref="file"/>
-        </logger>
-        <logger name="io.netty" level="INFO" additivity="false">
-            <appender-ref ref="file"/>
-        </logger>
-        <logger name="org.apache.commons" level="INFO" additivity="false">
-            <appender-ref ref="file"/>
-        </logger>
-        <!-- Use mixed async way to output logs -->
-        <AsyncLogger name="org.apache.hugegraph" level="INFO" additivity="false">
-            <appender-ref ref="file"/>
-        </AsyncLogger>
-        <AsyncLogger name="org.apache.hugegraph.auth" level="INFO" additivity="false">
-            <appender-ref ref="audit"/>
-        </AsyncLogger>
-        <AsyncLogger name="org.apache.hugegraph.api.filter.AuthenticationFilter" level="INFO" additivity="false">
-            <appender-ref ref="audit"/>
-        </AsyncLogger>
-        <AsyncLogger name="org.apache.hugegraph.api.filter.AccessLogFilter" level="INFO" additivity="false">
-            <appender-ref ref="slowQueryLog"/>
-        </AsyncLogger>
-    </loggers>
-</configuration>
--- a/docker/configs/server3-conf/remote-objects.yaml
+++ b/docker/configs/server3-conf/remote-objects.yaml
@ -1,30 +0,0 @@
-#
-# 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.
-#
-hosts: [localhost]
-port: 8183
-serializer: {
-  className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0,
-  config: {
-    serializeResultToString: false,
-    # The duplication of HugeGraphIoRegistry is meant to fix a bug in the
-    # 'org.apache.tinkerpop.gremlin.driver.Settings:from(Configuration)' method.
-    ioRegistries: [
-      org.apache.hugegraph.io.HugeGraphIoRegistry,
-      org.apache.hugegraph.io.HugeGraphIoRegistry
-    ]
-  }
-}
--- a/docker/configs/server3-conf/remote.yaml
+++ b/docker/configs/server3-conf/remote.yaml
@ -1,25 +0,0 @@
-#
-# 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.
-#
-hosts: [localhost]
-port: 8183
-serializer: {
-  className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0,
-  config: {
-    serializeResultToString: false,
-    ioRegistries: [org.apache.hugegraph.io.HugeGraphIoRegistry]
-  }
-}
--- a/docker/configs/server3-conf/rest-server.properties
+++ b/docker/configs/server3-conf/rest-server.properties
@ -1,25 +0,0 @@
-# bind url
-restserver.url=http://127.0.0.1:8083
-# gremlin server url, need to be consistent with host and port in gremlin-server.yaml
-gremlinserver.url=http://127.0.0.1:8183
-
-graphs=./conf/graphs
-
-# configuration of arthas
-arthas.telnet_port=8582
-arthas.http_port=8581
-arthas.ip=127.0.0.1
-arthas.disabled_commands=jad
-
-# authentication configs
-# choose 'org.apache.hugegraph.auth.StandardAuthenticator' or
-# 'org.apache.hugegraph.auth.ConfigAuthenticator'
-#auth.authenticator=
-
-# rpc server configs for multi graph-servers or raft-servers
-rpc.server_host=127.0.0.1
-rpc.server_port=8093
-
-# lightweight load balancing (beta)
-server.id=server-3
-server.role=worker
--- a/docker/docker-compose-3pd-3store-3server.yml
+++ b/docker/docker-compose-3pd-3store-3server.yml
@ -1,180 +0,0 @@
-#
-# 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.
-#
-
-# TODO: reuse the configs for same type containers
-# User could modify the node nums and the port by themselves
-version: "3"
-
-services:
-  pd0:
-    image: hugegraph/pd
-    container_name: pd0
-    hostname: pd0
-    network_mode: host
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8620"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-    volumes:
-      - ./configs/application-pd0.yml:/hugegraph-pd/conf/application.yml
-
-  pd1:
-    image: hugegraph/pd
-    container_name: pd1
-    hostname: pd1
-    network_mode: host
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8621"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-    volumes:
-      - ./configs/application-pd1.yml:/hugegraph-pd/conf/application.yml
-
-  pd2:
-    image: hugegraph/pd
-    container_name: pd2
-    hostname: pd2
-    network_mode: host
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8622"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-    volumes:
-      - ./configs/application-pd2.yml:/hugegraph-pd/conf/application.yml
-
-  store0:
-    image: hugegraph/store
-    container_name: store0
-    hostname: store0
-    network_mode: host
-    depends_on:
-      pd0:
-        condition: service_healthy
-      pd1:
-        condition: service_healthy
-      pd2:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8520"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-    volumes:
-      - ./configs/application-store0.yml:/hugegraph-store/conf/application.yml
-
-  store1:
-    image: hugegraph/store
-    container_name: store1
-    hostname: store1
-    network_mode: host
-    depends_on:
-      pd0:
-        condition: service_healthy
-      pd1:
-        condition: service_healthy
-      pd2:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8521"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-    volumes:
-      - ./configs/application-store1.yml:/hugegraph-store/conf/application.yml
-
-  store2:
-    image: hugegraph/store
-    container_name: store2
-    hostname: store2
-    network_mode: host
-    depends_on:
-      pd0:
-        condition: service_healthy
-      pd1:
-        condition: service_healthy
-      pd2:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8522"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-    volumes:
-      - ./configs/application-store2.yml:/hugegraph-store/conf/application.yml
-
-  server1:
-    image: hugegraph/server
-    container_name: server1
-    hostname: server1
-    network_mode: host
-    depends_on:
-      store0:
-        condition: service_healthy
-      store1:
-        condition: service_healthy
-      store2:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8081"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-    volumes:
-      - ./configs/server1-conf:/hugegraph-server/conf
-
-  server2:
-    image: hugegraph/server
-    container_name: server2
-    hostname: server2
-    network_mode: host
-    depends_on:
-      store0:
-        condition: service_healthy
-      store1:
-        condition: service_healthy
-      store2:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8082"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-    volumes:
-      - ./configs/server2-conf:/hugegraph-server/conf
-
-  server3:
-    image: hugegraph/server
-    container_name: server3
-    hostname: server3
-    network_mode: host
-    depends_on:
-      store0:
-        condition: service_healthy
-      store1:
-        condition: service_healthy
-      store2:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8083"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-    volumes:
-      - ./configs/server3-conf:/hugegraph-server/conf
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@ -1,58 +0,0 @@
-#
-# 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.
-#
-
-version: "3"
-
-services:
-  pd:
-    image: hugegraph/pd
-    container_name: pd
-    hostname: pd
-    network_mode: host
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8620"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-
-  store:
-    image: hugegraph/store
-    container_name: store
-    hostname: store
-    network_mode: host
-    depends_on:
-      pd:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8520"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-
-  server:
-    image: hugegraph/server
-    container_name: server
-    hostname: server
-    network_mode: host
-    depends_on:
-      store:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8080"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
--- a/hugegraph-server/hugegraph-api/pom.xml
+++ b/hugegraph-server/hugegraph-api/pom.xml
@ -1,28 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
-  -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-        <groupId>org.apache.hugegraph</groupId>
-        <artifactId>hugegraph-server</artifactId>
-        <version>${revision}</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>hugegraph</artifactId>
+        <groupId>com.baidu.hugegraph</groupId>
+        <version>0.12.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@ -30,25 +13,16 @@

    <dependencies>
        <dependency>
-            <groupId>org.apache.hugegraph</groupId>
+            <groupId>com.baidu.hugegraph</groupId>
            <artifactId>hugegraph-core</artifactId>
-            <version>${revision}</version>
+            <version>${project.version}</version>
        </dependency>

        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-netty-shaded</artifactId>
-            <version>1.47.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.hugegraph</groupId>
+            <groupId>com.baidu.hugegraph</groupId>
            <artifactId>hugegraph-rpc</artifactId>
+            <version>2.0.1</version>
            <exclusions>
-                <exclusion>
-                    <groupId>io.grpc</groupId>
-                    <artifactId>grpc-netty-shaded</artifactId>
-                </exclusion>
                <!-- conflict with jraft -->
                <exclusion>
                    <groupId>com.alipay.sofa</groupId>
@ -119,68 +93,54 @@
        <dependency>
            <groupId>org.glassfish.grizzly</groupId>
            <artifactId>grizzly-http</artifactId>
-            <version>3.0.1</version>
+            <version>2.4.4</version>
        </dependency>
        <dependency>
            <groupId>org.glassfish.grizzly</groupId>
            <artifactId>grizzly-framework</artifactId>
-            <version>3.0.1</version>
+            <version>2.4.4</version>
        </dependency>
        <dependency>
            <groupId>org.glassfish.grizzly</groupId>
            <artifactId>grizzly-http-server</artifactId>
-            <version>3.0.1</version>
+            <version>2.4.4</version>
        </dependency>
        <dependency>
            <groupId>org.glassfish.grizzly</groupId>
            <artifactId>grizzly-http-servlet</artifactId>
-            <version>3.0.1</version>
+            <version>2.4.4</version>
        </dependency>

        <dependency>
            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-jersey3</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opencypher.gremlin</groupId>
-            <artifactId>translation</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-jaxrs2-jakarta</artifactId>
-            <version>${swagger.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.taobao.arthas</groupId>
-            <artifactId>arthas-agent-attach</artifactId>
-            <version>${arthas.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.taobao.arthas</groupId>
-            <artifactId>arthas-packaging</artifactId>
-            <version>${arthas.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.gridkit.jvmtool</groupId>
-            <artifactId>sjk-core</artifactId>
-            <version>0.22</version>
-            <scope>compile</scope>
+            <artifactId>metrics-jersey2</artifactId>
        </dependency>
    </dependencies>

    <build>
        <plugins>
            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.0.0</version>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>${top.level.dir}</directory>
+                            <includes>
+                                <include>*.tar.gz</include>
+                            </includes>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
+                        <fileset>
+                            <directory>${final.name}</directory>
+                        </fileset>
+                    </filesets>
+                </configuration>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.0.2</version>
                <configuration>
                    <archive>
                        <index>true</index>
@ -193,8 +153,7 @@
                            </addDefaultSpecificationEntries>
                        </manifest>
                        <manifestEntries>
-                            <!-- TODO: update it -->
-                            <Implementation-Version>0.71.0.0</Implementation-Version>
+                            <Implementation-Version>0.67.0.0</Implementation-Version>
                        </manifestEntries>
                    </archive>
                </configuration>
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/API.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/API.java
@ -0,0 +1,193 @@
+/*
+ * 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 java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.function.Consumer;
+
+import javax.ws.rs.ForbiddenException;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.NotSupportedException;
+import javax.ws.rs.core.MediaType;
+
+import org.slf4j.Logger;
+
+import com.baidu.hugegraph.HugeException;
+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.define.Checkable;
+import com.baidu.hugegraph.metrics.MetricsUtil;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.JsonUtil;
+import com.baidu.hugegraph.util.Log;
+import com.codahale.metrics.Meter;
+import com.google.common.collect.ImmutableMap;
+
+public class API {
+
+    private static final Logger LOG = Log.logger(RestServer.class);
+
+    public static final String CHARSET = "UTF-8";
+
+    public static final String APPLICATION_JSON = MediaType.APPLICATION_JSON;
+    public static final String APPLICATION_JSON_WITH_CHARSET =
+                               APPLICATION_JSON + ";charset=" + CHARSET;
+    public static final String JSON = MediaType.APPLICATION_JSON_TYPE
+                                               .getSubtype();
+
+    public static final String ACTION_APPEND = "append";
+    public static final String ACTION_ELIMINATE = "eliminate";
+    public static final String ACTION_CLEAR = "clear";
+
+    private static final Meter succeedMeter =
+                         MetricsUtil.registerMeter(API.class, "commit-succeed");
+    private static final Meter illegalArgErrorMeter =
+                         MetricsUtil.registerMeter(API.class, "illegal-arg");
+    private static final Meter expectedErrorMeter =
+                         MetricsUtil.registerMeter(API.class, "expected-error");
+    private static final Meter unknownErrorMeter =
+                         MetricsUtil.registerMeter(API.class, "unknown-error");
+
+    public static HugeGraph graph(GraphManager manager, String graph) {
+        HugeGraph g = manager.graph(graph);
+        if (g == null) {
+            throw new NotFoundException(String.format(
+                      "Graph '%s' does not exist",  graph));
+        }
+        return g;
+    }
+
+    public static HugeGraph graph4admin(GraphManager manager, String graph) {
+        return graph(manager, graph).hugegraph();
+    }
+
+    public static <R> R commit(HugeGraph g, Callable<R> callable) {
+        Consumer<Throwable> rollback = (error) -> {
+            if (error != null) {
+                LOG.error("Failed to commit", error);
+            }
+            try {
+                g.tx().rollback();
+            } catch (Throwable e) {
+                LOG.error("Failed to rollback", e);
+            }
+        };
+
+        try {
+            R result = callable.call();
+            g.tx().commit();
+            succeedMeter.mark();
+            return result;
+        } catch (IllegalArgumentException | NotFoundException |
+                 ForbiddenException e) {
+            illegalArgErrorMeter.mark();
+            rollback.accept(null);
+            throw e;
+        } catch (RuntimeException e) {
+            expectedErrorMeter.mark();
+            rollback.accept(e);
+            throw e;
+        } catch (Throwable e) {
+            unknownErrorMeter.mark();
+            rollback.accept(e);
+            // TODO: throw the origin exception 'e'
+            throw new HugeException("Failed to commit", e);
+        }
+    }
+
+    public static void commit(HugeGraph g, Runnable runnable) {
+        commit(g, () -> {
+            runnable.run();
+            return null;
+        });
+    }
+
+    public static Object[] properties(Map<String, Object> properties) {
+        Object[] list = new Object[properties.size() * 2];
+        int i = 0;
+        for (Map.Entry<String, Object> prop : properties.entrySet()) {
+            list[i++] = prop.getKey();
+            list[i++] = prop.getValue();
+        }
+        return list;
+    }
+
+    protected static void checkCreatingBody(Checkable body) {
+        E.checkArgumentNotNull(body, "The request body can't be empty");
+        body.checkCreate(false);
+    }
+
+    protected static void checkUpdatingBody(Checkable body) {
+        E.checkArgumentNotNull(body, "The request body can't be empty");
+        body.checkUpdate();
+    }
+
+    protected static void checkCreatingBody(
+                          Collection<? extends Checkable> bodys) {
+        E.checkArgumentNotNull(bodys, "The request body can't be empty");
+        for (Checkable body : bodys) {
+            E.checkArgument(body != null,
+                            "The batch body can't contain null record");
+            body.checkCreate(true);
+        }
+    }
+
+    protected static void checkUpdatingBody(
+                          Collection<? extends Checkable> bodys) {
+        E.checkArgumentNotNull(bodys, "The request body can't be empty");
+        for (Checkable body : bodys) {
+            E.checkArgumentNotNull(body,
+                                   "The batch body can't contain null record");
+            body.checkUpdate();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    protected static Map<String, Object> parseProperties(String properties) {
+        if (properties == null || properties.isEmpty()) {
+            return ImmutableMap.of();
+        }
+
+        Map<String, Object> props = null;
+        try {
+            props = JsonUtil.fromJson(properties, Map.class);
+        } catch (Exception ignored) {}
+
+        // If properties is the string "null", props will be null
+        E.checkArgument(props != null,
+                        "Invalid request with properties: %s", properties);
+        return props;
+    }
+
+    public static boolean checkAndParseAction(String action) {
+        E.checkArgumentNotNull(action, "The action param can't be empty");
+        if (action.equals(ACTION_APPEND)) {
+            return true;
+        } else if (action.equals(ACTION_ELIMINATE)) {
+            return false;
+        } else {
+            throw new NotSupportedException(
+                      String.format("Not support action '%s'", action));
+        }
+    }
+}
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/AccessAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/AccessAPI.java
@ -1,61 +1,62 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.auth;
+package com.baidu.hugegraph.api.auth;

 import java.util.List;

-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.auth.HugeAccess;
-import org.apache.hugegraph.auth.HugePermission;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.define.Checkable;
-import org.apache.hugegraph.exception.NotFoundException;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.StatusFilter.Status;
+import com.baidu.hugegraph.auth.HugeAccess;
+import com.baidu.hugegraph.auth.HugePermission;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.define.Checkable;
+import com.baidu.hugegraph.exception.NotFoundException;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/auth/accesses")
@Singleton
-@Tag(name = "AccessAPI")
 public class AccessAPI extends API {

-    private static final Logger LOG = Log.logger(AccessAPI.class);
+    private static final Logger LOG = Log.logger(RestServer.class);

    @POST
    @Timed
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/BelongAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/BelongAPI.java
@ -1,60 +1,61 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.auth;
+package com.baidu.hugegraph.api.auth;

 import java.util.List;

-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.auth.HugeBelong;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.define.Checkable;
-import org.apache.hugegraph.exception.NotFoundException;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.StatusFilter.Status;
+import com.baidu.hugegraph.auth.HugeBelong;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.define.Checkable;
+import com.baidu.hugegraph.exception.NotFoundException;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/auth/belongs")
@Singleton
-@Tag(name = "BelongAPI")
 public class BelongAPI extends API {

-    private static final Logger LOG = Log.logger(BelongAPI.class);
+    private static final Logger LOG = Log.logger(RestServer.class);

    @POST
    @Timed
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/GroupAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/GroupAPI.java
@ -1,60 +1,61 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.auth;
+package com.baidu.hugegraph.api.auth;

 import java.util.List;

-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.auth.HugeGroup;
-import org.apache.hugegraph.backend.id.IdGenerator;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.define.Checkable;
-import org.apache.hugegraph.exception.NotFoundException;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.StatusFilter.Status;
+import com.baidu.hugegraph.auth.HugeGroup;
+import com.baidu.hugegraph.backend.id.IdGenerator;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.define.Checkable;
+import com.baidu.hugegraph.exception.NotFoundException;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/auth/groups")
@Singleton
-@Tag(name = "GroupAPI")
 public class GroupAPI extends API {

-    private static final Logger LOG = Log.logger(GroupAPI.class);
+    private static final Logger LOG = Log.logger(RestServer.class);

    @POST
    @Timed
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/LoginAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/LoginAPI.java
@ -1,78 +1,82 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.auth;
+package com.baidu.hugegraph.api.auth;

+import javax.inject.Singleton;
 import javax.security.sasl.AuthenticationException;
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.NotAuthorizedException;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;

 import org.apache.commons.lang3.StringUtils;
-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.AuthenticationFilter;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.auth.AuthConstant;
-import org.apache.hugegraph.auth.UserWithRole;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.define.Checkable;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.AuthenticationFilter;
+import com.baidu.hugegraph.api.filter.StatusFilter;
+import com.baidu.hugegraph.api.filter.StatusFilter.Status;
+import com.baidu.hugegraph.auth.AuthConstant;
+import com.baidu.hugegraph.auth.UserWithRole;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.define.Checkable;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.BadRequestException;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.HeaderParam;
-import jakarta.ws.rs.NotAuthorizedException;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.HttpHeaders;
-
@Path("graphs/{graph}/auth")
@Singleton
-@Tag(name = "LoginAPI")
 public class LoginAPI extends API {

-    private static final Logger LOG = Log.logger(LoginAPI.class);
+    private static final Logger LOG = Log.logger(RestServer.class);

    @POST
    @Timed
    @Path("login")
-    @Status(Status.OK)
+    @Status(StatusFilter.Status.OK)
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
-    public String login(@Context GraphManager manager, @PathParam("graph") String graph,
+    public String login(@Context GraphManager manager,
+                        @PathParam("graph") String graph,
                        JsonLogin jsonLogin) {
        LOG.debug("Graph [{}] user login: {}", graph, jsonLogin);
        checkCreatingBody(jsonLogin);

        try {
-            String token = manager.authManager().loginUser(jsonLogin.name, jsonLogin.password);
+            String token = manager.authManager()
+                                  .loginUser(jsonLogin.name, jsonLogin.password);
            HugeGraph g = graph(manager, graph);
-            return manager.serializer(g).writeMap(ImmutableMap.of("token", token));
+            return manager.serializer(g)
+                          .writeMap(ImmutableMap.of("token", token));
        } catch (AuthenticationException e) {
            throw new NotAuthorizedException(e.getMessage(), e);
        }
@ -81,40 +85,48 @@ public class LoginAPI extends API {
    @DELETE
    @Timed
    @Path("logout")
-    @Status(Status.OK)
+    @Status(StatusFilter.Status.OK)
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
-    public void logout(@Context GraphManager manager, @PathParam("graph") String graph,
+    public void logout(@Context GraphManager manager,
+                       @PathParam("graph") String graph,
                       @HeaderParam(HttpHeaders.AUTHORIZATION) String auth) {
        E.checkArgument(StringUtils.isNotEmpty(auth),
                        "Request header Authorization must not be null");
        LOG.debug("Graph [{}] user logout: {}", graph, auth);

        if (!auth.startsWith(AuthenticationFilter.BEARER_TOKEN_PREFIX)) {
-            throw new BadRequestException("Only HTTP Bearer authentication is supported");
+            throw new BadRequestException(
+                  "Only HTTP Bearer authentication is supported");
        }

-        String token = auth.substring(AuthenticationFilter.BEARER_TOKEN_PREFIX.length());
+        String token = auth.substring(AuthenticationFilter.BEARER_TOKEN_PREFIX
+                                                          .length());
+
        manager.authManager().logoutUser(token);
    }

    @GET
    @Timed
    @Path("verify")
-    @Status(Status.OK)
+    @Status(StatusFilter.Status.OK)
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
-    public String verifyToken(@Context GraphManager manager, @PathParam("graph") String graph,
-                              @HeaderParam(HttpHeaders.AUTHORIZATION) String token) {
+    public String verifyToken(@Context GraphManager manager,
+                              @PathParam("graph") String graph,
+                              @HeaderParam(HttpHeaders.AUTHORIZATION)
+                              String token) {
        E.checkArgument(StringUtils.isNotEmpty(token),
                        "Request header Authorization must not be null");
        LOG.debug("Graph [{}] get user: {}", graph, token);

        if (!token.startsWith(AuthenticationFilter.BEARER_TOKEN_PREFIX)) {
-            throw new BadRequestException("Only HTTP Bearer authentication is supported");
+            throw new BadRequestException(
+                      "Only HTTP Bearer authentication is supported");
        }

-        token = token.substring(AuthenticationFilter.BEARER_TOKEN_PREFIX.length());
+        token = token.substring(AuthenticationFilter.BEARER_TOKEN_PREFIX
+                                                    .length());
        UserWithRole userWithRole = manager.authManager().validateUser(token);

        HugeGraph g = graph(manager, graph);
@ -134,7 +146,8 @@ public class LoginAPI extends API {

        @Override
        public void checkCreate(boolean isBatch) {
-            E.checkArgument(!StringUtils.isEmpty(this.name), "The name of user can't be null");
+            E.checkArgument(!StringUtils.isEmpty(this.name),
+                            "The name of user can't be null");
            E.checkArgument(!StringUtils.isEmpty(this.password),
                            "The password of user can't be null");
        }
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/ProjectAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/ProjectAPI.java
@ -1,71 +1,72 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.auth;
+package com.baidu.hugegraph.api.auth;

 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.auth.AuthManager;
-import org.apache.hugegraph.auth.HugeProject;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.define.Checkable;
-import org.apache.hugegraph.exception.NotFoundException;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.StatusFilter;
+import com.baidu.hugegraph.auth.AuthManager;
+import com.baidu.hugegraph.auth.HugeProject;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.define.Checkable;
+import com.baidu.hugegraph.exception.NotFoundException;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/auth/projects")
@Singleton
-@Tag(name = "ProjectAPI")
 public class ProjectAPI extends API {

-    private static final Logger LOG = Log.logger(ProjectAPI.class);
+    private static final Logger LOG = Log.logger(RestServer.class);
    private static final String ACTION_ADD_GRAPH = "add_graph";
    private static final String ACTION_REMOVE_GRAPH = "remove_graph";

    @POST
    @Timed
-    @Status(Status.CREATED)
+    @StatusFilter.Status(StatusFilter.Status.CREATED)
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    public String create(@Context GraphManager manager,
@ -175,7 +176,6 @@ public class ProjectAPI extends API {
            throw new IllegalArgumentException("Invalid project id: " + id);
        }
    }
-
    public static boolean isAddGraph(String action) {
        return ACTION_ADD_GRAPH.equals(action);
    }
@ -267,6 +267,6 @@ public class ProjectAPI extends API {
                            this.description != null,
                            "Must specify 'graphs' or 'description' " +
                            "field that need to be updated");
+            }
        }
-    }
 }
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/TargetAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/TargetAPI.java
@ -1,61 +1,62 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.auth;
+package com.baidu.hugegraph.api.auth;

 import java.util.List;
 import java.util.Map;

-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.auth.HugeTarget;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.define.Checkable;
-import org.apache.hugegraph.exception.NotFoundException;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.JsonUtil;
-import org.apache.hugegraph.util.Log;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.StatusFilter.Status;
+import com.baidu.hugegraph.auth.HugeTarget;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.define.Checkable;
+import com.baidu.hugegraph.exception.NotFoundException;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.JsonUtil;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/auth/targets")
@Singleton
-@Tag(name = "TargetAPI")
 public class TargetAPI extends API {

-    private static final Logger LOG = Log.logger(TargetAPI.class);
+    private static final Logger LOG = Log.logger(RestServer.class);

    @POST
    @Timed
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/UserAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/auth/UserAPI.java
@ -1,63 +1,64 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.auth;
+package com.baidu.hugegraph.api.auth;

 import java.util.List;

+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+
 import org.apache.commons.lang3.StringUtils;
-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.auth.HugeUser;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.backend.id.IdGenerator;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.define.Checkable;
-import org.apache.hugegraph.exception.NotFoundException;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
-import org.apache.hugegraph.util.StringEncoding;
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.StatusFilter.Status;
+import com.baidu.hugegraph.auth.HugeUser;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.backend.id.IdGenerator;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.define.Checkable;
+import com.baidu.hugegraph.exception.NotFoundException;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.Log;
+import com.baidu.hugegraph.util.StringEncoding;
 import com.codahale.metrics.annotation.Timed;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/auth/users")
@Singleton
-@Tag(name = "UserAPI")
 public class UserAPI extends API {

-    private static final Logger LOG = Log.logger(UserAPI.class);
+    private static final Logger LOG = Log.logger(RestServer.class);

    @POST
    @Timed
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/AuthenticationFilter.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/AuthenticationFilter.java
@ -1,65 +1,59 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.filter;
-
-import static org.apache.hugegraph.config.ServerOptions.WHITE_IP_STATUS;
+package com.baidu.hugegraph.api.filter;

 import java.io.IOException;
 import java.security.Principal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import java.util.Set;

+import javax.annotation.Priority;
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.NotAuthorizedException;
+import javax.ws.rs.Priorities;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.PreMatching;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
+import javax.ws.rs.ext.Provider;
 import javax.xml.bind.DatatypeConverter;

-import org.apache.hugegraph.auth.HugeAuthenticator;
-import org.apache.hugegraph.auth.HugeAuthenticator.RequiredPerm;
-import org.apache.hugegraph.auth.HugeAuthenticator.RolePerm;
-import org.apache.hugegraph.auth.HugeAuthenticator.User;
-import org.apache.hugegraph.auth.RolePermission;
-import org.apache.hugegraph.config.HugeConfig;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.tinkerpop.gremlin.server.auth.AuthenticationException;
 import org.glassfish.grizzly.http.server.Request;
 import org.glassfish.grizzly.utils.Charsets;
-import org.gridkit.jvmtool.cmd.AntPathMatcher;
 import org.slf4j.Logger;

-import com.alipay.remoting.util.StringUtils;
-import com.google.common.collect.ImmutableSet;
-
-import jakarta.annotation.Priority;
-import jakarta.ws.rs.BadRequestException;
-import jakarta.ws.rs.ForbiddenException;
-import jakarta.ws.rs.NotAuthorizedException;
-import jakarta.ws.rs.Priorities;
-import jakarta.ws.rs.container.ContainerRequestContext;
-import jakarta.ws.rs.container.ContainerRequestFilter;
-import jakarta.ws.rs.container.PreMatching;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.HttpHeaders;
-import jakarta.ws.rs.core.SecurityContext;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.ext.Provider;
+import com.baidu.hugegraph.auth.HugeAuthenticator;
+import com.baidu.hugegraph.auth.HugeAuthenticator.RequiredPerm;
+import com.baidu.hugegraph.auth.HugeAuthenticator.RolePerm;
+import com.baidu.hugegraph.auth.HugeAuthenticator.User;
+import com.baidu.hugegraph.auth.RolePermission;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.Log;
+import com.google.common.collect.ImmutableList;

@Provider
@PreMatching
@ -71,30 +65,20 @@ public class AuthenticationFilter implements ContainerRequestFilter {

    private static final Logger LOG = Log.logger(AuthenticationFilter.class);

-    private static final AntPathMatcher MATCHER = new AntPathMatcher();
-    private static final Set<String> FIXED_WHITE_API_SET = ImmutableSet.of(
-            "versions",
-            "openapi.json"
+    private static final List<String> WHITE_API_LIST = ImmutableList.of(
+            "auth/login",
+            "versions"
    );
-    /** Remove auth/login API from whitelist */
-    private static final Set<String> FLEXIBLE_WHITE_API_SET = ImmutableSet.of();
-
-    private static Boolean enabledWhiteIpCheck;
-    private static final String STRING_WHITE_IP_LIST = "whiteiplist";
-    private static final String STRING_ENABLE = "enable";

    @Context
-    private jakarta.inject.Provider<GraphManager> managerProvider;
+    private javax.inject.Provider<GraphManager> managerProvider;

    @Context
-    private jakarta.inject.Provider<Request> requestProvider;
-
-    @Context
-    private jakarta.inject.Provider<HugeConfig> configProvider;
+    private javax.inject.Provider<Request> requestProvider;

    @Override
    public void filter(ContainerRequestContext context) throws IOException {
-        if (isWhiteAPI(context)) {
+        if (AuthenticationFilter.isWhiteAPI(context)) {
            return;
        }
        User user = this.authenticate(context);
@ -107,7 +91,7 @@ public class AuthenticationFilter implements ContainerRequestFilter {
        E.checkState(manager != null, "Context GraphManager is absent");

        if (!manager.requireAuthentication()) {
-            // Return anonymous user with an admin role if disable authentication
+            // Return anonymous user with admin role if disable authentication
            return User.ANONYMOUS;
        }

@ -120,47 +104,32 @@ public class AuthenticationFilter implements ContainerRequestFilter {
            path = request.getRequestURI();
        }

-        // Check whiteIp
-        if (enabledWhiteIpCheck == null) {
-            String whiteIpStatus = this.configProvider.get().get(WHITE_IP_STATUS);
-            enabledWhiteIpCheck = Objects.equals(whiteIpStatus, STRING_ENABLE);
-        }
-
-        if (enabledWhiteIpCheck && request != null) {
-            peer = request.getRemoteAddr() + ":" + request.getRemotePort();
-            path = request.getRequestURI();
-
-            String remoteIp = request.getRemoteAddr();
-            Set<String> whiteIpList = manager.authManager().listWhiteIPs();
-            boolean whiteIpEnabled = manager.authManager().getWhiteIpStatus();
-            if (!path.contains(STRING_WHITE_IP_LIST) && whiteIpEnabled &&
-                !whiteIpList.contains(remoteIp)) {
-                throw new ForbiddenException(String.format("Remote ip '%s' is not permitted",
-                                                           remoteIp));
-            }
-        }
-
        Map<String, String> credentials = new HashMap<>();
        // Extract authentication credentials
        String auth = context.getHeaderString(HttpHeaders.AUTHORIZATION);
        if (auth == null) {
-            throw new NotAuthorizedException("Authentication credentials are required",
-                                             "Missing authentication credentials");
+            throw new NotAuthorizedException(
+                      "Authentication credentials are required",
+                      "Missing authentication credentials");
        }

        if (auth.startsWith(BASIC_AUTH_PREFIX)) {
            auth = auth.substring(BASIC_AUTH_PREFIX.length());
-            auth = new String(DatatypeConverter.parseBase64Binary(auth), Charsets.ASCII_CHARSET);
+            auth = new String(DatatypeConverter.parseBase64Binary(auth),
+                              Charsets.ASCII_CHARSET);
            String[] values = auth.split(":");
            if (values.length != 2) {
-                throw new BadRequestException("Invalid syntax for username and password");
+                throw new BadRequestException(
+                          "Invalid syntax for username and password");
            }

            final String username = values[0];
            final String password = values[1];

-            if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
-                throw new BadRequestException("Invalid syntax for username and password");
+            if (StringUtils.isEmpty(username) ||
+                StringUtils.isEmpty(password)) {
+                throw new BadRequestException(
+                          "Invalid syntax for username and password");
            }

            credentials.put(HugeAuthenticator.KEY_USERNAME, username);
@ -169,7 +138,8 @@ public class AuthenticationFilter implements ContainerRequestFilter {
            String token = auth.substring(BEARER_TOKEN_PREFIX.length());
            credentials.put(HugeAuthenticator.KEY_TOKEN, token);
        } else {
-            throw new BadRequestException("Only HTTP Basic or Bearer authentication is supported");
+            throw new BadRequestException(
+                      "Only HTTP Basic or Bearer authentication is supported");
        }

        credentials.put(HugeAuthenticator.KEY_ADDRESS, peer);
@ -179,7 +149,8 @@ public class AuthenticationFilter implements ContainerRequestFilter {
        try {
            return manager.authenticate(credentials);
        } catch (AuthenticationException e) {
-            throw new NotAuthorizedException("Authentication failed", e.getMessage());
+            throw new NotAuthorizedException("Authentication failed",
+                                             e.getMessage());
        }
    }

@ -243,7 +214,7 @@ public class AuthenticationFilter implements ContainerRequestFilter {
                requiredPerm = RequiredPerm.fromPermission(required);

                /*
-                 * Replace owner value (it may be a variable) if the permission
+                 * Replace owner value(it may be a variable) if the permission
                 * format like: "$owner=$graph $action=vertex_write"
                 */
                String owner = requiredPerm.owner();
@ -259,7 +230,8 @@ public class AuthenticationFilter implements ContainerRequestFilter {

            if (LOG.isDebugEnabled()) {
                LOG.debug("Verify permission {} {} for user '{}' with role {}",
-                          requiredPerm.action().string(), requiredPerm.resourceObject(),
+                          requiredPerm.action().string(),
+                          requiredPerm.resourceObject(),
                          this.user.username(), this.user.role());
            }

@ -268,8 +240,9 @@ public class AuthenticationFilter implements ContainerRequestFilter {

            if (!valid && LOG.isInfoEnabled() &&
                !required.equals(HugeAuthenticator.USER_ADMIN)) {
-                LOG.info("User '{}' is denied to {} {}", this.user.username(),
-                         requiredPerm.action().string(), requiredPerm.resourceObject());
+                LOG.info("User '{}' is denied to {} {}",
+                         this.user.username(), requiredPerm.action().string(),
+                         requiredPerm.resourceObject());
            }
            return valid;
        }
@ -307,12 +280,12 @@ public class AuthenticationFilter implements ContainerRequestFilter {

    public static boolean isWhiteAPI(ContainerRequestContext context) {
        String path = context.getUriInfo().getPath();
-        if (FIXED_WHITE_API_SET.contains(path)) {
-            return true;
-        }

-        for (String whiteApi : FLEXIBLE_WHITE_API_SET) {
-            if (MATCHER.match(whiteApi, path)) {
+        E.checkArgument(StringUtils.isNotEmpty(path),
+                        "Invalid request uri '%s'", path);
+
+        for (String whiteApi : WHITE_API_LIST) {
+            if (path.endsWith(whiteApi)) {
                return true;
            }
        }
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/CompressInterceptor.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/CompressInterceptor.java
@ -1,21 +1,23 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.filter;
+package com.baidu.hugegraph.api.filter;

 import java.io.IOException;
 import java.io.OutputStream;
@ -24,33 +26,34 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.zip.GZIPOutputStream;

-import org.apache.hugegraph.api.filter.CompressInterceptor.Compress;
-import org.apache.hugegraph.util.Log;
+import javax.inject.Singleton;
+import javax.ws.rs.NameBinding;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.Provider;
+import javax.ws.rs.ext.WriterInterceptor;
+import javax.ws.rs.ext.WriterInterceptorContext;
+
 import org.slf4j.Logger;

-import jakarta.inject.Singleton;
-import jakarta.ws.rs.NameBinding;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.ext.Provider;
-import jakarta.ws.rs.ext.WriterInterceptor;
-import jakarta.ws.rs.ext.WriterInterceptorContext;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.util.Log;

@Provider
@Singleton
-@Compress
+@CompressInterceptor.Compress
 public class CompressInterceptor implements WriterInterceptor {

    public static final String GZIP = "gzip";

-    private static final Logger LOG = Log.logger(CompressInterceptor.class);
+    private static final Logger LOG = Log.logger(RestServer.class);

    // Set compress output buffer size to 4KB (about 40~600 vertices)
    public static final int BUFFER_SIZE = 1024 * 4;

    @Override
    public void aroundWriteTo(WriterInterceptorContext context)
-            throws IOException, WebApplicationException {
+                              throws IOException, WebApplicationException {
        // If there is no annotation(like exception), we don't compress it
        if (context.getAnnotations().length > 0) {
            try {
@ -69,14 +72,14 @@ public class CompressInterceptor implements WriterInterceptor {
    }

    private void compress(WriterInterceptorContext context)
-            throws IOException {
+                          throws IOException {
        // Get compress info from the @Compress annotation
        final Compress compression = getCompressAnnotation(context);
        final String encoding = compression.value();
        final int buffer = compression.buffer();

        // Update header
-        MultivaluedMap<String, Object> headers = context.getHeaders();
+        MultivaluedMap<String,Object> headers = context.getHeaders();
        headers.remove("Content-Length");
        headers.add("Content-Encoding", encoding);

@ -103,9 +106,7 @@ public class CompressInterceptor implements WriterInterceptor {
    @NameBinding
    @Retention(RetentionPolicy.RUNTIME)
    public @interface Compress {
-
        String value() default GZIP;
-
        int buffer() default BUFFER_SIZE;
    }
 }
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/DecompressInterceptor.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/DecompressInterceptor.java
@ -1,32 +1,34 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.filter;
+package com.baidu.hugegraph.api.filter;

 import java.io.IOException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.zip.GZIPInputStream;

-import jakarta.inject.Singleton;
-import jakarta.ws.rs.NameBinding;
-import jakarta.ws.rs.ext.Provider;
-import jakarta.ws.rs.ext.ReaderInterceptor;
-import jakarta.ws.rs.ext.ReaderInterceptorContext;
+import javax.inject.Singleton;
+import javax.ws.rs.NameBinding;
+import javax.ws.rs.ext.Provider;
+import javax.ws.rs.ext.ReaderInterceptor;
+import javax.ws.rs.ext.ReaderInterceptorContext;

@Provider
@Singleton
@ -37,7 +39,7 @@ public class DecompressInterceptor implements ReaderInterceptor {

    @Override
    public Object aroundReadFrom(ReaderInterceptorContext context)
-            throws IOException {
+                                 throws IOException {
        // NOTE: Currently we just support GZIP
        String encoding = context.getHeaders().getFirst("Content-Encoding");
        if (!GZIP.equalsIgnoreCase(encoding)) {
@ -47,10 +49,10 @@ public class DecompressInterceptor implements ReaderInterceptor {
        return context.proceed();
    }

+
    @NameBinding
    @Retention(RetentionPolicy.RUNTIME)
    public @interface Decompress {
-
        String value() default GZIP;
    }
 }
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/ExceptionFilter.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/ExceptionFilter.java
@ -1,58 +1,58 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.filter;
+package com.baidu.hugegraph.api.filter;

 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;

+import javax.annotation.security.RolesAllowed;
+import javax.inject.Singleton;
 import javax.json.Json;
 import javax.json.JsonArrayBuilder;
 import javax.json.JsonObjectBuilder;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;

 import org.apache.commons.lang3.StringUtils;
-import org.apache.hugegraph.HugeException;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.config.HugeConfig;
-import org.apache.hugegraph.config.ServerOptions;
-import org.apache.hugegraph.exception.HugeGremlinException;
-import org.apache.hugegraph.exception.NotFoundException;
 import org.glassfish.hk2.api.MultiException;

+import com.baidu.hugegraph.HugeException;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.config.HugeConfig;
+import com.baidu.hugegraph.config.ServerOptions;
+import com.baidu.hugegraph.exception.HugeGremlinException;
+import com.baidu.hugegraph.exception.NotFoundException;
 import com.codahale.metrics.annotation.Timed;
 import com.google.common.collect.ImmutableMap;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.ext.ExceptionMapper;
-import jakarta.ws.rs.ext.Provider;
-
 public class ExceptionFilter {

    private static final int BAD_REQUEST_ERROR =
@ -67,7 +67,7 @@ public class ExceptionFilter {
        private static boolean forcedTrace = false;

        @Context
-        private jakarta.inject.Provider<HugeConfig> configProvider;
+        private javax.inject.Provider<HugeConfig> configProvider;

        protected boolean trace() {
            if (forcedTrace) {
@ -83,7 +83,6 @@ public class ExceptionFilter {

    @Path("exception/trace")
    @Singleton
-    @Tag(name = "TracedExceptionAPI")
    public static class TracedExceptionAPI extends API {

        @GET
@ -107,8 +106,8 @@ public class ExceptionFilter {

    @Provider
    public static class HugeExceptionMapper
-            extends TracedExceptionMapper
-            implements ExceptionMapper<HugeException> {
+                  extends TracedExceptionMapper
+                  implements ExceptionMapper<HugeException> {

        @Override
        public Response toResponse(HugeException exception) {
@ -121,8 +120,8 @@ public class ExceptionFilter {

    @Provider
    public static class IllegalArgumentExceptionMapper
-            extends TracedExceptionMapper
-            implements ExceptionMapper<IllegalArgumentException> {
+                  extends TracedExceptionMapper
+                  implements ExceptionMapper<IllegalArgumentException> {

        @Override
        public Response toResponse(IllegalArgumentException exception) {
@ -135,8 +134,8 @@ public class ExceptionFilter {

    @Provider
    public static class NotFoundExceptionMapper
-            extends TracedExceptionMapper
-            implements ExceptionMapper<NotFoundException> {
+                  extends TracedExceptionMapper
+                  implements ExceptionMapper<NotFoundException> {

        @Override
        public Response toResponse(NotFoundException exception) {
@ -149,8 +148,8 @@ public class ExceptionFilter {

    @Provider
    public static class NoSuchElementExceptionMapper
-            extends TracedExceptionMapper
-            implements ExceptionMapper<NoSuchElementException> {
+                  extends TracedExceptionMapper
+                  implements ExceptionMapper<NoSuchElementException> {

        @Override
        public Response toResponse(NoSuchElementException exception) {
@ -163,8 +162,8 @@ public class ExceptionFilter {

    @Provider
    public static class WebApplicationExceptionMapper
-            extends TracedExceptionMapper
-            implements ExceptionMapper<WebApplicationException> {
+                  extends TracedExceptionMapper
+                  implements ExceptionMapper<WebApplicationException> {

        @Override
        public Response toResponse(WebApplicationException exception) {
@ -189,8 +188,8 @@ public class ExceptionFilter {

    @Provider
    public static class HugeGremlinExceptionMapper
-            extends TracedExceptionMapper
-            implements ExceptionMapper<HugeGremlinException> {
+                  extends TracedExceptionMapper
+                  implements ExceptionMapper<HugeGremlinException> {

        @Override
        public Response toResponse(HugeGremlinException exception) {
@ -204,7 +203,7 @@ public class ExceptionFilter {

    @Provider
    public static class AssertionErrorMapper extends TracedExceptionMapper
-            implements ExceptionMapper<AssertionError> {
+                  implements ExceptionMapper<AssertionError> {

        @Override
        public Response toResponse(AssertionError exception) {
@ -217,7 +216,7 @@ public class ExceptionFilter {

    @Provider
    public static class UnknownExceptionMapper extends TracedExceptionMapper
-            implements ExceptionMapper<Throwable> {
+                  implements ExceptionMapper<Throwable> {

        @Override
        public Response toResponse(Throwable exception) {
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/LoadDetectFilter.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/LoadDetectFilter.java
@ -1,43 +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
+ * 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.
+ * 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 org.apache.hugegraph.api.filter;
+package com.baidu.hugegraph.api.filter;

 import java.util.List;
 import java.util.Set;

-import org.apache.hugegraph.config.HugeConfig;
-import org.apache.hugegraph.config.ServerOptions;
-import org.apache.hugegraph.define.WorkLoad;
-import org.apache.hugegraph.util.Bytes;
-import org.apache.hugegraph.util.E;
+import javax.inject.Singleton;
+import javax.ws.rs.ServiceUnavailableException;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.PreMatching;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.PathSegment;
+import javax.ws.rs.ext.Provider;

+import com.baidu.hugegraph.config.HugeConfig;
+import com.baidu.hugegraph.config.ServerOptions;
+import com.baidu.hugegraph.define.WorkLoad;
+import com.baidu.hugegraph.util.Bytes;
+import com.baidu.hugegraph.util.E;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.RateLimiter;

-import jakarta.inject.Singleton;
-import jakarta.ws.rs.ServiceUnavailableException;
-import jakarta.ws.rs.container.ContainerRequestContext;
-import jakarta.ws.rs.container.ContainerRequestFilter;
-import jakarta.ws.rs.container.PreMatching;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.PathSegment;
-import jakarta.ws.rs.ext.Provider;
-
@Provider
@Singleton
@PreMatching
@ -52,12 +53,12 @@ public class LoadDetectFilter implements ContainerRequestFilter {

    // Call gc every 30+ seconds if memory is low and request frequently
    private static final RateLimiter GC_RATE_LIMITER =
-            RateLimiter.create(1.0 / 30);
+                         RateLimiter.create(1.0 / 30);

    @Context
-    private jakarta.inject.Provider<HugeConfig> configProvider;
+    private javax.inject.Provider<HugeConfig> configProvider;
    @Context
-    private jakarta.inject.Provider<WorkLoad> loadProvider;
+    private javax.inject.Provider<WorkLoad> loadProvider;

    @Override
    public void filter(ContainerRequestContext context) {
@ -72,9 +73,9 @@ public class LoadDetectFilter implements ContainerRequestFilter {
        // There will be a thread doesn't work, dedicated to statistics
        if (load.incrementAndGet() >= maxWorkerThreads) {
            throw new ServiceUnavailableException(String.format(
-                    "The server is too busy to process the request, " +
-                    "you can config %s to adjust it or try again later",
-                    ServerOptions.MAX_WORKER_THREADS.name()));
+                      "The server is too busy to process the request, " +
+                      "you can config %s to adjust it or try again later",
+                      ServerOptions.MAX_WORKER_THREADS.name()));
        }

        long minFreeMemory = config.get(ServerOptions.MIN_FREE_MEMORY);
@ -85,17 +86,17 @@ public class LoadDetectFilter implements ContainerRequestFilter {
        if (presumableFreeMem < minFreeMemory) {
            gcIfNeeded();
            throw new ServiceUnavailableException(String.format(
-                    "The server available memory %s(MB) is below than " +
-                    "threshold %s(MB) and can't process the request, " +
-                    "you can config %s to adjust it or try again later",
-                    presumableFreeMem, minFreeMemory,
-                    ServerOptions.MIN_FREE_MEMORY.name()));
+                      "The server available memory %s(MB) is below than " +
+                      "threshold %s(MB) and can't process the request, " +
+                      "you can config %s to adjust it or try again later",
+                      presumableFreeMem, minFreeMemory,
+                      ServerOptions.MIN_FREE_MEMORY.name()));
        }
    }

    public static boolean isWhiteAPI(ContainerRequestContext context) {
        List<PathSegment> segments = context.getUriInfo().getPathSegments();
-        E.checkArgument(!segments.isEmpty(), "Invalid request uri '%s'",
+        E.checkArgument(segments.size() > 0, "Invalid request uri '%s'",
                        context.getUriInfo().getPath());
        String rootPath = segments.get(0).getPath();
        return WHITE_API_LIST.contains(rootPath);
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/LoadReleaseFilter.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/LoadReleaseFilter.java
@ -0,0 +1,48 @@
+/*
+ * 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.filter;
+
+import javax.inject.Singleton;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.ext.Provider;
+
+import com.baidu.hugegraph.define.WorkLoad;
+
+@Provider
+@Singleton
+public class LoadReleaseFilter implements ContainerResponseFilter {
+
+    @Context
+    private javax.inject.Provider<WorkLoad> loadProvider;
+
+    @Override
+    public void filter(ContainerRequestContext requestContext,
+                       ContainerResponseContext responseContext) {
+        if (LoadDetectFilter.isWhiteAPI(requestContext)) {
+            return;
+        }
+
+        WorkLoad load = this.loadProvider.get();
+        load.decrementAndGet();
+    }
+}
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/StatusFilter.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/StatusFilter.java
@ -1,32 +1,34 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.filter;
+package com.baidu.hugegraph.api.filter;

 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

-import jakarta.ws.rs.NameBinding;
-import jakarta.ws.rs.container.ContainerRequestContext;
-import jakarta.ws.rs.container.ContainerResponseContext;
-import jakarta.ws.rs.container.ContainerResponseFilter;
-import jakarta.ws.rs.ext.Provider;
+import javax.ws.rs.NameBinding;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.ext.Provider;

@Provider
 public class StatusFilter implements ContainerResponseFilter {
@ -34,7 +36,7 @@ public class StatusFilter implements ContainerResponseFilter {
    @Override
    public void filter(ContainerRequestContext requestContext,
                       ContainerResponseContext responseContext)
-            throws IOException {
+                       throws IOException {
        if (responseContext.getStatus() == 200) {
            for (Annotation i : responseContext.getEntityAnnotations()) {
                if (i instanceof Status) {
@ -48,7 +50,6 @@ public class StatusFilter implements ContainerResponseFilter {
    @NameBinding
    @Retention(RetentionPolicy.RUNTIME)
    public @interface Status {
-
        int OK = 200;
        int CREATED = 201;
        int ACCEPTED = 202;
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/BatchAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/BatchAPI.java
@ -1,41 +1,43 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.graph;
+package com.baidu.hugegraph.api.graph;

 import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicInteger;

-import org.apache.hugegraph.HugeException;
-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.config.HugeConfig;
-import org.apache.hugegraph.config.ServerOptions;
-import org.apache.hugegraph.define.Checkable;
-import org.apache.hugegraph.define.UpdateStrategy;
-import org.apache.hugegraph.metrics.MetricsUtil;
-import org.apache.hugegraph.server.RestServer;
-import org.apache.hugegraph.structure.HugeElement;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
 import org.apache.tinkerpop.gremlin.structure.Element;
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeException;
+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.config.HugeConfig;
+import com.baidu.hugegraph.config.ServerOptions;
+import com.baidu.hugegraph.define.Checkable;
+import com.baidu.hugegraph.define.UpdateStrategy;
+import com.baidu.hugegraph.metrics.MetricsUtil;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.structure.HugeElement;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.Meter;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@ -45,40 +47,41 @@ public class BatchAPI extends API {
    private static final Logger LOG = Log.logger(BatchAPI.class);

    // NOTE: VertexAPI and EdgeAPI should share a counter
-    private static final AtomicInteger BATCH_WRITE_THREADS = new AtomicInteger(0);
+    private static final AtomicInteger batchWriteThreads = new AtomicInteger(0);

    static {
        MetricsUtil.registerGauge(RestServer.class, "batch-write-threads",
-                                  BATCH_WRITE_THREADS::intValue);
+                                  () -> batchWriteThreads.intValue());
    }

    private final Meter batchMeter;

    public BatchAPI() {
-        this.batchMeter = MetricsUtil.registerMeter(this.getClass(), "batch-commit");
+        this.batchMeter = MetricsUtil.registerMeter(this.getClass(),
+                                                    "batch-commit");
    }

    public <R> R commit(HugeConfig config, HugeGraph g, int size,
                        Callable<R> callable) {
        int maxWriteThreads = config.get(ServerOptions.MAX_WRITE_THREADS);
-        int writingThreads = BATCH_WRITE_THREADS.incrementAndGet();
+        int writingThreads = batchWriteThreads.incrementAndGet();
        if (writingThreads > maxWriteThreads) {
-            BATCH_WRITE_THREADS.decrementAndGet();
+            batchWriteThreads.decrementAndGet();
            throw new HugeException("The rest server is too busy to write");
        }

-        LOG.debug("The batch writing threads is {}", BATCH_WRITE_THREADS);
+        LOG.debug("The batch writing threads is {}", batchWriteThreads);
        try {
            R result = commit(g, callable);
            this.batchMeter.mark(size);
            return result;
        } finally {
-            BATCH_WRITE_THREADS.decrementAndGet();
+            batchWriteThreads.decrementAndGet();
        }
    }

    @JsonIgnoreProperties(value = {"type"})
-    protected abstract static class JsonElement implements Checkable {
+    protected static abstract class JsonElement implements Checkable {

        @JsonProperty("id")
        public Object id;
@ -98,7 +101,8 @@ public class BatchAPI extends API {
        protected abstract Object[] properties();
    }

-    protected void updateExistElement(JsonElement oldElement, JsonElement newElement,
+    protected void updateExistElement(JsonElement oldElement,
+                                      JsonElement newElement,
                                      Map<String, UpdateStrategy> strategies) {
        if (oldElement == null) {
            return;
@ -111,8 +115,8 @@ public class BatchAPI extends API {
            if (oldElement.properties.get(key) != null &&
                newElement.properties.get(key) != null) {
                Object value = updateStrategy.checkAndUpdateProperty(
-                        oldElement.properties.get(key),
-                        newElement.properties.get(key));
+                               oldElement.properties.get(key),
+                               newElement.properties.get(key));
                newElement.properties.put(key, value);
            } else if (oldElement.properties.get(key) != null &&
                       newElement.properties.get(key) == null) {
@ -122,7 +126,9 @@ public class BatchAPI extends API {
        }
    }

-    protected void updateExistElement(HugeGraph g, Element oldElement, JsonElement newElement,
+    protected void updateExistElement(HugeGraph g,
+                                      Element oldElement,
+                                      JsonElement newElement,
                                      Map<String, UpdateStrategy> strategies) {
        if (oldElement == null) {
            return;
@ -135,8 +141,8 @@ public class BatchAPI extends API {
            if (oldElement.property(key).isPresent() &&
                newElement.properties.get(key) != null) {
                Object value = updateStrategy.checkAndUpdateProperty(
-                        oldElement.property(key).value(),
-                        newElement.properties.get(key));
+                               oldElement.property(key).value(),
+                               newElement.properties.get(key));
                value = g.propertyKey(key).validValueOrThrow(value);
                newElement.properties.put(key, value);
            } else if (oldElement.property(key).isPresent() &&
@ -147,7 +153,8 @@ public class BatchAPI extends API {
        }
    }

-    protected static void updateProperties(HugeElement element, JsonElement jsonElement,
+    protected static void updateProperties(HugeElement element,
+                                           JsonElement jsonElement,
                                           boolean append) {
        for (Map.Entry<String, Object> e : jsonElement.properties.entrySet()) {
            String key = e.getKey();
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/EdgeAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/EdgeAPI.java
@ -1,21 +1,23 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.graph;
+package com.baidu.hugegraph.api.graph;

 import java.util.ArrayList;
 import java.util.HashMap;
@ -24,29 +26,20 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;

-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.CompressInterceptor.Compress;
-import org.apache.hugegraph.api.filter.DecompressInterceptor.Decompress;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.backend.id.EdgeId;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.backend.query.ConditionQuery;
-import org.apache.hugegraph.config.HugeConfig;
-import org.apache.hugegraph.config.ServerOptions;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.define.UpdateStrategy;
-import org.apache.hugegraph.exception.NotFoundException;
-import org.apache.hugegraph.schema.EdgeLabel;
-import org.apache.hugegraph.schema.PropertyKey;
-import org.apache.hugegraph.schema.VertexLabel;
-import org.apache.hugegraph.structure.HugeEdge;
-import org.apache.hugegraph.structure.HugeVertex;
-import org.apache.hugegraph.traversal.optimize.QueryHolder;
-import org.apache.hugegraph.traversal.optimize.TraversalUtil;
-import org.apache.hugegraph.type.define.Directions;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Edge;
@ -54,27 +47,34 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.util.function.TriFunction;
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.CompressInterceptor.Compress;
+import com.baidu.hugegraph.api.filter.DecompressInterceptor.Decompress;
+import com.baidu.hugegraph.api.filter.StatusFilter.Status;
+import com.baidu.hugegraph.backend.id.EdgeId;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.backend.query.ConditionQuery;
+import com.baidu.hugegraph.config.HugeConfig;
+import com.baidu.hugegraph.config.ServerOptions;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.define.UpdateStrategy;
+import com.baidu.hugegraph.exception.NotFoundException;
+import com.baidu.hugegraph.schema.EdgeLabel;
+import com.baidu.hugegraph.schema.PropertyKey;
+import com.baidu.hugegraph.schema.VertexLabel;
+import com.baidu.hugegraph.structure.HugeEdge;
+import com.baidu.hugegraph.structure.HugeVertex;
+import com.baidu.hugegraph.traversal.optimize.QueryHolder;
+import com.baidu.hugegraph.traversal.optimize.TraversalUtil;
+import com.baidu.hugegraph.type.define.Directions;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.fasterxml.jackson.annotation.JsonProperty;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/graph/edges")
@Singleton
-@Tag(name = "EdgeAPI")
 public class EdgeAPI extends BatchAPI {

    private static final Logger LOG = Log.logger(EdgeAPI.class);
@ -98,15 +98,18 @@ public class EdgeAPI extends BatchAPI {
             * NOTE: If the vertex id is correct but label not match with id,
             * we allow to create it here
             */
-            vertexLabel(g, jsonEdge.sourceLabel, "Invalid source vertex label '%s'");
-            vertexLabel(g, jsonEdge.targetLabel, "Invalid target vertex label '%s'");
+            vertexLabel(g, jsonEdge.sourceLabel,
+                        "Invalid source vertex label '%s'");
+            vertexLabel(g, jsonEdge.targetLabel,
+                        "Invalid target vertex label '%s'");
        }

        Vertex srcVertex = getVertex(g, jsonEdge.source, jsonEdge.sourceLabel);
        Vertex tgtVertex = getVertex(g, jsonEdge.target, jsonEdge.targetLabel);

        Edge edge = commit(g, () -> {
-            return srcVertex.addEdge(jsonEdge.label, tgtVertex, jsonEdge.properties());
+            return srcVertex.addEdge(jsonEdge.label, tgtVertex,
+                                     jsonEdge.properties());
        });

        return manager.serializer(g).writeEdge(edge);
@ -133,7 +136,7 @@ public class EdgeAPI extends BatchAPI {
        HugeGraph g = graph(manager, graph);

        TriFunction<HugeGraph, Object, String, Vertex> getVertex =
-                checkVertex ? EdgeAPI::getVertex : EdgeAPI::newVertex;
+                    checkVertex ? EdgeAPI::getVertex : EdgeAPI::newVertex;

        return this.commit(config, g, jsonEdges.size(), () -> {
            List<Id> ids = new ArrayList<>(jsonEdges.size());
@ -143,9 +146,12 @@ public class EdgeAPI extends BatchAPI {
                 * then the label is correct and not matched id,
                 * it will be allowed currently
                 */
-                Vertex srcVertex = getVertex.apply(g, jsonEdge.source, jsonEdge.sourceLabel);
-                Vertex tgtVertex = getVertex.apply(g, jsonEdge.target, jsonEdge.targetLabel);
-                Edge edge = srcVertex.addEdge(jsonEdge.label, tgtVertex, jsonEdge.properties());
+                Vertex srcVertex = getVertex.apply(g, jsonEdge.source,
+                                                   jsonEdge.sourceLabel);
+                Vertex tgtVertex = getVertex.apply(g, jsonEdge.target,
+                                                   jsonEdge.targetLabel);
+                Edge edge = srcVertex.addEdge(jsonEdge.label, tgtVertex,
+                                              jsonEdge.properties());
                ids.add((Id) edge.id());
            }
            return manager.serializer(g).writeIds(ids);
@ -173,16 +179,16 @@ public class EdgeAPI extends BatchAPI {

        HugeGraph g = graph(manager, graph);
        Map<Id, JsonEdge> map = new HashMap<>(req.jsonEdges.size());
-        TriFunction<HugeGraph, Object, String, Vertex> getVertex = req.checkVertex ?
-                                                                   EdgeAPI::getVertex :
-                                                                   EdgeAPI::newVertex;
+        TriFunction<HugeGraph, Object, String, Vertex> getVertex =
+                    req.checkVertex ? EdgeAPI::getVertex : EdgeAPI::newVertex;

-        return this.commit(config, g, 0, () -> {
+        return this.commit(config, g, map.size(), () -> {
            // 1.Put all newEdges' properties into map (combine first)
            req.jsonEdges.forEach(newEdge -> {
                Id newEdgeId = getEdgeId(graph(manager, graph), newEdge);
                JsonEdge oldEdge = map.get(newEdgeId);
-                this.updateExistElement(oldEdge, newEdge, req.updateStrategies);
+                this.updateExistElement(oldEdge, newEdge,
+                                        req.updateStrategies);
                map.put(newEdgeId, newEdge);
            });

@ -191,15 +197,19 @@ public class EdgeAPI extends BatchAPI {
            Iterator<Edge> oldEdges = g.edges(ids);
            oldEdges.forEachRemaining(oldEdge -> {
                JsonEdge newEdge = map.get(oldEdge.id());
-                this.updateExistElement(g, oldEdge, newEdge, req.updateStrategies);
+                this.updateExistElement(g, oldEdge, newEdge,
+                                        req.updateStrategies);
            });

            // 3.Add all finalEdges
            List<Edge> edges = new ArrayList<>(map.size());
            map.values().forEach(finalEdge -> {
-                Vertex srcVertex = getVertex.apply(g, finalEdge.source, finalEdge.sourceLabel);
-                Vertex tgtVertex = getVertex.apply(g, finalEdge.target, finalEdge.targetLabel);
-                edges.add(srcVertex.addEdge(finalEdge.label, tgtVertex, finalEdge.properties()));
+                Vertex srcVertex = getVertex.apply(g, finalEdge.source,
+                                                   finalEdge.sourceLabel);
+                Vertex tgtVertex = getVertex.apply(g, finalEdge.target,
+                                                   finalEdge.targetLabel);
+                edges.add(srcVertex.addEdge(finalEdge.label, tgtVertex,
+                                            finalEdge.properties()));
            });

            // If return ids, the ids.size() maybe different with the origins'
@ -243,6 +253,7 @@ public class EdgeAPI extends BatchAPI {
        }

        commit(g, () -> updateProperties(edge, jsonEdge, append));
+
        return manager.serializer(g).writeEdge(edge);
    }

@ -270,7 +281,8 @@ public class EdgeAPI extends BatchAPI {
        Map<String, Object> props = parseProperties(properties);
        if (page != null) {
            E.checkArgument(offset == 0,
-                            "Not support querying edges based on paging and offset together");
+                            "Not support querying edges based on paging " +
+                            "and offset together");
        }

        Id vertex = VertexAPI.checkAndParseVertexId(vertexId);
@ -309,7 +321,8 @@ public class EdgeAPI extends BatchAPI {
        if (page == null) {
            traversal = traversal.range(offset, offset + limit);
        } else {
-            traversal = traversal.has(QueryHolder.SYSPROP_PAGE, page).limit(limit);
+            traversal = traversal.has(QueryHolder.SYSPROP_PAGE, page)
+                                 .limit(limit);
        }

        try {
@ -359,38 +372,42 @@ public class EdgeAPI extends BatchAPI {
                g.removeEdge(label, id);
            } catch (NotFoundException e) {
                throw new IllegalArgumentException(String.format(
-                        "No such edge with id: '%s', %s", id, e));
+                          "No such edge with id: '%s', %s", id, e));
            } catch (NoSuchElementException e) {
                throw new IllegalArgumentException(String.format(
-                        "No such edge with id: '%s'", id));
+                          "No such edge with id: '%s'", id));
            }
        });
    }

-    private static void checkBatchSize(HugeConfig config, List<JsonEdge> edges) {
+    private static void checkBatchSize(HugeConfig config,
+                                       List<JsonEdge> edges) {
        int max = config.get(ServerOptions.MAX_EDGES_PER_BATCH);
        if (edges.size() > max) {
            throw new IllegalArgumentException(String.format(
-                    "Too many edges for one time post, " +
-                    "the maximum number is '%s'", max));
+                      "Too many edges for one time post, " +
+                      "the maximum number is '%s'", max));
        }
-        if (edges.isEmpty()) {
-            throw new IllegalArgumentException("The number of edges can't be 0");
+        if (edges.size() == 0) {
+            throw new IllegalArgumentException(
+                      "The number of edges can't be 0");
        }
    }

-    private static Vertex getVertex(HugeGraph graph, Object id, String label) {
+    private static Vertex getVertex(HugeGraph graph,
+                                    Object id, String label) {
        HugeVertex vertex;
        try {
            vertex = (HugeVertex) graph.vertices(id).next();
        } catch (NoSuchElementException e) {
-            throw new IllegalArgumentException(String.format("Invalid vertex id '%s'", id));
+            throw new IllegalArgumentException(String.format(
+                      "Invalid vertex id '%s'", id));
        }
        if (label != null && !vertex.label().equals(label)) {
            throw new IllegalArgumentException(String.format(
-                    "The label of vertex '%s' is unmatched, users expect " +
-                    "label '%s', actual label stored is '%s'",
-                    id, label, vertex.label()));
+                      "The label of vertex '%s' is unmatched, users expect " +
+                      "label '%s', actual label stored is '%s'",
+                      id, label, vertex.label()));
        }
        // Clone a new vertex to support multi-thread access
        return vertex.copy();
@ -402,7 +419,8 @@ public class EdgeAPI extends BatchAPI {
        return new HugeVertex(g, idValue, vl);
    }

-    private static VertexLabel vertexLabel(HugeGraph graph, String label, String message) {
+    private static VertexLabel vertexLabel(HugeGraph graph, String label,
+                                           String message) {
        try {
            // NOTE: don't use SchemaManager because it will throw 404
            return graph.vertexLabel(label);
@ -419,8 +437,8 @@ public class EdgeAPI extends BatchAPI {
            return Direction.valueOf(direction);
        } catch (Exception e) {
            throw new IllegalArgumentException(String.format(
-                    "Direction value must be in [OUT, IN, BOTH], " +
-                    "but got '%s'", direction));
+                      "Direction value must be in [OUT, IN, BOTH], " +
+                      "but got '%s'", direction));
        }
    }

@ -435,7 +453,8 @@ public class EdgeAPI extends BatchAPI {
                String sortKey = pk.name();
                Object sortKeyValue = newEdge.properties.get(sortKey);
                E.checkArgument(sortKeyValue != null,
-                                "The value of sort key '%s' can't be null", sortKey);
+                                "The value of sort key '%s' can't be null",
+                                sortKey);
                sortKeyValue = pk.validValueOrThrow(sortKeyValue);
                sortKeyValues.add(sortKeyValue);
            });
@ -445,7 +464,7 @@ public class EdgeAPI extends BatchAPI {
                                   Directions.OUT, labelId, sortKeys,
                                   HugeVertex.getIdValue(newEdge.target));
        if (newEdge.id != null) {
-            E.checkArgument(edgeId.asString().equals(newEdge.id),
+            E.checkArgument(edgeId.equals(newEdge.id),
                            "The ids are different between server and " +
                            "request body ('%s' != '%s'). And note the sort " +
                            "key values should either be null or equal to " +
@ -468,11 +487,14 @@ public class EdgeAPI extends BatchAPI {

        private static void checkUpdate(BatchEdgeRequest req) {
            E.checkArgumentNotNull(req, "BatchEdgeRequest can't be null");
-            E.checkArgumentNotNull(req.jsonEdges, "Parameter 'edges' can't be null");
-            E.checkArgument(req.updateStrategies != null && !req.updateStrategies.isEmpty(),
+            E.checkArgumentNotNull(req.jsonEdges,
+                                   "Parameter 'edges' can't be null");
+            E.checkArgument(req.updateStrategies != null &&
+                            !req.updateStrategies.isEmpty(),
                            "Parameter 'update_strategies' can't be empty");
-            E.checkArgument(req.createIfNotExist,
-                            "Parameter 'create_if_not_exist' dose not support false now");
+            E.checkArgument(req.createIfNotExist == true,
+                            "Parameter 'create_if_not_exist' " +
+                            "dose not support false now");
        }

        @Override
@ -502,11 +524,15 @@ public class EdgeAPI extends BatchAPI {
            E.checkArgumentNotNull(this.source, "Expect source vertex id");
            E.checkArgumentNotNull(this.target, "Expect target vertex id");
            if (isBatch) {
-                E.checkArgumentNotNull(this.sourceLabel, "Expect source vertex label");
-                E.checkArgumentNotNull(this.targetLabel, "Expect target vertex label");
+                E.checkArgumentNotNull(this.sourceLabel,
+                                       "Expect source vertex label");
+                E.checkArgumentNotNull(this.targetLabel,
+                                       "Expect target vertex label");
            } else {
-                E.checkArgument(this.sourceLabel == null && this.targetLabel == null ||
-                                this.sourceLabel != null && this.targetLabel != null,
+                E.checkArgument(this.sourceLabel == null &&
+                                this.targetLabel == null ||
+                                this.sourceLabel != null &&
+                                this.targetLabel != null,
                                "The both source and target vertex label " +
                                "are either passed in, or not passed in");
            }
@ -515,13 +541,15 @@ public class EdgeAPI extends BatchAPI {

        @Override
        public void checkUpdate() {
-            E.checkArgumentNotNull(this.properties, "The properties of edge can't be null");
+            E.checkArgumentNotNull(this.properties,
+                                   "The properties of edge can't be null");

            for (Map.Entry<String, Object> entry : this.properties.entrySet()) {
                String key = entry.getKey();
                Object value = entry.getValue();
                E.checkArgumentNotNull(value, "Not allowed to set value of " +
-                                              "property '%s' to null for edge '%s'", key, this.id);
+                                       "property '%s' to null for edge '%s'",
+                                       key, this.id);
            }
        }

--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/VertexAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/VertexAPI.java
@ -1,21 +1,23 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.graph;
+package com.baidu.hugegraph.api.graph;

 import java.util.ArrayList;
 import java.util.Arrays;
@ -25,55 +27,53 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;

-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.CompressInterceptor.Compress;
-import org.apache.hugegraph.api.filter.DecompressInterceptor.Decompress;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.backend.id.SplicingIdGenerator;
-import org.apache.hugegraph.backend.query.ConditionQuery;
-import org.apache.hugegraph.config.HugeConfig;
-import org.apache.hugegraph.config.ServerOptions;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.define.UpdateStrategy;
-import org.apache.hugegraph.exception.NotFoundException;
-import org.apache.hugegraph.schema.PropertyKey;
-import org.apache.hugegraph.schema.VertexLabel;
-import org.apache.hugegraph.structure.HugeVertex;
-import org.apache.hugegraph.traversal.optimize.QueryHolder;
-import org.apache.hugegraph.traversal.optimize.Text;
-import org.apache.hugegraph.traversal.optimize.TraversalUtil;
-import org.apache.hugegraph.type.define.IdStrategy;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.JsonUtil;
-import org.apache.hugegraph.util.Log;
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.CompressInterceptor.Compress;
+import com.baidu.hugegraph.api.filter.DecompressInterceptor.Decompress;
+import com.baidu.hugegraph.api.filter.StatusFilter.Status;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.backend.id.SplicingIdGenerator;
+import com.baidu.hugegraph.backend.query.ConditionQuery;
+import com.baidu.hugegraph.config.HugeConfig;
+import com.baidu.hugegraph.config.ServerOptions;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.define.UpdateStrategy;
+import com.baidu.hugegraph.exception.NotFoundException;
+import com.baidu.hugegraph.schema.PropertyKey;
+import com.baidu.hugegraph.schema.VertexLabel;
+import com.baidu.hugegraph.structure.HugeVertex;
+import com.baidu.hugegraph.traversal.optimize.QueryHolder;
+import com.baidu.hugegraph.traversal.optimize.Text;
+import com.baidu.hugegraph.traversal.optimize.TraversalUtil;
+import com.baidu.hugegraph.type.define.IdStrategy;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.JsonUtil;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.fasterxml.jackson.annotation.JsonProperty;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/graph/vertices")
@Singleton
-@Tag(name = "VertexAPI")
 public class VertexAPI extends BatchAPI {

    private static final Logger LOG = Log.logger(VertexAPI.class);
@ -125,8 +125,8 @@ public class VertexAPI extends BatchAPI {

    /**
     * Batch update steps like:
-     * 1. Get all newVertices' ID &amp; combine first
-     * 2. Get all oldVertices &amp; update
+     * 1. Get all newVertices' ID & combine first
+     * 2. Get all oldVertices & update
     * 3. Add the final vertex together
     */
    @PUT
@ -148,7 +148,7 @@ public class VertexAPI extends BatchAPI {
        HugeGraph g = graph(manager, graph);
        Map<Id, JsonVertex> map = new HashMap<>(req.jsonVertices.size());

-        return this.commit(config, g, 0, () -> {
+        return this.commit(config, g, map.size(), () -> {
            /*
             * 1.Put all newVertices' properties into map (combine first)
             * - Consider primary-key & user-define ID mode first
@ -156,7 +156,8 @@ public class VertexAPI extends BatchAPI {
            req.jsonVertices.forEach(newVertex -> {
                Id newVertexId = getVertexId(g, newVertex);
                JsonVertex oldVertex = map.get(newVertexId);
-                this.updateExistElement(oldVertex, newVertex, req.updateStrategies);
+                this.updateExistElement(oldVertex, newVertex,
+                                        req.updateStrategies);
                map.put(newVertexId, newVertex);
            });

@ -165,7 +166,8 @@ public class VertexAPI extends BatchAPI {
            Iterator<Vertex> oldVertices = g.vertices(ids);
            oldVertices.forEachRemaining(oldVertex -> {
                JsonVertex newVertex = map.get(oldVertex.id());
-                this.updateExistElement(g, oldVertex, newVertex, req.updateStrategies);
+                this.updateExistElement(g, oldVertex, newVertex,
+                                        req.updateStrategies);
            });

            // 3.Add finalVertices and return them
@ -175,7 +177,8 @@ public class VertexAPI extends BatchAPI {
            });

            // If return ids, the ids.size() maybe different with the origins'
-            return manager.serializer(g).writeVertices(vertices.iterator(), false);
+            return manager.serializer(g)
+                          .writeVertices(vertices.iterator(), false);
        });
    }

@ -235,7 +238,8 @@ public class VertexAPI extends BatchAPI {
        Map<String, Object> props = parseProperties(properties);
        if (page != null) {
            E.checkArgument(offset == 0,
-                            "Not support querying vertices based on paging and offset together");
+                            "Not support querying vertices based on paging " +
+                            "and offset together");
        }

        HugeGraph g = graph(manager, graph);
@ -261,11 +265,13 @@ public class VertexAPI extends BatchAPI {
        if (page == null) {
            traversal = traversal.range(offset, offset + limit);
        } else {
-            traversal = traversal.has(QueryHolder.SYSPROP_PAGE, page).limit(limit);
+            traversal = traversal.has(QueryHolder.SYSPROP_PAGE, page)
+                                 .limit(limit);
        }

        try {
-            return manager.serializer(g).writeVertices(traversal, page != null);
+            return manager.serializer(g).writeVertices(traversal,
+                                                       page != null);
        } finally {
            if (g.tx().isOpen()) {
                g.tx().close();
@ -313,10 +319,10 @@ public class VertexAPI extends BatchAPI {
                g.removeVertex(label, id);
            } catch (NotFoundException e) {
                throw new IllegalArgumentException(String.format(
-                        "No such vertex with id: '%s', %s", id, e));
+                          "No such vertex with id: '%s', %s", id, e));
            } catch (NoSuchElementException e) {
                throw new IllegalArgumentException(String.format(
-                        "No such vertex with id: '%s'", id));
+                          "No such vertex with id: '%s'", id));
            }
        });
    }
@ -334,19 +340,22 @@ public class VertexAPI extends BatchAPI {
            return uuid ? Text.uuid((String) id) : HugeVertex.getIdValue(id);
        } catch (Exception e) {
            throw new IllegalArgumentException(String.format(
-                    "The vertex id must be formatted as Number/String/UUID" +
-                    ", but got '%s'", idValue));
+                      "The vertex id must be formatted as Number/String/UUID" +
+                      ", but got '%s'", idValue));
        }
    }

-    private static void checkBatchSize(HugeConfig config, List<JsonVertex> vertices) {
+    private static void checkBatchSize(HugeConfig config,
+                                       List<JsonVertex> vertices) {
        int max = config.get(ServerOptions.MAX_VERTICES_PER_BATCH);
        if (vertices.size() > max) {
            throw new IllegalArgumentException(String.format(
-                    "Too many vertices for one time post, the maximum number is '%s'", max));
+                      "Too many vertices for one time post, " +
+                      "the maximum number is '%s'", max));
        }
-        if (vertices.isEmpty()) {
-            throw new IllegalArgumentException("The number of vertices can't be 0");
+        if (vertices.size() == 0) {
+            throw new IllegalArgumentException(
+                      "The number of vertices can't be 0");
        }
    }

@ -364,7 +373,8 @@ public class VertexAPI extends BatchAPI {
                String propertyKey = g.propertyKey(pkId).name();
                Object propertyValue = vertex.properties.get(propertyKey);
                E.checkArgument(propertyValue != null,
-                                "The value of primary key '%s' can't be null", propertyKey);
+                                "The value of primary key '%s' can't be null",
+                                propertyKey);
                pkValues.add(propertyValue);
            }

@ -392,9 +402,10 @@ public class VertexAPI extends BatchAPI {
            E.checkArgumentNotNull(req, "BatchVertexRequest can't be null");
            E.checkArgumentNotNull(req.jsonVertices,
                                   "Parameter 'vertices' can't be null");
-            E.checkArgument(req.updateStrategies != null && !req.updateStrategies.isEmpty(),
+            E.checkArgument(req.updateStrategies != null &&
+                            !req.updateStrategies.isEmpty(),
                            "Parameter 'update_strategies' can't be empty");
-            E.checkArgument(req.createIfNotExist,
+            E.checkArgument(req.createIfNotExist == true,
                            "Parameter 'create_if_not_exist' " +
                            "dose not support false now");
        }
@ -417,13 +428,14 @@ public class VertexAPI extends BatchAPI {

        @Override
        public void checkUpdate() {
-            E.checkArgumentNotNull(this.properties, "The properties of vertex can't be null");
+            E.checkArgumentNotNull(this.properties,
+                                   "The properties of vertex can't be null");

            for (Map.Entry<String, Object> e : this.properties.entrySet()) {
                String key = e.getKey();
                Object value = e.getValue();
                E.checkArgumentNotNull(value, "Not allowed to set value of " +
-                                              "property '%s' to null for vertex '%s'",
+                                       "property '%s' to null for vertex '%s'",
                                       key, this.id);
            }
        }
@ -450,7 +462,6 @@ public class VertexAPI extends BatchAPI {
            }
            if (this.id != null) {
                newProps[appendIndex++] = T.id;
-                // Note: Here we keep value++ to avoid code trap
                newProps[appendIndex++] = this.id;
            }
            return newProps;
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinAPI.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinAPI.java
@ -0,0 +1,164 @@
+/*
+ * 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 java.util.Map;
+import java.util.Set;
+
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.CompressInterceptor.Compress;
+import com.baidu.hugegraph.config.HugeConfig;
+import com.baidu.hugegraph.config.ServerOptions;
+import com.baidu.hugegraph.exception.HugeGremlinException;
+import com.baidu.hugegraph.metrics.MetricsUtil;
+import com.codahale.metrics.Histogram;
+import com.codahale.metrics.annotation.Timed;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+
+@Path("gremlin")
+@Singleton
+public class GremlinAPI extends API {
+
+    private static final Histogram gremlinInputHistogram =
+            MetricsUtil.registerHistogram(GremlinAPI.class, "gremlin-input");
+    private static final Histogram gremlinOutputHistogram =
+            MetricsUtil.registerHistogram(GremlinAPI.class, "gremlin-output");
+
+    private static final Set<String> FORBIDDEN_REQUEST_EXCEPTIONS =
+            ImmutableSet.of("java.lang.SecurityException",
+                            "javax.ws.rs.ForbiddenException");
+    private static final Set<String> BAD_REQUEST_EXCEPTIONS = ImmutableSet.of(
+            "java.lang.IllegalArgumentException",
+            "java.util.concurrent.TimeoutException",
+            "groovy.lang.",
+            "org.codehaus.",
+            "com.baidu.hugegraph."
+    );
+
+    @Context
+    private javax.inject.Provider<HugeConfig> configProvider;
+
+    private GremlinClient client;
+
+    public GremlinClient client() {
+        if (this.client != null) {
+            return this.client;
+        }
+        HugeConfig config = this.configProvider.get();
+        String url = config.get(ServerOptions.GREMLIN_SERVER_URL);
+        int timeout = config.get(ServerOptions.GREMLIN_SERVER_TIMEOUT) * 1000;
+        int maxRoutes = config.get(ServerOptions.GREMLIN_SERVER_MAX_ROUTE);
+        this.client = new GremlinClient(url, timeout, maxRoutes, maxRoutes);
+        return this.client;
+    }
+
+    @POST
+    @Timed
+    @Compress
+    @Consumes(APPLICATION_JSON)
+    @Produces(APPLICATION_JSON_WITH_CHARSET)
+    public Response post(@Context HugeConfig conf,
+                         @Context HttpHeaders headers,
+                         String request) {
+        /* The following code is reserved for forwarding request */
+        // context.getRequestDispatcher(location).forward(request, response);
+        // return Response.seeOther(UriBuilder.fromUri(location).build())
+        // .build();
+        // Response.temporaryRedirect(UriBuilder.fromUri(location).build())
+        // .build();
+        String auth = headers.getHeaderString(HttpHeaders.AUTHORIZATION);
+        Response response = this.client().doPostRequest(auth, request);
+        gremlinInputHistogram.update(request.length());
+        gremlinOutputHistogram.update(response.getLength());
+        return transformResponseIfNeeded(response);
+    }
+
+    @GET
+    @Timed
+    @Compress(buffer=(1024 * 40))
+    @Produces(APPLICATION_JSON_WITH_CHARSET)
+    public Response get(@Context HugeConfig conf,
+                        @Context HttpHeaders headers,
+                        @Context UriInfo uriInfo) {
+        String auth = headers.getHeaderString(HttpHeaders.AUTHORIZATION);
+        String query = uriInfo.getRequestUri().getRawQuery();
+        MultivaluedMap<String, String> params = uriInfo.getQueryParameters();
+        Response response = this.client().doGetRequest(auth, params);
+        gremlinInputHistogram.update(query.length());
+        gremlinOutputHistogram.update(response.getLength());
+        return transformResponseIfNeeded(response);
+    }
+
+    private static Response transformResponseIfNeeded(Response response) {
+        MediaType mediaType = response.getMediaType();
+        if (mediaType != null) {
+            // Append charset
+            assert MediaType.APPLICATION_JSON_TYPE.equals(mediaType);
+            response.getHeaders().putSingle(HttpHeaders.CONTENT_TYPE,
+                                            mediaType.withCharset(CHARSET));
+        }
+
+        Response.StatusType status = response.getStatusInfo();
+        if (status.getStatusCode() < 400) {
+            // No need to transform if normal response without error
+            return response;
+        }
+
+        if (mediaType == null || !JSON.equals(mediaType.getSubtype())) {
+            String message = response.readEntity(String.class);
+            throw new HugeGremlinException(status.getStatusCode(),
+                                           ImmutableMap.of("message", message));
+        }
+
+        @SuppressWarnings("unchecked")
+        Map<String, Object> map = response.readEntity(Map.class);
+        String exClassName = (String) map.get("Exception-Class");
+        if (FORBIDDEN_REQUEST_EXCEPTIONS.contains(exClassName)) {
+            status = Response.Status.FORBIDDEN;
+        } else if (matchBadRequestException(exClassName)) {
+            status = Response.Status.BAD_REQUEST;
+        }
+        throw new HugeGremlinException(status.getStatusCode(), map);
+    }
+
+    private static boolean matchBadRequestException(String exClass) {
+        if (exClass == null) {
+            return false;
+        }
+        if (BAD_REQUEST_EXCEPTIONS.contains(exClass)) {
+            return true;
+        }
+        return BAD_REQUEST_EXCEPTIONS.stream().anyMatch(exClass::startsWith);
+    }
+}
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinClient.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinClient.java
@ -0,0 +1,78 @@
+/*
+ * 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 java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+
+import com.baidu.hugegraph.api.filter.CompressInterceptor;
+import com.baidu.hugegraph.rest.AbstractRestClient;
+import com.baidu.hugegraph.testutil.Whitebox;
+import com.baidu.hugegraph.util.E;
+
+public class GremlinClient extends AbstractRestClient {
+
+    private final WebTarget webTarget;
+
+    public GremlinClient(String url, int timeout,
+                         int maxTotal, int maxPerRoute) {
+        super(url, timeout, maxTotal, maxPerRoute);
+        this.webTarget = Whitebox.getInternalState(this, "target");
+        E.checkNotNull(this.webTarget, "target");
+    }
+
+    @Override
+    protected void checkStatus(Response response, Response.Status... statuses) {
+        // pass
+    }
+
+    public Response doPostRequest(String auth, String req) {
+        Entity<?> body = Entity.entity(req, MediaType.APPLICATION_JSON);
+        return this.webTarget.request()
+                             .header(HttpHeaders.AUTHORIZATION, auth)
+                             .accept(MediaType.APPLICATION_JSON)
+                             .acceptEncoding(CompressInterceptor.GZIP)
+                             .post(body);
+    }
+
+    public Response doGetRequest(String auth,
+                                 MultivaluedMap<String, String> params) {
+        WebTarget target = this.webTarget;
+        for (Map.Entry<String, List<String>> entry : params.entrySet()) {
+            E.checkArgument(entry.getValue().size() == 1,
+                            "Invalid query param '%s', can only accept " +
+                            "one value, but got %s",
+                            entry.getKey(), entry.getValue());
+            target = target.queryParam(entry.getKey(), entry.getValue().get(0));
+        }
+        return target.request()
+                     .header(HttpHeaders.AUTHORIZATION, auth)
+                     .accept(MediaType.APPLICATION_JSON)
+                     .acceptEncoding(CompressInterceptor.GZIP)
+                     .get();
+    }
+}
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/ComputerAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/ComputerAPI.java
@ -1,57 +1,57 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.job;
+package com.baidu.hugegraph.api.job;

 import java.util.Map;

-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.RedirectFilter;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.job.ComputerJob;
-import org.apache.hugegraph.job.JobBuilder;
-import org.apache.hugegraph.task.HugeTask;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.JsonUtil;
-import org.apache.hugegraph.util.Log;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.StatusFilter.Status;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.job.ComputerJob;
+import com.baidu.hugegraph.job.JobBuilder;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.task.HugeTask;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.JsonUtil;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.google.common.collect.ImmutableMap;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.NotFoundException;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/jobs/computer")
@Singleton
-@Tag(name = "ComputerAPI")
 public class ComputerAPI extends API {

-    private static final Logger LOG = Log.logger(ComputerAPI.class);
+    private static final Logger LOG = Log.logger(RestServer.class);

    @POST
    @Timed
@ -59,7 +59,6 @@ public class ComputerAPI extends API {
    @Status(Status.CREATED)
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
-    @RedirectFilter.RedirectMasterRole
    public Map<String, Id> post(@Context GraphManager manager,
                                @PathParam("graph") String graph,
                                @PathParam("name") String computer,
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/GremlinAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/GremlinAPI.java
@ -1,21 +1,23 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.job;
+package com.baidu.hugegraph.api.job;

 import java.nio.ByteBuffer;
 import java.nio.charset.CharacterCodingException;
@ -25,47 +27,45 @@ import java.nio.charset.CodingErrorAction;
 import java.util.HashMap;
 import java.util.Map;

-import org.apache.hugegraph.HugeException;
-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.RedirectFilter;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.define.Checkable;
-import org.apache.hugegraph.job.GremlinJob;
-import org.apache.hugegraph.job.JobBuilder;
-import org.apache.hugegraph.metrics.MetricsUtil;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.JsonUtil;
-import org.apache.hugegraph.util.Log;
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeException;
+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.StatusFilter.Status;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.define.Checkable;
+import com.baidu.hugegraph.job.GremlinJob;
+import com.baidu.hugegraph.job.JobBuilder;
+import com.baidu.hugegraph.metrics.MetricsUtil;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.JsonUtil;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.Histogram;
 import com.codahale.metrics.annotation.Timed;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/jobs/gremlin")
@Singleton
-@Tag(name = "GremlinAPI")
 public class GremlinAPI extends API {

-    private static final Logger LOG = Log.logger(GremlinAPI.class);
+    private static final Logger LOG = Log.logger(RestServer.class);

    private static final int MAX_NAME_LENGTH = 256;

-    private static final Histogram GREMLIN_JOB_INPUT_HISTOGRAM =
+    private static final Histogram gremlinJobInputHistogram =
            MetricsUtil.registerHistogram(GremlinAPI.class, "gremlin-input");

    @POST
@ -74,13 +74,12 @@ public class GremlinAPI extends API {
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin", "$owner=$graph $action=gremlin_execute"})
-    @RedirectFilter.RedirectMasterRole
    public Map<String, Id> post(@Context GraphManager manager,
                                @PathParam("graph") String graph,
                                GremlinRequest request) {
        LOG.debug("Graph [{}] schedule gremlin job: {}", graph, request);
        checkCreatingBody(request);
-        GREMLIN_JOB_INPUT_HISTOGRAM.update(request.gremlin.length());
+        gremlinJobInputHistogram.update(request.gremlin.length());

        HugeGraph g = graph(manager, graph);
        request.aliase(graph, "graph");
@ -152,6 +151,9 @@ public class GremlinAPI extends API {
                return firstLine;
            }

+            /*
+             * Reference https://stackoverflow.com/questions/3576754/truncating-strings-by-bytes
+             */
            CharsetDecoder decoder = charset.newDecoder();
            decoder.onMalformedInput(CodingErrorAction.IGNORE);
            decoder.reset();
@ -190,11 +192,11 @@ public class GremlinAPI extends API {
            String gremlin = (String) map.get("gremlin");
            @SuppressWarnings("unchecked")
            Map<String, Object> bindings = (Map<String, Object>)
-                    map.get("bindings");
+                                           map.get("bindings");
            String language = (String) map.get("language");
            @SuppressWarnings("unchecked")
            Map<String, String> aliases = (Map<String, String>)
-                    map.get("aliases");
+                                          map.get("aliases");

            GremlinRequest request = new GremlinRequest();
            request.gremlin(gremlin);
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/RebuildAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/RebuildAPI.java
@ -1,48 +1,47 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.job;
+package com.baidu.hugegraph.api.job;

 import java.util.Map;

-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.RedirectFilter;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.util.Log;
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Singleton;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.StatusFilter.Status;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.google.common.collect.ImmutableMap;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/jobs/rebuild")
@Singleton
-@Tag(name = "RebuildAPI")
 public class RebuildAPI extends API {

    private static final Logger LOG = Log.logger(RebuildAPI.class);
@ -53,7 +52,6 @@ public class RebuildAPI extends API {
    @Status(Status.ACCEPTED)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin", "$owner=$graph $action=index_write"})
-    @RedirectFilter.RedirectMasterRole
    public Map<String, Id> vertexLabelRebuild(@Context GraphManager manager,
                                              @PathParam("graph") String graph,
                                              @PathParam("name") String name) {
@ -70,7 +68,6 @@ public class RebuildAPI extends API {
    @Status(Status.ACCEPTED)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin", "$owner=$graph $action=index_write"})
-    @RedirectFilter.RedirectMasterRole
    public Map<String, Id> edgeLabelRebuild(@Context GraphManager manager,
                                            @PathParam("graph") String graph,
                                            @PathParam("name") String name) {
@ -87,7 +84,6 @@ public class RebuildAPI extends API {
    @Status(Status.ACCEPTED)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin", "$owner=$graph $action=index_write"})
-    @RedirectFilter.RedirectMasterRole
    public Map<String, Id> indexLabelRebuild(@Context GraphManager manager,
                                             @PathParam("graph") String graph,
                                             @PathParam("name") String name) {
@ -97,4 +93,4 @@ public class RebuildAPI extends API {
        return ImmutableMap.of("task_id",
                               g.schema().indexLabel(name).rebuild());
    }
-}
+}
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/TaskAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/TaskAPI.java
@ -1,21 +1,23 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.job;
+package com.baidu.hugegraph.api.job;

 import java.util.ArrayList;
 import java.util.Arrays;
@ -24,43 +26,41 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

+import javax.inject.Singleton;
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.NotSupportedException;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+
 import org.apache.groovy.util.Maps;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.RedirectFilter;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.backend.id.IdGenerator;
-import org.apache.hugegraph.backend.page.PageInfo;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.task.HugeTask;
-import org.apache.hugegraph.task.TaskScheduler;
-import org.apache.hugegraph.task.TaskStatus;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
 import org.slf4j.Logger;

+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.StatusFilter.Status;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.backend.id.IdGenerator;
+import com.baidu.hugegraph.backend.page.PageInfo;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.task.HugeTask;
+import com.baidu.hugegraph.task.TaskScheduler;
+import com.baidu.hugegraph.task.TaskStatus;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.BadRequestException;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.NotSupportedException;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/tasks")
@Singleton
-@Tag(name = "TaskAPI")
 public class TaskAPI extends API {

-    private static final Logger LOG = Log.logger(TaskAPI.class);
+    private static final Logger LOG = Log.logger(RestServer.class);
    private static final long NO_LIMIT = -1L;

    public static final String ACTION_CANCEL = "cancel";
@ -92,7 +92,7 @@ public class TaskAPI extends API {
            // Set limit to NO_LIMIT to ignore limit when query task by ids
            limit = NO_LIMIT;
            List<Id> idList = ids.stream().map(IdGenerator::of)
-                                 .collect(Collectors.toList());
+                                          .collect(Collectors.toList());
            iter = scheduler.tasks(idList);
        } else {
            if (status == null) {
@ -133,15 +133,13 @@ public class TaskAPI extends API {
    @DELETE
    @Timed
    @Path("{id}")
-    @RedirectFilter.RedirectMasterRole
    public void delete(@Context GraphManager manager,
                       @PathParam("graph") String graph,
-                       @PathParam("id") long id,
-                       @DefaultValue("false") @QueryParam("force") boolean force) {
+                       @PathParam("id") long id) {
        LOG.debug("Graph [{}] delete task: {}", graph, id);

        TaskScheduler scheduler = graph(manager, graph).taskScheduler();
-        HugeTask<?> task = scheduler.delete(IdGenerator.of(id), force);
+        HugeTask<?> task = scheduler.delete(IdGenerator.of(id));
        E.checkArgument(task != null, "There is no task with id '%s'", id);
    }

@ -150,7 +148,6 @@ public class TaskAPI extends API {
    @Path("{id}")
    @Status(Status.ACCEPTED)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
-    @RedirectFilter.RedirectMasterRole
    public Map<String, Object> update(@Context GraphManager manager,
                                      @PathParam("graph") String graph,
                                      @PathParam("id") long id,
@ -159,7 +156,7 @@ public class TaskAPI extends API {

        if (!ACTION_CANCEL.equals(action)) {
            throw new NotSupportedException(String.format(
-                    "Not support action '%s'", action));
+                      "Not support action '%s'", action));
        }

        TaskScheduler scheduler = graph(manager, graph).taskScheduler();
@ -173,17 +170,17 @@ public class TaskAPI extends API {

        assert task.completed() || task.cancelling();
        throw new BadRequestException(String.format(
-                "Can't cancel task '%s' which is completed or cancelling",
-                id));
+                  "Can't cancel task '%s' which is completed or cancelling",
+                  id));
    }

    private static TaskStatus parseStatus(String status) {
        try {
-            return TaskStatus.valueOf(status.toUpperCase());
+            return TaskStatus.valueOf(status);
        } catch (Exception e) {
            throw new IllegalArgumentException(String.format(
-                    "Status value must be in %s, but got '%s'",
-                    Arrays.asList(TaskStatus.values()), status));
+                      "Status value must be in %s, but got '%s'",
+                      Arrays.asList(TaskStatus.values()), status));
        }
    }
-}
+}
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/metrics/MetricsAPI.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/metrics/MetricsAPI.java
@ -0,0 +1,161 @@
+/*
+ * 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.metrics;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Singleton;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+
+import org.slf4j.Logger;
+
+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.backend.store.BackendMetrics;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.metrics.MetricsModule;
+import com.baidu.hugegraph.metrics.ServerReporter;
+import com.baidu.hugegraph.metrics.SystemMetrics;
+import com.baidu.hugegraph.util.InsertionOrderUtil;
+import com.baidu.hugegraph.util.JsonUtil;
+import com.baidu.hugegraph.util.Log;
+import com.codahale.metrics.Metric;
+import com.codahale.metrics.annotation.Timed;
+
+@Singleton
+@Path("metrics")
+public class MetricsAPI extends API {
+
+    private static final Logger LOG = Log.logger(MetricsAPI.class);
+
+    private SystemMetrics systemMetrics;
+
+    static {
+        JsonUtil.registerModule(new MetricsModule(SECONDS, MILLISECONDS, false));
+    }
+
+    public MetricsAPI() {
+        this.systemMetrics = new SystemMetrics();
+    }
+
+    @GET
+    @Timed
+    @Path("system")
+    @Produces(APPLICATION_JSON_WITH_CHARSET)
+    @RolesAllowed({"admin", "$owner= $action=metrics_read"})
+    public String system() {
+        return JsonUtil.toJson(this.systemMetrics.metrics());
+    }
+
+    @GET
+    @Timed
+    @Path("backend")
+    @Produces(APPLICATION_JSON_WITH_CHARSET)
+    @RolesAllowed({"admin", "$owner= $action=metrics_read"})
+    public String backend(@Context GraphManager manager) {
+        Map<String, Map<String, Object>> results = InsertionOrderUtil.newMap();
+        for (String graph : manager.graphs()) {
+            HugeGraph g = manager.graph(graph);
+            Map<String, Object> metrics = InsertionOrderUtil.newMap();
+            metrics.put(BackendMetrics.BACKEND, g.backend());
+            try {
+                metrics.putAll(g.metadata(null, "metrics"));
+            } catch (Throwable e) {
+                metrics.put(BackendMetrics.EXCEPTION, e.toString());
+                LOG.debug("Failed to get backend metrics", e);
+            }
+            results.put(graph, metrics);
+        }
+        return JsonUtil.toJson(results);
+    }
+
+    @GET
+    @Timed
+    @Produces(APPLICATION_JSON_WITH_CHARSET)
+    @RolesAllowed({"admin", "$owner= $action=metrics_read"})
+    public String all() {
+        ServerReporter reporter = ServerReporter.instance();
+        Map<String, Map<String, ? extends Metric>> result = new LinkedHashMap<>();
+        result.put("gauges", reporter.gauges());
+        result.put("counters", reporter.counters());
+        result.put("histograms", reporter.histograms());
+        result.put("meters", reporter.meters());
+        result.put("timers", reporter.timers());
+        return JsonUtil.toJson(result);
+    }
+
+    @GET
+    @Timed
+    @Path("gauges")
+    @Produces(APPLICATION_JSON_WITH_CHARSET)
+    @RolesAllowed({"admin", "$owner= $action=metrics_read"})
+    public String gauges() {
+        ServerReporter reporter = ServerReporter.instance();
+        return JsonUtil.toJson(reporter.gauges());
+    }
+
+    @GET
+    @Timed
+    @Path("counters")
+    @Produces(APPLICATION_JSON_WITH_CHARSET)
+    @RolesAllowed({"admin", "$owner= $action=metrics_read"})
+    public String counters() {
+        ServerReporter reporter = ServerReporter.instance();
+        return JsonUtil.toJson(reporter.counters());
+    }
+
+    @GET
+    @Timed
+    @Path("histograms")
+    @Produces(APPLICATION_JSON_WITH_CHARSET)
+    @RolesAllowed({"admin", "$owner= $action=metrics_read"})
+    public String histograms() {
+        ServerReporter reporter = ServerReporter.instance();
+        return JsonUtil.toJson(reporter.histograms());
+    }
+
+    @GET
+    @Timed
+    @Path("meters")
+    @Produces(APPLICATION_JSON_WITH_CHARSET)
+    @RolesAllowed({"admin", "$owner= $action=metrics_read"})
+    public String meters() {
+        ServerReporter reporter = ServerReporter.instance();
+        return JsonUtil.toJson(reporter.meters());
+    }
+
+    @GET
+    @Timed
+    @Path("timers")
+    @Produces(APPLICATION_JSON_WITH_CHARSET)
+    @RolesAllowed({"admin", "$owner= $action=metrics_read"})
+    public String timers() {
+        ServerReporter reporter = ServerReporter.instance();
+        return JsonUtil.toJson(reporter.timers());
+    }
+}
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/GraphsAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/GraphsAPI.java
@ -1,67 +1,68 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.profile;
+package com.baidu.hugegraph.api.profile;

 import java.io.File;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;

+import javax.annotation.security.RolesAllowed;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.ForbiddenException;
+import javax.ws.rs.GET;
+import javax.ws.rs.NotSupportedException;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.SecurityContext;
+
 import org.apache.commons.lang3.StringUtils;
-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.auth.HugeAuthenticator.RequiredPerm;
-import org.apache.hugegraph.auth.HugePermission;
-import org.apache.hugegraph.config.HugeConfig;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.type.define.GraphMode;
-import org.apache.hugegraph.type.define.GraphReadMode;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.JsonUtil;
-import org.apache.hugegraph.util.Log;
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.auth.HugeAuthenticator.RequiredPerm;
+import com.baidu.hugegraph.auth.HugePermission;
+import com.baidu.hugegraph.config.HugeConfig;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.type.define.GraphMode;
+import com.baidu.hugegraph.type.define.GraphReadMode;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.JsonUtil;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.google.common.collect.ImmutableMap;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.ForbiddenException;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.NotSupportedException;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.SecurityContext;
-
@Path("graphs")
@Singleton
-@Tag(name = "GraphsAPI")
 public class GraphsAPI extends API {

-    private static final Logger LOG = Log.logger(GraphsAPI.class);
+    private static final Logger LOG = Log.logger(RestServer.class);

    private static final String CONFIRM_CLEAR = "I'm sure to delete all data";
    private static final String CONFIRM_DROP = "I'm sure to drop the graph";
@ -106,7 +107,7 @@ public class GraphsAPI extends API {
    @Timed
    @Path("{name}")
    @Produces(APPLICATION_JSON_WITH_CHARSET)
-    @RolesAllowed({"admin"})
+    @RolesAllowed({"admin", "$owner=$name"})
    public void drop(@Context GraphManager manager,
                     @PathParam("name") String name,
                     @QueryParam("confirm_message") String message) {
@ -120,7 +121,7 @@ public class GraphsAPI extends API {
    @POST
    @Timed
    @Path("{name}")
-    @Consumes(TEXT_PLAIN)
+    @Consumes(APPLICATION_JSON_WITH_CHARSET)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin"})
    public Object create(@Context GraphManager manager,
@ -151,10 +152,10 @@ public class GraphsAPI extends API {
        HugeGraph g = graph4admin(manager, name);

        HugeConfig config = (HugeConfig) g.configuration();
-        File file = config.file();
+        File file = config.getFile();
        if (file == null) {
            throw new NotSupportedException("Can't access the api in " +
-                                            "a node which started with non local file config.");
+                      "a node which started with non local file config.");
        }
        return file;
    }
@ -255,9 +256,9 @@ public class GraphsAPI extends API {
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed("admin")
    public Map<String, GraphReadMode> graphReadMode(
-            @Context GraphManager manager,
-            @PathParam("name") String name,
-            GraphReadMode readMode) {
+                                      @Context GraphManager manager,
+                                      @PathParam("name") String name,
+                                      GraphReadMode readMode) {
        LOG.debug("Set graph-read-mode to: '{}' of graph '{}'",
                  readMode, name);

@ -275,8 +276,8 @@ public class GraphsAPI extends API {
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin", "$owner=$name"})
    public Map<String, GraphReadMode> graphReadMode(
-            @Context GraphManager manager,
-            @PathParam("name") String name) {
+                                      @Context GraphManager manager,
+                                      @PathParam("name") String name) {
        LOG.debug("Get graph-read-mode of graph '{}'", name);

        HugeGraph g = graph(manager, name);
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/ProfileAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/ProfileAPI.java
@ -1,21 +1,23 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.profile;
+package com.baidu.hugegraph.api.profile;

 import java.util.ArrayList;
 import java.util.List;
@ -24,39 +26,34 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;

+import javax.inject.Singleton;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+
 import org.apache.commons.lang3.StringUtils;
-import org.apache.hugegraph.config.HugeConfig;
-import org.apache.hugegraph.config.ServerOptions;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.InsertionOrderUtil;
-import org.apache.hugegraph.util.JsonUtil;
-import org.apache.hugegraph.version.CoreVersion;
 import org.apache.tinkerpop.shaded.jackson.annotation.JsonProperty;
-import org.glassfish.jersey.model.Parameter.Source;
 import org.glassfish.jersey.server.model.Parameter;
+import org.glassfish.jersey.server.model.Parameter.Source;
 import org.glassfish.jersey.server.model.Resource;
 import org.glassfish.jersey.server.model.ResourceMethod;

+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.InsertionOrderUtil;
+import com.baidu.hugegraph.util.JsonUtil;
+import com.baidu.hugegraph.version.CoreVersion;
 import com.codahale.metrics.annotation.Timed;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Application;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.MediaType;
-
@Path("/")
@Singleton
-@Tag(name = "ProfileAPI")
 public class ProfileAPI {

    private static final String SERVICE = "hugegraph";
-    private static final String DOC = "https://hugegraph.apache.org/docs/";
-    private static final String API_DOC = DOC + "clients/";
-    private static final String SWAGGER_UI = "/swagger-ui/index.html";
+    private static final String DOC = "https://hugegraph.github.io/hugegraph-doc/";
+    private static final String API_DOC = DOC + "clients/hugegraph-api.html";

    private static String SERVER_PROFILES = null;
    private static String API_PROFILES = null;
@ -64,7 +61,7 @@ public class ProfileAPI {
    @GET
    @Timed
    @Produces(MediaType.APPLICATION_JSON)
-    public String getProfile(@Context HugeConfig conf, @Context Application application) {
+    public String getProfile(@Context Application application) {
        // May init multi times by multi threads, but no effect on the results
        if (SERVER_PROFILES != null) {
            return SERVER_PROFILES;
@ -75,7 +72,6 @@ public class ProfileAPI {
        profiles.put("version", CoreVersion.VERSION.toString());
        profiles.put("doc", DOC);
        profiles.put("api_doc", API_DOC);
-        profiles.put("swagger_ui", conf.get(ServerOptions.REST_SERVER_URL) + SWAGGER_UI);
        Set<String> apis = new TreeSet<>();
        for (Class<?> clazz : application.getClasses()) {
            if (!isAnnotatedPathClass(clazz)) {
@ -153,8 +149,8 @@ public class ProfileAPI {
            categories = this.apis.computeIfAbsent(category.dir,
                                                   k -> new TreeMap<>());
            List<APIProfile> profiles = categories.computeIfAbsent(
-                    category.category,
-                    k -> new ArrayList<>());
+                                                   category.category,
+                                                   k -> new ArrayList<>());
            profiles.add(profile);
        }
    }
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/profile/VersionAPI.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/profile/VersionAPI.java
@ -0,0 +1,51 @@
+/*
+ * 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.profile;
+
+import java.util.Map;
+
+import javax.annotation.security.PermitAll;
+import javax.inject.Singleton;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.version.ApiVersion;
+import com.baidu.hugegraph.version.CoreVersion;
+import com.codahale.metrics.annotation.Timed;
+import com.google.common.collect.ImmutableMap;
+
+@Path("versions")
+@Singleton
+public class VersionAPI extends API {
+
+    @GET
+    @Timed
+    @Produces(APPLICATION_JSON_WITH_CHARSET)
+    @PermitAll
+    public Object list() {
+        Map<String, String> versions = ImmutableMap.of("version", "v1",
+                                       "core", CoreVersion.VERSION.toString(),
+                                       "gremlin", CoreVersion.GREMLIN_VERSION,
+                                       "api", ApiVersion.VERSION.toString());
+        return ImmutableMap.of("versions", versions);
+    }
+}
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/raft/RaftAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/raft/RaftAPI.java
@ -1,61 +1,53 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.raft;
+package com.baidu.hugegraph.api.raft;

-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import org.apache.hugegraph.HugeException;
-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.RedirectFilter;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.backend.store.raft.RaftAddPeerJob;
-import org.apache.hugegraph.backend.store.raft.RaftGroupManager;
-import org.apache.hugegraph.backend.store.raft.RaftRemovePeerJob;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.job.JobBuilder;
-import org.apache.hugegraph.util.DateUtil;
-import org.apache.hugegraph.util.JsonUtil;
-import org.apache.hugegraph.util.Log;
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeException;
+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.StatusFilter.Status;
+import com.baidu.hugegraph.backend.store.raft.RaftGroupManager;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.google.common.collect.ImmutableMap;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/raft")
@Singleton
-@Tag(name = "RaftAPI")
 public class RaftAPI extends API {

    private static final Logger LOG = Log.logger(RaftAPI.class);
@ -152,27 +144,19 @@ public class RaftAPI extends API {
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin"})
-    @RedirectFilter.RedirectMasterRole
-    public Map<String, Id> addPeer(@Context GraphManager manager,
-                                   @PathParam("graph") String graph,
-                                   @QueryParam("group") @DefaultValue("default")
-                                   String group,
-                                   @QueryParam("endpoint") String endpoint) {
+    public Map<String, String> addPeer(@Context GraphManager manager,
+                                       @PathParam("graph") String graph,
+                                       @QueryParam("group")
+                                       @DefaultValue("default")
+                                       String group,
+                                       @QueryParam("endpoint")
+                                       String endpoint) {
        LOG.debug("Graph [{}] prepare to add peer: {}", graph, endpoint);

        HugeGraph g = graph(manager, graph);
        RaftGroupManager raftManager = raftGroupManager(g, group, "add_peer");
-
-        JobBuilder<String> builder = JobBuilder.of(g);
-        String name = String.format("raft-group-[%s]-add-peer-[%s]-at-[%s]",
-                                    raftManager.group(), endpoint,
-                                    DateUtil.now());
-        Map<String, String> inputs = new HashMap<>();
-        inputs.put("endpoint", endpoint);
-        builder.name(name)
-               .input(JsonUtil.toJson(inputs))
-               .job(new RaftAddPeerJob());
-        return ImmutableMap.of("task_id", builder.schedule().id());
+        String peerId = raftManager.addPeer(endpoint);
+        return ImmutableMap.of(raftManager.group(), peerId);
    }

    @POST
@ -182,33 +166,26 @@ public class RaftAPI extends API {
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin"})
-    @RedirectFilter.RedirectMasterRole
-    public Map<String, Id> removePeer(@Context GraphManager manager,
-                                      @PathParam("graph") String graph,
-                                      @QueryParam("group")
-                                      @DefaultValue("default") String group,
-                                      @QueryParam("endpoint") String endpoint) {
+    public Map<String, String> removePeer(@Context GraphManager manager,
+                                          @PathParam("graph") String graph,
+                                          @QueryParam("group")
+                                          @DefaultValue("default")
+                                          String group,
+                                          @QueryParam("endpoint")
+                                          String endpoint) {
        LOG.debug("Graph [{}] prepare to remove peer: {}", graph, endpoint);

        HugeGraph g = graph(manager, graph);
        RaftGroupManager raftManager = raftGroupManager(g, group,
                                                        "remove_peer");
-        JobBuilder<String> builder = JobBuilder.of(g);
-        String name = String.format("raft-group-[%s]-remove-peer-[%s]-at-[%s]",
-                                    raftManager.group(), endpoint,
-                                    DateUtil.now());
-        Map<String, String> inputs = new HashMap<>();
-        inputs.put("endpoint", endpoint);
-        builder.name(name)
-               .input(JsonUtil.toJson(inputs))
-               .job(new RaftRemovePeerJob());
-        return ImmutableMap.of("task_id", builder.schedule().id());
+        String peerId = raftManager.removePeer(endpoint);
+        return ImmutableMap.of(raftManager.group(), peerId);
    }

    private static RaftGroupManager raftGroupManager(HugeGraph graph,
                                                     String group,
                                                     String operation) {
-        RaftGroupManager raftManager = graph.raftGroupManager();
+        RaftGroupManager raftManager = graph.raftGroupManager(group);
        if (raftManager == null) {
            throw new HugeException("Allowed %s operation only when " +
                                    "working on raft mode", operation);
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/EdgeLabelAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/EdgeLabelAPI.java
@ -1,65 +1,63 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.schema;
+package com.baidu.hugegraph.api.schema;

 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;

+import javax.annotation.security.RolesAllowed;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.RedirectFilter;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.define.Checkable;
-import org.apache.hugegraph.schema.EdgeLabel;
-import org.apache.hugegraph.schema.Userdata;
-import org.apache.hugegraph.type.define.Frequency;
-import org.apache.hugegraph.type.define.GraphMode;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.StatusFilter.Status;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.define.Checkable;
+import com.baidu.hugegraph.schema.EdgeLabel;
+import com.baidu.hugegraph.schema.Userdata;
+import com.baidu.hugegraph.type.define.Frequency;
+import com.baidu.hugegraph.type.define.GraphMode;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/schema/edgelabels")
@Singleton
-@Tag(name = "EdgeLabelAPI")
 public class EdgeLabelAPI extends API {

    private static final Logger LOG = Log.logger(EdgeLabelAPI.class);
@ -70,7 +68,6 @@ public class EdgeLabelAPI extends API {
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin", "$owner=$graph $action=edge_label_write"})
-    @RedirectFilter.RedirectMasterRole
    public String create(@Context GraphManager manager,
                         @PathParam("graph") String graph,
                         JsonEdgeLabel jsonEdgeLabel) {
@ -89,7 +86,6 @@ public class EdgeLabelAPI extends API {
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin", "$owner=$graph $action=edge_label_write"})
-    @RedirectFilter.RedirectMasterRole
    public String update(@Context GraphManager manager,
                         @PathParam("graph") String graph,
                         @PathParam("name") String name,
@ -160,7 +156,6 @@ public class EdgeLabelAPI extends API {
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin", "$owner=$graph $action=edge_label_delete"})
-    @RedirectFilter.RedirectMasterRole
    public Map<String, Id> delete(@Context GraphManager manager,
                                  @PathParam("graph") String graph,
                                  @PathParam("name") String name) {
@ -208,7 +203,8 @@ public class EdgeLabelAPI extends API {

        @Override
        public void checkCreate(boolean isBatch) {
-            E.checkArgumentNotNull(this.name, "The name of edge label can't be null");
+            E.checkArgumentNotNull(this.name,
+                                   "The name of edge label can't be null");
        }

        private EdgeLabel.Builder convert2Builder(HugeGraph g) {
@ -265,13 +261,12 @@ public class EdgeLabelAPI extends API {
        @Override
        public String toString() {
            return String.format("JsonEdgeLabel{" +
-                                 "name=%s, sourceLabel=%s, targetLabel=%s, frequency=%s, " +
-                                 "sortKeys=%s, nullableKeys=%s, properties=%s, ttl=%s, " +
-                                 "ttlStartTime=%s}",
-                                 this.name, this.sourceLabel, this.targetLabel,
-                                 this.frequency, Arrays.toString(this.sortKeys),
-                                 Arrays.toString(this.nullableKeys),
-                                 Arrays.toString(this.properties), this.ttl, this.ttlStartTime);
+                   "name=%s, sourceLabel=%s, targetLabel=%s, frequency=%s, " +
+                   "sortKeys=%s, nullableKeys=%s, properties=%s, ttl=%s, " +
+                   "ttlStartTime=%s}",
+                   this.name, this.sourceLabel, this.targetLabel,
+                   this.frequency, this.sortKeys, this.nullableKeys,
+                   this.properties, this.ttl, this.ttlStartTime);
        }
    }
 }
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/IndexLabelAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/IndexLabelAPI.java
@ -1,67 +1,65 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.schema;
+package com.baidu.hugegraph.api.schema;

 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;

+import javax.annotation.security.RolesAllowed;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.RedirectFilter;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.define.Checkable;
-import org.apache.hugegraph.schema.IndexLabel;
-import org.apache.hugegraph.schema.SchemaElement;
-import org.apache.hugegraph.schema.Userdata;
-import org.apache.hugegraph.type.HugeType;
-import org.apache.hugegraph.type.define.GraphMode;
-import org.apache.hugegraph.type.define.IndexType;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.StatusFilter.Status;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.define.Checkable;
+import com.baidu.hugegraph.schema.IndexLabel;
+import com.baidu.hugegraph.schema.SchemaElement;
+import com.baidu.hugegraph.schema.Userdata;
+import com.baidu.hugegraph.type.HugeType;
+import com.baidu.hugegraph.type.define.GraphMode;
+import com.baidu.hugegraph.type.define.IndexType;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/schema/indexlabels")
@Singleton
-@Tag(name = "IndexLabelAPI")
 public class IndexLabelAPI extends API {

    private static final Logger LOG = Log.logger(IndexLabelAPI.class);
@ -72,7 +70,6 @@ public class IndexLabelAPI extends API {
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin", "$owner=$graph $action=index_label_write"})
-    @RedirectFilter.RedirectMasterRole
    public String create(@Context GraphManager manager,
                         @PathParam("graph") String graph,
                         JsonIndexLabel jsonIndexLabel) {
@ -91,7 +88,6 @@ public class IndexLabelAPI extends API {
    @Path("{name}")
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
-    @RedirectFilter.RedirectMasterRole
    public String update(@Context GraphManager manager,
                         @PathParam("graph") String graph,
                         @PathParam("name") String name,
@ -108,8 +104,8 @@ public class IndexLabelAPI extends API {

        HugeGraph g = graph(manager, graph);
        IndexLabel.Builder builder = jsonIndexLabel.convert2Builder(g);
-        IndexLabel indexLabel = append ? builder.append() : builder.eliminate();
-        return manager.serializer(g).writeIndexlabel(mapIndexLabel(indexLabel));
+        IndexLabel IndexLabel = append ? builder.append() : builder.eliminate();
+        return manager.serializer(g).writeIndexlabel(mapIndexLabel(IndexLabel));
    }

    @GET
@ -161,7 +157,6 @@ public class IndexLabelAPI extends API {
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin", "$owner=$graph $action=index_label_delete"})
-    @RedirectFilter.RedirectMasterRole
    public Map<String, Id> delete(@Context GraphManager manager,
                                  @PathParam("graph") String graph,
                                  @PathParam("name") String name) {
@ -291,7 +286,7 @@ public class IndexLabelAPI extends API {
            return String.format("JsonIndexLabel{name=%s, baseType=%s," +
                                 "baseValue=%s, indexType=%s, fields=%s}",
                                 this.name, this.baseType, this.baseValue,
-                                 this.indexType, Arrays.toString(this.fields));
+                                 this.indexType, this.fields);
        }
    }
 }
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/PropertyKeyAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/PropertyKeyAPI.java
@ -1,70 +1,68 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.schema;
+package com.baidu.hugegraph.api.schema;

 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;

+import javax.annotation.security.RolesAllowed;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.RedirectFilter;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.backend.id.IdGenerator;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.define.Checkable;
-import org.apache.hugegraph.schema.PropertyKey;
-import org.apache.hugegraph.schema.SchemaElement;
-import org.apache.hugegraph.schema.Userdata;
-import org.apache.hugegraph.type.define.AggregateType;
-import org.apache.hugegraph.type.define.Cardinality;
-import org.apache.hugegraph.type.define.DataType;
-import org.apache.hugegraph.type.define.GraphMode;
-import org.apache.hugegraph.type.define.WriteType;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.StatusFilter.Status;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.backend.id.IdGenerator;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.define.Checkable;
+import com.baidu.hugegraph.schema.PropertyKey;
+import com.baidu.hugegraph.schema.SchemaElement;
+import com.baidu.hugegraph.schema.Userdata;
+import com.baidu.hugegraph.type.define.AggregateType;
+import com.baidu.hugegraph.type.define.Cardinality;
+import com.baidu.hugegraph.type.define.DataType;
+import com.baidu.hugegraph.type.define.GraphMode;
+import com.baidu.hugegraph.type.define.WriteType;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/schema/propertykeys")
@Singleton
-@Tag(name = "PropertyKeyAPI")
 public class PropertyKeyAPI extends API {

    private static final Logger LOG = Log.logger(PropertyKeyAPI.class);
@ -75,11 +73,11 @@ public class PropertyKeyAPI extends API {
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin", "$owner=$graph $action=property_key_write"})
-    @RedirectFilter.RedirectMasterRole
    public String create(@Context GraphManager manager,
                         @PathParam("graph") String graph,
                         JsonPropertyKey jsonPropertyKey) {
-        LOG.debug("Graph [{}] create property key: {}", graph, jsonPropertyKey);
+        LOG.debug("Graph [{}] create property key: {}",
+                  graph, jsonPropertyKey);
        checkCreatingBody(jsonPropertyKey);

        HugeGraph g = graph(manager, graph);
@ -95,7 +93,6 @@ public class PropertyKeyAPI extends API {
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin", "$owner=$graph $action=property_key_write"})
-    @RedirectFilter.RedirectMasterRole
    public String update(@Context GraphManager manager,
                         @PathParam("graph") String graph,
                         @PathParam("name") String name,
@ -181,7 +178,6 @@ public class PropertyKeyAPI extends API {
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin", "$owner=$graph $action=property_key_delete"})
-    @RedirectFilter.RedirectMasterRole
    public Map<String, Id> delete(@Context GraphManager manager,
                                  @PathParam("graph") String graph,
                                  @PathParam("name") String name) {
@ -270,7 +266,7 @@ public class PropertyKeyAPI extends API {
                                 "writeType=%s, properties=%s}",
                                 this.name, this.cardinality,
                                 this.dataType, this.aggregateType,
-                                 this.writeType, Arrays.toString(this.properties));
+                                 this.writeType, this.properties);
        }
    }
 }
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/SchemaAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/SchemaAPI.java
@ -1,47 +1,47 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.schema;
+package com.baidu.hugegraph.api.schema;

 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.schema.SchemaManager;
-import org.apache.hugegraph.util.Log;
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Singleton;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.schema.SchemaManager;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/schema")
@Singleton
-@Tag(name = "SchemaAPI")
 public class SchemaAPI extends API {

    private static final Logger LOG = Log.logger(SchemaAPI.class);
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/VertexLabelAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/VertexLabelAPI.java
@ -1,65 +1,63 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.schema;
+package com.baidu.hugegraph.api.schema;

 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;

+import javax.annotation.security.RolesAllowed;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.filter.RedirectFilter;
-import org.apache.hugegraph.api.filter.StatusFilter.Status;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.define.Checkable;
-import org.apache.hugegraph.schema.Userdata;
-import org.apache.hugegraph.schema.VertexLabel;
-import org.apache.hugegraph.type.define.GraphMode;
-import org.apache.hugegraph.type.define.IdStrategy;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.filter.StatusFilter.Status;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.define.Checkable;
+import com.baidu.hugegraph.schema.Userdata;
+import com.baidu.hugegraph.schema.VertexLabel;
+import com.baidu.hugegraph.type.define.GraphMode;
+import com.baidu.hugegraph.type.define.IdStrategy;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.security.RolesAllowed;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.PUT;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/schema/vertexlabels")
@Singleton
-@Tag(name = "VertexLabelAPI")
 public class VertexLabelAPI extends API {

    private static final Logger LOG = Log.logger(VertexLabelAPI.class);
@ -70,7 +68,6 @@ public class VertexLabelAPI extends API {
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin", "$owner=$graph $action=vertex_label_write"})
-    @RedirectFilter.RedirectMasterRole
    public String create(@Context GraphManager manager,
                         @PathParam("graph") String graph,
                         JsonVertexLabel jsonVertexLabel) {
@ -90,7 +87,6 @@ public class VertexLabelAPI extends API {
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin", "$owner=$graph $action=vertex_label_write"})
-    @RedirectFilter.RedirectMasterRole
    public String update(@Context GraphManager manager,
                         @PathParam("graph") String graph,
                         @PathParam("name") String name,
@ -163,7 +159,6 @@ public class VertexLabelAPI extends API {
    @Consumes(APPLICATION_JSON)
    @Produces(APPLICATION_JSON_WITH_CHARSET)
    @RolesAllowed({"admin", "$owner=$graph $action=vertex_label_delete"})
-    @RedirectFilter.RedirectMasterRole
    public Map<String, Id> delete(@Context GraphManager manager,
                                  @PathParam("graph") String graph,
                                  @PathParam("name") String name) {
@ -259,11 +254,11 @@ public class VertexLabelAPI extends API {
        @Override
        public String toString() {
            return String.format("JsonVertexLabel{" +
-                                 "name=%s, idStrategy=%s, primaryKeys=%s, nullableKeys=%s, " +
-                                 "properties=%s, ttl=%s, ttlStartTime=%s}",
-                                 this.name, this.idStrategy, Arrays.toString(this.primaryKeys),
-                                 Arrays.toString(this.nullableKeys),
-                                 Arrays.toString(this.properties), this.ttl, this.ttlStartTime);
+                   "name=%s, idStrategy=%s, primaryKeys=%s, nullableKeys=%s, " +
+                   "properties=%s, ttl=%s, ttlStartTime=%s}",
+                   this.name, this.idStrategy, this.primaryKeys,
+                   this.nullableKeys, this.properties, this.ttl,
+                   this.ttlStartTime);
        }
    }
 }
--- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/AllShortestPathsAPI.java
+++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/AllShortestPathsAPI.java
@ -0,0 +1,94 @@
+/*
+ * 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.traversers;
+
+import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY;
+import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE;
+
+import java.util.List;
+
+import javax.inject.Singleton;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+
+import org.slf4j.Logger;
+
+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.graph.EdgeAPI;
+import com.baidu.hugegraph.api.graph.VertexAPI;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.traversal.algorithm.HugeTraverser;
+import com.baidu.hugegraph.traversal.algorithm.ShortestPathTraverser;
+import com.baidu.hugegraph.type.define.Directions;
+import com.baidu.hugegraph.util.Log;
+import com.codahale.metrics.annotation.Timed;
+import com.google.common.collect.ImmutableList;
+
+@Path("graphs/{graph}/traversers/allshortestpaths")
+@Singleton
+public class AllShortestPathsAPI extends API {
+
+    private static final Logger LOG = Log.logger(RestServer.class);
+
+    @GET
+    @Timed
+    @Produces(APPLICATION_JSON_WITH_CHARSET)
+    public String get(@Context GraphManager manager,
+                      @PathParam("graph") String graph,
+                      @QueryParam("source") String source,
+                      @QueryParam("target") String target,
+                      @QueryParam("direction") String direction,
+                      @QueryParam("label") String edgeLabel,
+                      @QueryParam("max_depth") int depth,
+                      @QueryParam("max_degree")
+                      @DefaultValue(DEFAULT_MAX_DEGREE) long maxDegree,
+                      @QueryParam("skip_degree")
+                      @DefaultValue("0") long skipDegree,
+                      @QueryParam("capacity")
+                      @DefaultValue(DEFAULT_CAPACITY) long capacity) {
+        LOG.debug("Graph [{}] get shortest path from '{}', to '{}' with " +
+                  "direction {}, edge label {}, max depth '{}', " +
+                  "max degree '{}', skipped degree '{}' and capacity '{}'",
+                  graph, source, target, direction, edgeLabel, depth,
+                  maxDegree, skipDegree, capacity);
+
+        Id sourceId = VertexAPI.checkAndParseVertexId(source);
+        Id targetId = VertexAPI.checkAndParseVertexId(target);
+        Directions dir = Directions.convert(EdgeAPI.parseDirection(direction));
+
+        HugeGraph g = graph(manager, graph);
+
+        ShortestPathTraverser traverser = new ShortestPathTraverser(g);
+        List<String> edgeLabels = edgeLabel == null ? ImmutableList.of() :
+                                  ImmutableList.of(edgeLabel);
+        HugeTraverser.PathSet paths = traverser.allShortestPaths(
+                                      sourceId, targetId, dir, edgeLabels,
+                                      depth, maxDegree, skipDegree, capacity);
+        return manager.serializer(g).writePaths("paths", paths, false);
+    }
+}
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CountAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CountAPI.java
@ -1,61 +1,62 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.traversers;
+package com.baidu.hugegraph.api.traversers;

-import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE;
-import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_SKIP_DEGREE;
-import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.NO_LIMIT;
+import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE;
+import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_SKIP_DEGREE;
+import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.NO_LIMIT;

 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.structure.HugeVertex;
-import org.apache.hugegraph.traversal.algorithm.CountTraverser;
-import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep;
-import org.apache.hugegraph.type.define.Directions;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
+import javax.inject.Singleton;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.structure.HugeVertex;
+import com.baidu.hugegraph.traversal.algorithm.CountTraverser;
+import com.baidu.hugegraph.traversal.algorithm.steps.EdgeStep;
+import com.baidu.hugegraph.type.define.Directions;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/traversers/count")
@Singleton
-@Tag(name = "CountAPI")
 public class CountAPI extends API {

-    private static final Logger LOG = Log.logger(CountAPI.class);
+    private static final Logger LOG = Log.logger(RestServer.class);

    @POST
    @Timed
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CrosspointsAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CrosspointsAPI.java
@ -1,56 +1,57 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.traversers;
+package com.baidu.hugegraph.api.traversers;

-import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY;
-import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE;
-import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT;
+import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY;
+import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE;
+import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT;
+
+import javax.inject.Singleton;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;

-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.api.graph.EdgeAPI;
-import org.apache.hugegraph.api.graph.VertexAPI;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.traversal.algorithm.HugeTraverser;
-import org.apache.hugegraph.traversal.algorithm.PathsTraverser;
-import org.apache.hugegraph.type.define.Directions;
-import org.apache.hugegraph.util.Log;
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.api.graph.EdgeAPI;
+import com.baidu.hugegraph.api.graph.VertexAPI;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.traversal.algorithm.HugeTraverser;
+import com.baidu.hugegraph.traversal.algorithm.PathsTraverser;
+import com.baidu.hugegraph.type.define.Directions;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/traversers/crosspoints")
@Singleton
-@Tag(name = "CrosspointsAPI")
 public class CrosspointsAPI extends API {

-    private static final Logger LOG = Log.logger(CrosspointsAPI.class);
+    private static final Logger LOG = Log.logger(RestServer.class);

    @GET
    @Timed
@ -67,14 +68,13 @@ public class CrosspointsAPI extends API {
                      @QueryParam("capacity")
                      @DefaultValue(DEFAULT_CAPACITY) long capacity,
                      @QueryParam("limit")
-                      @DefaultValue(DEFAULT_PATHS_LIMIT) int limit) {
+                      @DefaultValue(DEFAULT_PATHS_LIMIT) long limit) {
        LOG.debug("Graph [{}] get crosspoints with paths from '{}', to '{}' " +
                  "with direction '{}', edge label '{}', max depth '{}', " +
                  "max degree '{}', capacity '{}' and limit '{}'",
                  graph, source, target, direction, edgeLabel,
                  depth, maxDegree, capacity, limit);

-        ApiMeasurer measure = new ApiMeasurer();
        Id sourceId = VertexAPI.checkAndParseVertexId(source);
        Id targetId = VertexAPI.checkAndParseVertexId(target);
        Directions dir = Directions.convert(EdgeAPI.parseDirection(direction));
@ -85,9 +85,6 @@ public class CrosspointsAPI extends API {
                                                      dir, edgeLabel, depth,
                                                      maxDegree, capacity,
                                                      limit);
-        measure.addIterCount(traverser.vertexIterCounter.get(),
-                             traverser.edgeIterCounter.get());
-        return manager.serializer(g, measure.measures())
-                      .writePaths("crosspoints", paths, true);
+        return manager.serializer(g).writePaths("crosspoints", paths, true);
    }
 }
--- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CustomizedCrosspointsAPI.java
+++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CustomizedCrosspointsAPI.java
@ -1,81 +1,66 @@
 /*
+ * 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
+ * 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.
+ * 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 org.apache.hugegraph.api.traversers;
+package com.baidu.hugegraph.api.traversers;

-import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY;
-import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE;
-import static org.apache.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT;
+import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_CAPACITY;
+import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_MAX_DEGREE;
+import static com.baidu.hugegraph.traversal.algorithm.HugeTraverser.DEFAULT_PATHS_LIMIT;

 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

-import org.apache.hugegraph.HugeGraph;
-import org.apache.hugegraph.api.API;
-import org.apache.hugegraph.backend.id.Id;
-import org.apache.hugegraph.core.GraphManager;
-import org.apache.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser;
-import org.apache.hugegraph.traversal.algorithm.HugeTraverser;
-import org.apache.hugegraph.type.define.Directions;
-import org.apache.hugegraph.util.E;
-import org.apache.hugegraph.util.Log;
-import org.apache.tinkerpop.gremlin.structure.Edge;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.slf4j.Logger;

+import com.baidu.hugegraph.HugeGraph;
+import com.baidu.hugegraph.api.API;
+import com.baidu.hugegraph.backend.id.Id;
+import com.baidu.hugegraph.backend.query.QueryResults;
+import com.baidu.hugegraph.core.GraphManager;
+import com.baidu.hugegraph.server.RestServer;
+import com.baidu.hugegraph.traversal.algorithm.CustomizedCrosspointsTraverser;
+import com.baidu.hugegraph.traversal.algorithm.HugeTraverser;
+import com.baidu.hugegraph.type.define.Directions;
+import com.baidu.hugegraph.util.E;
+import com.baidu.hugegraph.util.Log;
 import com.codahale.metrics.annotation.Timed;
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonProperty;

-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.Context;
-
@Path("graphs/{graph}/traversers/customizedcrosspoints")
@Singleton
-@Tag(name = "CustomizedCrosspointsAPI")
 public class CustomizedCrosspointsAPI extends API {

-    private static final Logger LOG = Log.logger(CustomizedCrosspointsAPI.class);
-
-    private static List<CustomizedCrosspointsTraverser.PathPattern> pathPatterns(
-            HugeGraph graph, CrosspointsRequest request) {
-        int stepSize = request.pathPatterns.size();
-        List<CustomizedCrosspointsTraverser.PathPattern> pathPatterns = new ArrayList<>(stepSize);
-        for (PathPattern pattern : request.pathPatterns) {
-            CustomizedCrosspointsTraverser.PathPattern pathPattern =
-                    new CustomizedCrosspointsTraverser.PathPattern();
-            for (Step step : pattern.steps) {
-                pathPattern.add(step.jsonToStep(graph));
-            }
-            pathPatterns.add(pathPattern);
-        }
-        return pathPatterns;
-    }
+    private static final Logger LOG = Log.logger(RestServer.class);

    @POST
    @Timed
@ -94,55 +79,55 @@ public class CustomizedCrosspointsAPI extends API {
                        "The steps of crosspoints request can't be empty");

        LOG.debug("Graph [{}] get customized crosspoints from source vertex " +
-                  "'{}', with path_pattern '{}', with path '{}', with_vertex " +
-                  "'{}', capacity '{}', limit '{}' and with_edge '{}'",
-                  graph, request.sources, request.pathPatterns, request.withPath,
-                  request.withVertex, request.capacity, request.limit, request.withEdge);
-
-        ApiMeasurer measure = new ApiMeasurer();
+                  "'{}', with path_pattern '{}', with_path '{}', with_vertex " +
+                  "'{}', capacity '{}' and limit '{}'", graph, request.sources,
+                  request.pathPatterns, request.withPath, request.withVertex,
+                  request.capacity, request.limit);

        HugeGraph g = graph(manager, graph);
        Iterator<Vertex> sources = request.sources.vertices(g);
+        List<CustomizedCrosspointsTraverser.PathPattern> patterns;
+        patterns = pathPatterns(g, request);

        CustomizedCrosspointsTraverser traverser =
-                new CustomizedCrosspointsTraverser(g);
-
-        List<CustomizedCrosspointsTraverser.PathPattern> patterns = pathPatterns(g, request);
-        CustomizedCrosspointsTraverser.CrosspointsPaths paths =
-                traverser.crosspointsPaths(sources, patterns, request.capacity, request.limit);
-
-        measure.addIterCount(traverser.vertexIterCounter.get(),
-                             traverser.edgeIterCounter.get());
-
-        Iterator<?> iterVertex;
-        Set<Id> vertexIds = new HashSet<>();
+                                       new CustomizedCrosspointsTraverser(g);
+        CustomizedCrosspointsTraverser.CrosspointsPaths paths;
+        paths = traverser.crosspointsPaths(sources, patterns, request.capacity,
+                                           request.limit);
+        Iterator<Vertex> iter = QueryResults.emptyIterator();
+        if (!request.withVertex) {
+            return manager.serializer(g).writeCrosspoints(paths, iter,
+                                                          request.withPath);
+        }
+        Set<Id> ids = new HashSet<>();
        if (request.withPath) {
-            for (HugeTraverser.Path path : paths.paths()) {
-                vertexIds.addAll(path.vertices());
+            for (HugeTraverser.Path p : paths.paths()) {
+                ids.addAll(p.vertices());
            }
        } else {
-            vertexIds = paths.crosspoints();
+            ids = paths.crosspoints();
        }
-        if (request.withVertex && !vertexIds.isEmpty()) {
-            iterVertex = g.vertices(vertexIds.toArray());
-            measure.addIterCount(vertexIds.size(), 0L);
-        } else {
-            iterVertex = vertexIds.iterator();
+        if (!ids.isEmpty()) {
+            iter = g.vertices(ids.toArray());
        }
+        return manager.serializer(g).writeCrosspoints(paths, iter,
+                                                      request.withPath);
+    }

-        Iterator<?> iterEdge = Collections.emptyIterator();
-        if (request.withPath) {
-            Set<Edge> edges = traverser.edgeResults().getEdges(paths.paths());
-            if (request.withEdge) {
-                iterEdge = edges.iterator();
-            } else {
-                iterEdge = HugeTraverser.EdgeRecord.getEdgeIds(edges).iterator();
+    private static List<CustomizedCrosspointsTraverser.PathPattern>
+                   pathPatterns(HugeGraph graph, CrosspointsRequest request) {
+        int stepSize = request.pathPatterns.size();
+        List<CustomizedCrosspointsTraverser.PathPattern> pathPatterns;
+        pathPatterns = new ArrayList<>(stepSize);
+        for (PathPattern pattern : request.pathPatterns) {
+            CustomizedCrosspointsTraverser.PathPattern pathPattern;
+            pathPattern = new CustomizedCrosspointsTraverser.PathPattern();
+            for (Step step : pattern.steps) {
+                pathPattern.add(step.jsonToStep(graph));
            }
+            pathPatterns.add(pathPattern);
        }
-
-        return manager.serializer(g, measure.measures())
-                      .writeCrosspoints(paths, iterVertex,
-                                        iterEdge, request.withPath);
+        return pathPatterns;
    }

    private static class CrosspointsRequest {
@ -154,21 +139,19 @@ public class CustomizedCrosspointsAPI extends API {
        @JsonProperty("capacity")
        public long capacity = Long.parseLong(DEFAULT_CAPACITY);
        @JsonProperty("limit")
-        public int limit = Integer.parseInt(DEFAULT_PATHS_LIMIT);
+        public long limit = Long.parseLong(DEFAULT_PATHS_LIMIT);
        @JsonProperty("with_path")
        public boolean withPath = false;
        @JsonProperty("with_vertex")
        public boolean withVertex = false;
-        @JsonProperty("with_edge")
-        public boolean withEdge = false;

        @Override
        public String toString() {
            return String.format("CrosspointsRequest{sourceVertex=%s," +
                                 "pathPatterns=%s,withPath=%s,withVertex=%s," +
-                                 "capacity=%s,limit=%s,withEdge=%s}", this.sources,
-                                 this.pathPatterns, this.withPath, this.withVertex,
-                                 this.capacity, this.limit, this.withEdge);
+                                 "capacity=%s,limit=%s}", this.sources,
+                                 this.pathPatterns, this.withPath,
+                                 this.withVertex, this.capacity, this.limit);
        }
    }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
imbajin	5bf0290e54	fix: useless ring detection removed valid path (#1723 ) * remove useless ring detection due to it will remove valid path * limit max depth to 5000 to avoid stackoverflow	2022-01-12 22:42:10 +08:00
Jermy Li	35cffbc032	improve raft module and test (#1721 ) * improve raft moddule * add raft-server test * set safe_read=true and use_snapshot=false * fix leader not wait for apply-task * add auth support to raft-tools.sh * don't clear non-shared-storage backend * set task timer interval from 3s to 1s * improve CachedSchemaTransaction * improve update schema status * remove truncate from project test * fix codecov: api test report not been uploaded * improve task cancel() test with cancelled status Change-Id: I016d3fcc4ab50614afdf452e7c9691ee3cc3c70b	2022-01-12 22:42:09 +08:00
dependabot[bot]	df0a7b5dda	Bump log4j-api from 2.17.0 to 2.17.1 (#1724 ) Bumps log4j-api from 2.17.0 to 2.17.1. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-01-12 22:42:09 +08:00
Jermy Li	35f78f4788	enhance schema job module (#1729 ) Change-Id: I32938d4a5ed595ceb0f2dc02eb7ee75141f4133a	2022-01-12 22:42:09 +08:00
Jermy Li	3e80460a0e	support hot set trace through /exception/trace API (#1727 ) Change-Id: I78bbff56420be0a7c99dfc461913ed45d66725fc	2022-01-12 22:42:09 +08:00
Jermy Li	5e1efedb93	fix NoSuchMethodError Relations() (#1720 ) Change-Id: I25b50a8d529d0292d700aaac0f63b4722a99160f	2022-01-12 22:42:09 +08:00
zhoney	2f726c9a75	upgrade rpc and common version to 2.0.1 (#1719 ) Change-Id: If90b56013b04f1e72de18dcd733471ef42955f98	2022-01-12 22:42:09 +08:00
Jermy Li	f17a68a510	HugeGraph-1358: update readme for release-0.12 (#1717 ) Change-Id: I3e71ec79e926d0ba09aa6dc4bcb596ff71c15390	2021-12-31 15:09:58 +08:00