Drop the '4' from ioSessionStrategy

Author: tvernum

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/SSLService.java

@@ -232,7 +232,7 @@ public SslProfile profile(String profileName) {
      * @return Never {@code null}.
      * @deprecated This method will fail if the SSL configuration uses a {@link org.elasticsearch.common.settings.SecureSetting} but the
      * {@link org.elasticsearch.common.settings.SecureSettings} have been closed. Use {@link #profile(String)}
-     * and {@link SslProfile#ioSessionStrategy4()}
+     * and {@link SslProfile#ioSessionStrategy()}
      * (Deprecated, but not removed because monitoring uses dynamic SSL settings)
      */
     @Deprecated
@@ -735,7 +735,7 @@ public SSLConnectionSocketFactory connectionSocketFactory() {
         }
 
         @Override
-        public SSLIOSessionStrategy ioSessionStrategy4() {
+        public SSLIOSessionStrategy ioSessionStrategy() {
             return SSLIOSessionStrategyBuilder.INSTANCE.build(this.sslConfiguration, context);
         }
 

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/SslProfile.java

@@ -41,7 +41,7 @@ public interface SslProfile {
     /**
      * @return An object that is useful for configuring Apache Http Client v4.x
      */
-    SSLIOSessionStrategy ioSessionStrategy4();
+    SSLIOSessionStrategy ioSessionStrategy();
 
     /**
      * @return An object that is useful for configuring Apache Http Client v5.x

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ssl/SSLServiceTests.java

@@ -899,7 +899,7 @@ public void testThatSSLIOSessionStrategyWithoutSettingsWorks() throws Exception
         SSLService sslService = new SSLService(env);
         SslProfile profile = sslService.profile("xpack.security.transport.ssl");
         logger.info("SSL Configuration: {}", profile.configuration());
-        SSLIOSessionStrategy sslStrategy = profile.ioSessionStrategy4();
+        SSLIOSessionStrategy sslStrategy = profile.ioSessionStrategy();
         try (CloseableHttpAsyncClient client = getAsyncHttpClient(sslStrategy)) {
             client.start();
 
@@ -920,7 +920,7 @@ public void testThatSSLIOSessionStrategyTrustsJDKTrustedCAs() throws Exception {
             .build();
         final SSLService sslService = new SSLService(TestEnvironment.newEnvironment(buildEnvSettings(settings)));
         final SslProfile profile = sslService.profile("xpack.security.transport.ssl");
-        final SSLIOSessionStrategy sslStrategy = profile.ioSessionStrategy4();
+        final SSLIOSessionStrategy sslStrategy = profile.ioSessionStrategy();
         try (CloseableHttpAsyncClient client = getAsyncHttpClient(sslStrategy)) {
             client.start();
 

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/HttpClientManager.java

@@ -118,7 +118,7 @@ public static HttpClientManager create(
     ) {
         // Set the sslStrategy to ensure an encrypted connection, as Elastic Inference Service requires it.
         final SSLIOSessionStrategy sslioSessionStrategy = sslService.profile(ELASTIC_INFERENCE_SERVICE_SSL_CONFIGURATION_PREFIX)
-            .ioSessionStrategy4();
+            .ioSessionStrategy();
         PoolingNHttpClientConnectionManager connectionManager = createConnectionManager(sslioSessionStrategy, connectionTtl);
         return new HttpClientManager(settings, connectionManager, threadPool, clusterService, throttlerManager);
     }

x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporter.java

@@ -760,7 +760,7 @@ private static SSLIOSessionStrategy configureSslStrategy(
             // Due to #registerSettingValidators we know that the settings not been dynamically updated, and the pre-configured strategy
             // is still the correct configuration for use in this exporter.
             final SslProfile profile = sslService.profile(concreteSetting.getKey());
-            sslStrategy = profile.ioSessionStrategy4();
+            sslStrategy = profile.ioSessionStrategy();
         }
         return sslStrategy;
     }

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/ssl/SSLErrorMessageCertificateVerificationTests.java

@@ -181,7 +181,7 @@ private RestClient buildRestClient(SSLService sslService, MockWebServer webServe
         final SslProfile profile = sslService.profile(HTTP_CLIENT_SSL);
         final HttpHost httpHost = new HttpHost(webServer.getHostName(), webServer.getPort(), "https");
         return RestClient.builder(httpHost)
-            .setHttpClientConfigCallback(client -> client.setSSLStrategy(profile.ioSessionStrategy4()))
+            .setHttpClientConfigCallback(client -> client.setSSLStrategy(profile.ioSessionStrategy()))
             .build();
     }