HIVE-29112: renamed conditional version of createSslContextFactory to createSslContextFactoryIf;

Author: henrib

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

@@ -304,23 +304,23 @@ static void loginServerPrincipal(Configuration conf) throws IOException {
   }
 
   /**
-   * Creates an SSL context factory if configuration states so.
+   * Creates an SSL context factory if the configuration states so.
    * @param conf the configuration
    * @return null if no ssl in config, an instance otherwise
    * @throws IOException if getting password fails
    */
   static SslContextFactory createSslContextFactory(Configuration conf) throws IOException {
-    return createSslContextFactory(conf, MetastoreConf.ConfVars.USE_SSL);
+    return createSslContextFactoryIf(conf, MetastoreConf.ConfVars.USE_SSL);
   }
 
   /**
-   * Creates an SSL context factory if configuration states so.
+   * 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 createSslContextFactory(Configuration conf, MetastoreConf.ConfVars condition) throws IOException {
+  static SslContextFactory createSslContextFactoryIf(Configuration conf, MetastoreConf.ConfVars condition) throws IOException {
     final boolean useSsl = MetastoreConf.getBoolVar(conf, condition);
     if (!useSsl) {
       return null;

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

@@ -25,7 +25,6 @@
 import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.server.handler.HandlerCollection;
 import org.eclipse.jetty.server.handler.gzip.GzipHandler;
@@ -174,7 +173,7 @@ private Server createServer() {
    */
   private static SslContextFactory createSslContextFactory(Configuration conf) {
     try {
-      return ServletSecurity.createSslContextFactory(conf, MetastoreConf.ConfVars.HTTPSERVER_USE_HTTPS);
+      return ServletSecurity.createSslContextFactoryIf(conf, MetastoreConf.ConfVars.HTTPSERVER_USE_HTTPS);
     } catch (IOException e) {
       LOGGER.error("Failed to create SSL context factory", e);
       return null;