HIVE-29112: refactored ServletServerBuilder#createConnector();

- removed useless method ServletServerBuilder#createSslContextFactory();
- removed useless method ServletSecurity#createSslContextFactory();

Author: henrib

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ServletSecurity.java

@@ -320,19 +320,7 @@ static void loginServerPrincipal(Configuration conf) throws IOException {
    * @throws IOException if getting password fails
    */
   static SslContextFactory createSslContextFactory(Configuration conf) throws IOException {
-    return createSslContextFactoryIf(conf, MetastoreConf.ConfVars.USE_SSL);
-  }
-
-  /**
-   * Creates an SSL context factory if a configuration variable states so.
-   * @param conf the configuration
-   * @param condition the condition variable to check for SSL
-   * @return null if no ssl in config, an instance otherwise
-   * @throws IOException if getting password fails
-   */
-  static SslContextFactory createSslContextFactoryIf(Configuration conf, MetastoreConf.ConfVars condition)
-          throws IOException {
-    final boolean useSsl = MetastoreConf.getBoolVar(conf, condition);
+    final boolean useSsl = MetastoreConf.getBoolVar(conf, MetastoreConf.ConfVars.USE_SSL);
     if (!useSsl) {
       return null;
     }

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ServletServerBuilder.java

@@ -164,16 +164,6 @@ private Server createServer() {
     return server;
   }
 
-  /**
-   * Create an SSL context factory using the configuration.
-   *
-   * @param conf The configuration to use
-   * @return The created SslContextFactory or null if creation failed
-   */
-  private static SslContextFactory createSslContextFactory(Configuration conf) throws IOException {
-      return ServletSecurity.createSslContextFactoryIf(conf, MetastoreConf.ConfVars.USE_SSL);
-  }
-
   /**
    * Create an HTTP or HTTPS connector.
    *
@@ -185,26 +175,19 @@ private static SslContextFactory createSslContextFactory(Configuration conf) thr
    */
   private ServerConnector createConnector(Server server, SslContextFactory sslContextFactory, int port) {
     final ServerConnector connector;
-    if (sslContextFactory == null) {
-      connector = new ServerConnector(server);
-      connector.setName(HTTP);
-      HttpConnectionFactory httpFactory = connector.getConnectionFactory(HttpConnectionFactory.class);
-      // do not leak information
-      if (httpFactory != null) {
-        HttpConfiguration httpConf = httpFactory.getHttpConfiguration();
-        httpConf.setSendServerVersion(false);
-        httpConf.setSendXPoweredBy(false);
-      }
-    } else {
-      HttpConfiguration httpsConf = new HttpConfiguration();
-      httpsConf.setSecureScheme(HTTPS);
-      httpsConf.setSecurePort(port);
-      // do not leak information
-      httpsConf.setSendServerVersion(false);
-      httpsConf.setSendXPoweredBy(false);
-      httpsConf.addCustomizer(new SecureRequestCustomizer());
-      connector = new ServerConnector(server, sslContextFactory, new HttpConnectionFactory(httpsConf));
+    HttpConfiguration httpConf = new HttpConfiguration();
+    // Do not leak information
+    httpConf.setSendServerVersion(false);
+    httpConf.setSendXPoweredBy(false);
+    if (sslContextFactory != null) {
+      httpConf.setSecureScheme(HTTPS);
+      httpConf.setSecurePort(port);
+      httpConf.addCustomizer(new SecureRequestCustomizer());
+      connector = new ServerConnector(server, sslContextFactory, new HttpConnectionFactory(httpConf));
       connector.setName(HTTPS);
+    } else {
+      connector = new ServerConnector(server, new HttpConnectionFactory(httpConf));
+      connector.setName(HTTP);
     }
     connector.setPort(port);
     connector.setReuseAddress(true);
@@ -253,7 +236,7 @@ public Server startServer() throws Exception {
     }
     final Server server = createServer();
     // create the connectors
-    final SslContextFactory sslContextFactory = createSslContextFactory(configuration);
+    final SslContextFactory sslContextFactory = ServletSecurity.createSslContextFactory(configuration);
     final ServerConnector[] connectors = new ServerConnector[size];
     final ServletContextHandler[] handlers = new ServletContextHandler[size];
     Iterator<Map.Entry<Integer, ServletContextHandler>> it = handlersMap.entrySet().iterator();