fix(ct): fix server config file path

Author: HJ-Young

hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/base/ClusterConstant.java

@@ -28,9 +28,6 @@ public class ClusterConstant {
 
     public static final String LOG = "logs";
     public static final String PROJECT_DIR = getProjectDir();
-    public static final String PD = "pd";
-    public static final String STORE = "store";
-    public static final String SERVER = "server";
     public static final String LIB_DIR = "lib";
     public static final String EXT_DIR = "ext";
     public static final String PLUGINS_DIR = "plugins";
@@ -52,7 +49,6 @@ public class ClusterConstant {
     public static final String GRAPH_TEMPLATE_FILE = "hugegraph.properties.template";
     public static final String GREMLIN_DRIVER_SETTING_FILE = "gremlin-driver-settings.yaml";
     public static final String GREMLIN_SERVER_FILE = "gremlin-server.yaml";
-    public static final String COMPUTER_SETTING_FILE = "computer.yaml";
     public static final String REMOTE_SETTING_FILE = "remote.yaml";
     public static final String REMOTE_OBJECTS_SETTING_FILE = "remote-objects.yaml";
     public static final String EMPTY_SAMPLE_GROOVY_FILE = "scripts/empty-sample.groovy";
@@ -83,9 +79,11 @@ public class ClusterConstant {
     public static final String SERVER_LIB_PATH =
             getFileInDir(SERVER_DIST_PATH, SERVER_PACKAGE_PREFIX) +
             File.separator;
-    public static final String SERVER_TEMPLATE_PATH =
+    public static final String SERVER_PACKAGE_PATH =
             getFileInDir(SERVER_DIST_PATH, SERVER_PACKAGE_PREFIX) +
-            File.separator + CONF_DIR + File.separator;
+            File.separator;
+    public static final String SERVER_TEMPLATE_PATH =
+            SERVER_PACKAGE_PATH + CONF_DIR + File.separator;
     public static final String CT_DIST_PATH =
             PROJECT_DIR + File.separator + "hugegraph-cluster-test" + File.separator;
     public static final String CT_PACKAGE_PATH =

hugegraph-cluster-test/hugegraph-clustertest-minicluster/src/main/java/org/apache/hugegraph/ct/node/ServerNodeWrapper.java

@@ -17,7 +17,6 @@
 
 package org.apache.hugegraph.ct.node;
 
-import static org.apache.hugegraph.ct.base.ClusterConstant.COMPUTER_SETTING_FILE;
 import static org.apache.hugegraph.ct.base.ClusterConstant.CONF_DIR;
 import static org.apache.hugegraph.ct.base.ClusterConstant.EMPTY_SAMPLE_GROOVY_FILE;
 import static org.apache.hugegraph.ct.base.ClusterConstant.EXAMPLE_GROOVY_FILE;
@@ -31,6 +30,7 @@
 import static org.apache.hugegraph.ct.base.ClusterConstant.REMOTE_OBJECTS_SETTING_FILE;
 import static org.apache.hugegraph.ct.base.ClusterConstant.REMOTE_SETTING_FILE;
 import static org.apache.hugegraph.ct.base.ClusterConstant.SERVER_LIB_PATH;
+import static org.apache.hugegraph.ct.base.ClusterConstant.SERVER_PACKAGE_PATH;
 import static org.apache.hugegraph.ct.base.ClusterConstant.SERVER_TEMPLATE_PATH;
 import static org.apache.hugegraph.ct.base.ClusterConstant.isJava11OrHigher;
 
@@ -45,13 +45,14 @@ public class ServerNodeWrapper extends AbstractNodeWrapper {
 
     public ServerNodeWrapper(int clusterIndex, int index) {
         super(clusterIndex, index);
-        this.fileNames = new ArrayList<>(List.of(LOG4J_FILE, GREMLIN_SERVER_FILE, GREMLIN_DRIVER_SETTING_FILE,
-                                                 REMOTE_SETTING_FILE, REMOTE_OBJECTS_SETTING_FILE));
+        this.fileNames = new ArrayList<>(
+                List.of(LOG4J_FILE, GREMLIN_SERVER_FILE, GREMLIN_DRIVER_SETTING_FILE,
+                        REMOTE_SETTING_FILE, REMOTE_OBJECTS_SETTING_FILE));
         this.workPath = SERVER_LIB_PATH;
         createNodeDir(Paths.get(SERVER_TEMPLATE_PATH), getNodePath() + CONF_DIR + File.separator);
         this.fileNames = new ArrayList<>(List.of(EMPTY_SAMPLE_GROOVY_FILE, EXAMPLE_GROOVY_FILE));
         this.startLine = "INFO: [HttpServer] Started.";
-        createNodeDir(Paths.get(SERVER_TEMPLATE_PATH), getNodePath());
+        createNodeDir(Paths.get(SERVER_PACKAGE_PATH), getNodePath());
         createLogDir();
     }
 

hugegraph-cluster-test/hugegraph-clustertest-test/src/main/java/org/apache/hugegraph/SimpleClusterTest/SimpleClusterDeployTest.java

@@ -29,27 +29,27 @@
 import org.apache.hugegraph.pd.client.PDConfig;
 import org.apache.hugegraph.pd.common.PDException;
 import org.apache.hugegraph.structure.constant.T;
+import org.apache.hugegraph.structure.graph.Edge;
+import org.apache.hugegraph.structure.graph.Path;
 import org.apache.hugegraph.structure.graph.Vertex;
-import org.apache.hugegraph.structure.gremlin.ResultSet;
 import org.apache.hugegraph.structure.gremlin.Result;
-import org.apache.hugegraph.structure.graph.Path;
-import org.apache.hugegraph.structure.graph.Edge;
+import org.apache.hugegraph.structure.gremlin.ResultSet;
 import org.junit.Assert;
 import org.junit.Test;
 
 public class SimpleClusterDeployTest extends BaseSimpleTest {
 
     @Test
     public void testPDNodesDeployment() {
-        try{
+        try {
             List<String> addrs = env.getPDGrpcAddrs();
             for (String addr : addrs) {
                 PDConfig pdConfig = PDConfig.of(addr);
                 pdClient = PDClient.create(pdConfig);
                 pdClient.dbCompaction();
             }
             assert true;
-        }catch (PDException pdException){
+        } catch (PDException pdException) {
             assert false;
         }
     }
@@ -73,8 +73,7 @@ public void testStoreNodesDeployment() throws IOException {
     public void testServerNodesDeployment() {
         List<String> addrs = env.getServerRestAddrs();
         for (String addr : addrs) {
-            hugeClient = HugeClient.builder("http://" + addr, "hugegraph")
-                                    .build();
+            hugeClient = HugeClient.builder("http://" + addr, "hugegraph").build();
             SchemaManager schema = hugeClient.schema();
 
             schema.propertyKey("name").asText().ifNotExist().create();