Skip to content

Commit

Permalink
HBASE-27027 Use jetty SslContextFactory.Server instead of deprecated …
Browse files Browse the repository at this point in the history
…SslContextFactory (#4425)

Signed-off-by: Duo Zhang <zhangduo@apache.org>
(cherry picked from commit 1be2c83)
  • Loading branch information
bitterfox authored and Apache9 committed May 22, 2022
1 parent b00e303 commit a6b1c7e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ public HttpServer build() throws IOException {
} else if ("https".equals(scheme)) {
HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
httpsConfig.addCustomizer(new SecureRequestCustomizer());
SslContextFactory sslCtxFactory = new SslContextFactory();
SslContextFactory.Server sslCtxFactory = new SslContextFactory.Server();
sslCtxFactory.setNeedClientAuth(needsClientAuth);
sslCtxFactory.setKeyManagerPassword(keyPassword);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ public synchronized void run() throws Exception {
HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
httpsConfig.addCustomizer(new SecureRequestCustomizer());

SslContextFactory sslCtxFactory = new SslContextFactory();
SslContextFactory.Server sslCtxFactory = new SslContextFactory.Server();
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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ protected void setupHTTPServer() throws IOException {
HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
httpsConfig.addCustomizer(new SecureRequestCustomizer());

SslContextFactory sslCtxFactory = new SslContextFactory();
SslContextFactory.Server sslCtxFactory = new SslContextFactory.Server();
String keystore = conf.get(THRIFT_SSL_KEYSTORE_STORE_KEY);
String password =
HBaseConfiguration.getPassword(conf, THRIFT_SSL_KEYSTORE_PASSWORD_KEY, null);
Expand Down

0 comments on commit a6b1c7e

Please sign in to comment.