fix: build error with npm not exist & tiny improve (#558)

Author: imbajin

README.md

@@ -7,36 +7,39 @@
 [![Build Status](https://github.com/apache/hugegraph-toolchain/actions/workflows/tools-ci.yml/badge.svg)](https://github.com/apache/hugegraph-toolchain/actions/workflows/tools-ci.yml)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.hugegraph/hugegraph-client/badge.svg)](https://mvnrepository.com/artifact/org.apache.hugegraph/hugegraph-client)
 
-`hugegraph-toolchain` is the integration project of a series of utilities for [HugeGraph](https://github.com/apache/hugegraph), it includes 4 main modules.
+`hugegraph-toolchain` is the integration project contains a series of utilities for [HugeGraph](https://github.com/apache/hugegraph), 
+it includes 5+ main modules.
 
 ## Modules
 
 - [hugegraph-loader](./hugegraph-loader): Loading datasets into the HugeGraph from multiple data sources.
 - [hugegraph-hubble](./hugegraph-hubble): Online HugeGraph management and analysis dashboard (Include: data loading, schema management, graph traverser and display).
 - [hugegraph-tools](./hugegraph-tools): Command line tool for deploying, managing and backing-up/restoring graphs from HugeGraph.
 - [hugegraph-client](./hugegraph-client): A Java-written client for HugeGraph, providing `RESTful` APIs for accessing graph vertex/edge/schema/gremlin/variables and traversals etc.
+- [hugegraph-client-go](./hugegraph-client-go): A Go-written client for HugeGraph, providing `RESTful` APIs for accessing graph vertex/edge/schema/gremlin/variables and traversals etc. (WIP)
 
 ## Usage
 
-- [hugegraph-loader](./hugegraph-loader): We can use `docker run -itd --name loader hugegraph/loader` to quickly start [loader](https://hub.docker.com/r/hugegraph/loader) or we can follow [this](./hugegraph-loader/README.md#212-docker-compose) to use docker-compose to start `loader` with `server`. And we can find more details in the [doc](https://hugegraph.apache.org/docs/quickstart/hugegraph-loader/).
-- [hugegraph-hubble](./hugegraph-hubble): We can use `docker run -itd --name=hubble -p 8088:8088 hugegraph/hubble` to quickly start [hubble](https://hub.docker.com/r/hugegraph/hubble) or we can follow [this](hugegraph-hubble/README.md#quick-start) to use docker-compose to start `hubble` with `server`. And we can find more details in the [doc](https://hugegraph.apache.org/docs/quickstart/hugegraph-hubble/).
-- [hugegraph-client](./hugegraph-client): We can follow the [doc](https://hugegraph.apache.org/docs/quickstart/hugegraph-client/) to learn how to quick start with `client`.
+- [hugegraph-loader](./hugegraph-loader): We can use `docker run -itd --name loader hugegraph/loader` to quickly start [loader,](https://hub.docker.com/r/hugegraph/loader) or we can follow [this](./hugegraph-loader/README.md#212-docker-compose) to use docker-compose to start `loader` with `server`. And we can find more details in the [doc](https://hugegraph.apache.org/docs/quickstart/hugegraph-loader/).
+- [hugegraph-hubble](./hugegraph-hubble): We can use `docker run -itd --name=hubble -p 8088:8088 hugegraph/hubble` to quickly start [hubble,](https://hub.docker.com/r/hugegraph/hubble) or we can follow [this](hugegraph-hubble/README.md#quick-start) to use docker-compose to start `hubble` with `server`. And we can find more details in the [doc](https://hugegraph.apache.org/docs/quickstart/hugegraph-hubble/).
+- [hugegraph-client](./hugegraph-client): We can follow the [doc](https://hugegraph.apache.org/docs/quickstart/hugegraph-client/) to learn how to quickly start with `client`.
 
 ## Maven Dependencies
 
 You could use import the dependencies in `maven` like this:
 
 ```xml
+  <!-- Note: use the latest release version in maven repo, here is just an example -->
   <dependency>
        <groupId>org.apache.hugegraph</groupId>
        <artifactId>hugegraph-client</artifactId>
-       <version>1.0.0</version>
+       <version>1.2.0</version>
   </dependency>
 
   <dependency>
        <groupId>org.apache.hugegraph</groupId>
        <artifactId>hugegraph-loader</artifactId>
-       <version>1.0.0</version>
+       <version>1.2.0</version>
   </dependency>
 ```
 

hugegraph-hubble/Dockerfile

@@ -25,10 +25,9 @@ WORKDIR /pkg
 
 RUN set -x \
     && apt-get -q update \
-    && apt-get install curl gnupg -yq \
-    && curl -sL https://deb.nodesource.com/setup_16.x | bash \
-    && apt-get install -y nodejs \
-    && apt-get clean
+    && apt-get install curl -yq \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN set -x \
     && mvn install $MAVEN_ARGS -pl hugegraph-client,hugegraph-loader -am -Dmaven.javadoc.skip=true -DskipTests -ntp \

hugegraph-hubble/README.md

@@ -4,14 +4,15 @@
 [![hugegraph-hubble-ci](https://github.com/apache/incubator-hugegraph-toolchain/actions/workflows/hubble-ci.yml/badge.svg?branch=master)](https://github.com/apache/incubator-hugegraph-toolchain/actions/workflows/hubble-ci.yml)
 [![CodeQL](https://github.com/apache/incubator-hugegraph-toolchain/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/apache/incubator-hugegraph-toolchain/actions/workflows/codeql-analysis.yml)
 
-hugegraph-hubble is a graph management and analysis platform that provides features: graph data load, schema management, graph relationship analysis and graphical display.
+hugegraph-hubble is a graph management and analysis platform that provides features:
+graph data load, schema management, graph relationship analysis, and graphical display.
 
 ## Features
 
 - Graph connection management, supporting to easily switch graph to operate
 - Graph data load, supporting to load large amounts of data from files into hugegraph-server
 - Schema management, supporting to easily perform schema manipulation and display
-- Graph analysis and graphical display, supporting to build query via the gremlin or algorithms with a little effort then will get cool graphical results
+- Graph analysis and graphical display, supporting to build a query via the gremlin or algorithms with a little effort then will get cool graphical results
 
 ## Quick Start
 
@@ -29,7 +30,7 @@ We can quickly start `hubble` in two ways:
             #environment:
             #  - PRELOAD=true
             ports:
-              - 18080:8080
+              - 8080:8080
 
         hubble:
             image: hugegraph/hubble

hugegraph-hubble/hubble-dist/pom.xml

@@ -82,9 +82,11 @@
                         <id>install node and yarn</id>
                         <goals>
                             <goal>install-node-and-yarn</goal>
+                            <goal>install-node-and-npm</goal>
                         </goals>
                         <configuration>
                             <nodeVersion>v16.16.0</nodeVersion>
+                            <npmVersion>8.19.1</npmVersion>
                             <yarnVersion>v1.22.15</yarnVersion>
                         </configuration>
                     </execution>

hugegraph-tools/src/main/java/org/apache/hugegraph/structure/JsonGraph.java

@@ -32,7 +32,7 @@ public class JsonGraph {
 
     private static final int INIT_VERTEX_CAPACITY = 1_000_000;
 
-    private Map<String, Map<Object, JsonVertex>> tables;
+    private final Map<String, Map<Object, JsonVertex>> tables;
 
     public JsonGraph() {
         this.tables = new ConcurrentHashMap<>();

hugegraph-tools/src/main/java/org/apache/hugegraph/util/ToolUtil.java

@@ -62,7 +62,7 @@ public static void exitOrThrow(ExitException e, boolean throwMode) {
     }
 
     public static String commandsCategory(JCommander jCommander) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("================================================");
         sb.append("\n");
         sb.append("Warning : must provide one sub-command");

hugegraph-tools/src/test/java/org/apache/hugegraph/test/functional/AuthBackupTest.java

@@ -34,53 +34,43 @@ public void init() {
 
     @Test
     public void testAuthBackup() {
-        String[] args = new String[]{
-                "--throw-mode", "true",
-                "--user", USER_NAME,
-                "--password", USER_PASSWORD,
-                "auth-backup"
+        String[] args = new String[]{"--throw-mode", "true", "--user", USER_NAME,
+                                     "--password", USER_PASSWORD, "auth-backup"
         };
 
         HugeGraphCommand.main(args);
 
         Assert.assertTrue(FileUtil.checkFileExists(DEFAULT_URL));
         List<String> fileNames = FileUtil.subdirectories(DEFAULT_URL);
-        Assert.assertTrue(fileNames.size() == 5);
+        Assert.assertEquals(5, fileNames.size());
     }
 
     @Test
     public void testAuthBackupByTypes() {
-        String[] args = new String[]{
-                "--throw-mode", "true",
-                "--user", USER_NAME,
-                "--password", USER_PASSWORD,
-                "auth-backup",
-                "--types", "user,group"
+        String[] args = new String[]{"--throw-mode", "true", "--user", USER_NAME,
+                                     "--password", USER_PASSWORD, "auth-backup",
+                                     "--types", "user,group"
         };
 
         HugeGraphCommand.main(args);
 
         Assert.assertTrue(FileUtil.checkFileExists(DEFAULT_URL));
         List<String> fileNames = FileUtil.subdirectories(DEFAULT_URL);
-        Assert.assertTrue(fileNames.size() == 2);
+        Assert.assertEquals(2, fileNames.size());
     }
 
     @Test
     public void testAuthBackupWithWrongType() {
-        String[] args = new String[]{
-                "--throw-mode", "true",
-                "--user", USER_NAME,
-                "--password", USER_PASSWORD,
-                "auth-backup",
-                "--types", "user,group,test"
+        String[] args = new String[]{"--throw-mode", "true", "--user", USER_NAME,
+                                     "--password", USER_PASSWORD, "auth-backup",
+                                     "--types", "user,group,test"
         };
 
         Assert.assertThrows(IllegalArgumentException.class, () -> {
             HugeGraphCommand.main(args);
         }, e -> {
             Assert.assertContains("valid value is 'all' or combination of " +
-                                  "[user,group,target,belong,access]",
-                                  e.getMessage());
+                                  "[user,group,target,belong,access]", e.getMessage());
         });
     }
 
@@ -99,6 +89,6 @@ public void testAuthBackupByDirectory() {
 
         Assert.assertTrue(FileUtil.checkFileExists(directory));
         List<String> fileNames = FileUtil.subdirectories(directory);
-        Assert.assertTrue(fileNames.size() == 5);
+        Assert.assertEquals(5, fileNames.size());
     }
 }

hugegraph-tools/src/test/java/org/apache/hugegraph/test/functional/AuthRestoreTest.java

@@ -58,14 +58,10 @@ public void testAuthRestoreForAllType() {
         this.loadData(HugeType.BELONG, "auth_belongs.txt");
         this.loadData(HugeType.ACCESS, "auth_accesses.txt");
 
-        String[] args = new String[]{
-                "--throw-mode", "true",
-                "--user", USER_NAME,
-                "--password", USER_PASSWORD,
-                "auth-restore",
-                "--directory", DEFAULT_URL,
-                "--init-password", "123456",
-                "--strategy", "ignore"
+        String[] args = new String[]{"--throw-mode", "true", "--user", USER_NAME,
+                                     "--password", USER_PASSWORD, "auth-restore",
+                                     "--directory", DEFAULT_URL, "--init-password", "123456",
+                                     "--strategy", "ignore"
         };
 
         HugeGraphCommand.main(args);
@@ -82,15 +78,15 @@ public void testAuthRestoreForAllType() {
         List<Group> groups = this.client.auth().listGroups();
         Map<String, Group> groupMap = Maps.newHashMap();
         for (Group group : groups) {
-             groupMap.put(group.name(), group);
+            groupMap.put(group.name(), group);
         }
         Assert.assertTrue(groupMap.containsKey("test_group6"));
         idList.add(groupMap.get("test_group6").id().toString());
 
         List<Target> targets = this.client.auth().listTargets();
         Map<String, Target> targetMap = Maps.newHashMap();
         for (Target target : targets) {
-             targetMap.put(target.name(), target);
+            targetMap.put(target.name(), target);
         }
         Assert.assertTrue(targetMap.containsKey("test_target1"));
         idList.add(targetMap.get("test_target1").id().toString());
@@ -139,7 +135,7 @@ public void testAuthRestoreForUser() {
         List<User> userList = this.client.auth().listUsers();
         Map<String, User> userMap = Maps.newHashMap();
         for (User user1 : userList) {
-             userMap.put(user1.name(), user1);
+            userMap.put(user1.name(), user1);
         }
 
         Assert.assertTrue(userMap.containsKey("test_user1"));
@@ -160,8 +156,7 @@ public void testRestoreWithoutInitPassword() {
             HugeGraphCommand.main(args);
         }, e -> {
             String msg = e.getMessage();
-            Assert.assertTrue(msg.endsWith("The following option is " +
-                                           "required: [--init-password]"));
+            Assert.assertTrue(msg.endsWith("The following option is required: [--init-password]"));
         });
     }
 
@@ -182,8 +177,7 @@ public void testAuthRestoreWithConflictAndStopStrategy() {
         Assert.assertThrows(IllegalStateException.class, () -> {
             HugeGraphCommand.main(args);
         }, e -> {
-            Assert.assertContains("Restore conflict with STOP strategy",
-                                  e.getMessage());
+            Assert.assertContains("Restore conflict with STOP strategy", e.getMessage());
         });
     }
 
@@ -206,7 +200,7 @@ public void testAuthRestoreWithIgnoreStrategy() {
         List<User> userList = this.client.auth().listUsers();
         Map<String, User> userMap = Maps.newHashMap();
         for (User user1 : userList) {
-             userMap.put(user1.name(), user1);
+            userMap.put(user1.name(), user1);
         }
 
         Assert.assertTrue(userMap.containsKey("admin"));
@@ -230,8 +224,7 @@ public void testAuthRestoreWithWrongDirectory() {
         Assert.assertThrows(IllegalStateException.class, () -> {
             HugeGraphCommand.main(args);
         }, e -> {
-            Assert.assertContains("The directory does not exist",
-                                  e.getMessage());
+            Assert.assertContains("The directory does not exist", e.getMessage());
         });
     }
 
@@ -244,7 +237,7 @@ public void testAuthRestoreWithWrongType() {
                 "--user", USER_NAME,
                 "--password", USER_PASSWORD,
                 "auth-restore",
-                "--types", "user，test",
+                "--types", "user, test",
                 "--strategy", "stop",
                 "--init-password", "123456",
                 "--directory", filePath
@@ -254,8 +247,7 @@ public void testAuthRestoreWithWrongType() {
             HugeGraphCommand.main(args);
         }, e -> {
             Assert.assertContains("valid value is 'all' or combination of " +
-                                  "[user,group,target,belong,access]",
-                                  e.getMessage());
+                                  "[user,group,target,belong,access]", e.getMessage());
         });
     }
 
@@ -278,8 +270,7 @@ public void testAuthRestoreByBelongWithoutDependency() {
             HugeGraphCommand.main(args);
         }, e -> {
             Assert.assertContains("if type contains 'belong' then " +
-                                  "'user' and 'group' are required.",
-                                  e.getMessage());
+                                  "'user' and 'group' are required.", e.getMessage());
         });
     }
 
@@ -302,8 +293,7 @@ public void testAuthRestoreByAccessWithoutDependency() {
             HugeGraphCommand.main(args);
         }, e -> {
             Assert.assertContains("if type contains 'access' then " +
-                                  "'group' and 'target' are required.",
-                                  e.getMessage());
+                                  "'group' and 'target' are required.", e.getMessage());
         });
     }
 
@@ -326,17 +316,15 @@ public void testAuthRestoreWithWrongStrategy() {
             HugeGraphCommand.main(args);
         }, e -> {
             Assert.assertContains("Invalid --strategy 'test', valid " +
-                                  "value is 'stop' or 'ignore",
-                                  e.getMessage());
+                                  "value is 'stop' or 'ignore", e.getMessage());
         });
     }
 
     private void loadData(HugeType hugeType, String dataFilePath) {
         String restoreDataPath = DEFAULT_URL + hugeType.string();
         String testRestoreDataPath = DEFAULT_TEST_URL + dataFilePath;
 
-        List<String> list = FileUtil.readTestRestoreData(FileUtil.configPath(
-                                                         testRestoreDataPath));
+        List<String> list = FileUtil.readTestRestoreData(FileUtil.configPath(testRestoreDataPath));
         FileUtil.writeTestRestoreData(restoreDataPath, list);
     }
 }