Remove restserver.protocol option (apache#1272)

Change-Id: I57a90e5a3254e22f29243beebf81751182d15534
tmljob · Dec 10, 2020 · bf80fc6 · bf80fc6
1 parent 06b89f7
commit bf80fc6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java
@@ -49,15 +49,6 @@ public static synchronized ServerOptions instance() {
                     "http://127.0.0.1:8080"
             );
 
-    public static final ConfigOption<String> REST_SERVER_PROTOCOL =
-            new ConfigOption<>(
-                    "restserver.protocol",
-                    "The protocol of rest-server, allowed values are: " +
-                    "http or https.",
-                    allowValues("http", "https"),
-                    "http"
-            );
-
     public static final ConfigOption<String> SERVER_ID =
             new ConfigOption<>(
                     "server.id",
@@ -237,7 +228,7 @@ public static synchronized ServerOptions instance() {
                     "The path of server keystore file used when https " +
                     "protocol is enabled.",
                     disallowEmpty(),
-                    "hugegraph-server.keystore"
+                    "conf/hugegraph-server.keystore"
             );
 
     public static final ConfigOption<String> SSL_KEYSTORE_PASSWORD =

diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/server/RestServer.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/server/RestServer.java
@@ -70,7 +70,7 @@ public void start() throws IOException {
     }
 
     private HttpServer configHttpServer(URI uri, ResourceConfig rc) {
-        String protocol = this.conf.get(ServerOptions.REST_SERVER_PROTOCOL);
+        String protocol = uri.getScheme();
         final HttpServer server;
         if (protocol != null && protocol.equals("https")) {
             SSLContextConfigurator sslContext = new SSLContextConfigurator();