Revert "HBASE-27027 Use jetty SslContextFactory.Server instead of dep…

…recated SslContextFactory (apache#4425)" This reverts commit 67aee05.
wenwj0 · Jun 14, 2022 · 5fb5222 · 5fb5222
1 parent ce2460b
commit 5fb5222
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java
@@ -418,7 +418,7 @@ public HttpServer build() throws IOException {
         } else if ("https".equals(scheme)) {
           HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
           httpsConfig.addCustomizer(new SecureRequestCustomizer());
-          SslContextFactory.Server sslCtxFactory = new SslContextFactory.Server();
+          SslContextFactory sslCtxFactory = new SslContextFactory();
           sslCtxFactory.setNeedClientAuth(needsClientAuth);
           sslCtxFactory.setKeyManagerPassword(keyPassword);
 

diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java
@@ -311,7 +311,7 @@ public synchronized void run() throws Exception {
       HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
       httpsConfig.addCustomizer(new SecureRequestCustomizer());
 
-      SslContextFactory.Server sslCtxFactory = new SslContextFactory.Server();
+      SslContextFactory sslCtxFactory = new SslContextFactory();
       String keystore = conf.get(REST_SSL_KEYSTORE_STORE);
       String keystoreType = conf.get(REST_SSL_KEYSTORE_TYPE);
       String password = HBaseConfiguration.getPassword(conf, REST_SSL_KEYSTORE_PASSWORD, null);

diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
@@ -408,7 +408,7 @@ protected void setupHTTPServer() throws IOException {
       HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
       httpsConfig.addCustomizer(new SecureRequestCustomizer());
 
-      SslContextFactory.Server sslCtxFactory = new SslContextFactory.Server();
+      SslContextFactory sslCtxFactory = new SslContextFactory();
       String keystore = conf.get(THRIFT_SSL_KEYSTORE_STORE_KEY);
       String password =
         HBaseConfiguration.getPassword(conf, THRIFT_SSL_KEYSTORE_PASSWORD_KEY, null);