move to using new constructor part 2

Author: slobodanadamovic

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java

@@ -19,7 +19,6 @@
 import org.elasticsearch.license.XPackLicenseState;
 import org.elasticsearch.tasks.Task;
 import org.elasticsearch.threadpool.ThreadPool;
-import org.elasticsearch.transport.RemoteConnectionManager;
 import org.elasticsearch.transport.RemoteConnectionManager.RemoteClusterAliasWithCredentials;
 import org.elasticsearch.transport.SendRequestTransportException;
 import org.elasticsearch.transport.Transport;
@@ -74,31 +73,6 @@ public SecurityServerTransportInterceptor(
         this.profileFilters = this.remoteClusterTransportInterceptor.getProfileFilters(profileConfigurations, destructiveOperations);
     }
 
-    public SecurityServerTransportInterceptor(
-        Settings settings,
-        ThreadPool threadPool,
-        AuthenticationService authcService,
-        AuthorizationService authzService,
-        SSLService sslService,
-        SecurityContext securityContext,
-        DestructiveOperations destructiveOperations,
-        CrossClusterAccessAuthenticationService crossClusterAccessAuthcService,
-        XPackLicenseState licenseState
-    ) {
-        this(
-            settings,
-            threadPool,
-            authcService,
-            authzService,
-            sslService,
-            securityContext,
-            destructiveOperations,
-            crossClusterAccessAuthcService,
-            licenseState,
-            RemoteConnectionManager::resolveRemoteClusterAliasWithCredentials
-        );
-    }
-
     SecurityServerTransportInterceptor(
         Settings settings,
         ThreadPool threadPool,

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptorTests.java

@@ -205,16 +205,21 @@ public void testSendAsyncSwitchToSystem() throws Exception {
         SecurityServerTransportInterceptor interceptor = new SecurityServerTransportInterceptor(
             settings,
             threadPool,
-            mock(AuthenticationService.class),
-            mock(AuthorizationService.class),
             mockSslService(),
             securityContext,
             new DestructiveOperations(
                 Settings.EMPTY,
                 new ClusterSettings(Settings.EMPTY, Collections.singleton(DestructiveOperations.REQUIRES_NAME_SETTING))
             ),
-            mock(CrossClusterAccessAuthenticationService.class),
-            mockLicenseState
+            new CrossClusterAccessTransportInterceptor(
+                mock(CrossClusterAccessAuthenticationService.class),
+                mock(AuthenticationService.class),
+                mock(AuthorizationService.class),
+                mockLicenseState,
+                securityContext,
+                threadPool,
+                settings
+            )
         );
         ClusterServiceUtils.setState(clusterService, clusterService.state()); // force state update to trigger listener
 
@@ -249,16 +254,21 @@ public void testSendWithoutUser() throws Exception {
         SecurityServerTransportInterceptor interceptor = new SecurityServerTransportInterceptor(
             settings,
             threadPool,
-            mock(AuthenticationService.class),
-            mock(AuthorizationService.class),
             mockSslService(),
             securityContext,
             new DestructiveOperations(
                 Settings.EMPTY,
                 new ClusterSettings(Settings.EMPTY, Collections.singleton(DestructiveOperations.REQUIRES_NAME_SETTING))
             ),
-            mock(CrossClusterAccessAuthenticationService.class),
-            mockLicenseState
+            new CrossClusterAccessTransportInterceptor(
+                mock(CrossClusterAccessAuthenticationService.class),
+                mock(AuthenticationService.class),
+                mock(AuthorizationService.class),
+                mockLicenseState,
+                securityContext,
+                threadPool,
+                settings
+            )
         ) {
             @Override
             void assertNoAuthentication(String action) {}
@@ -311,16 +321,21 @@ public void testSendToNewerVersionSetsCorrectVersion() throws Exception {
         SecurityServerTransportInterceptor interceptor = new SecurityServerTransportInterceptor(
             settings,
             threadPool,
-            mock(AuthenticationService.class),
-            mock(AuthorizationService.class),
             mockSslService(),
             securityContext,
             new DestructiveOperations(
                 Settings.EMPTY,
                 new ClusterSettings(Settings.EMPTY, Collections.singleton(DestructiveOperations.REQUIRES_NAME_SETTING))
             ),
-            mock(CrossClusterAccessAuthenticationService.class),
-            mockLicenseState
+            new CrossClusterAccessTransportInterceptor(
+                mock(CrossClusterAccessAuthenticationService.class),
+                mock(AuthenticationService.class),
+                mock(AuthorizationService.class),
+                mockLicenseState,
+                securityContext,
+                threadPool,
+                settings
+            )
         );
         ClusterServiceUtils.setState(clusterService, clusterService.state()); // force state update to trigger listener
 
@@ -379,16 +394,21 @@ public void testSendToOlderVersionSetsCorrectVersion() throws Exception {
         SecurityServerTransportInterceptor interceptor = new SecurityServerTransportInterceptor(
             settings,
             threadPool,
-            mock(AuthenticationService.class),
-            mock(AuthorizationService.class),
             mockSslService(),
             securityContext,
             new DestructiveOperations(
                 Settings.EMPTY,
                 new ClusterSettings(Settings.EMPTY, Collections.singleton(DestructiveOperations.REQUIRES_NAME_SETTING))
             ),
-            mock(CrossClusterAccessAuthenticationService.class),
-            mockLicenseState
+            new CrossClusterAccessTransportInterceptor(
+                mock(CrossClusterAccessAuthenticationService.class),
+                mock(AuthenticationService.class),
+                mock(AuthorizationService.class),
+                mockLicenseState,
+                securityContext,
+                threadPool,
+                settings
+            )
         );
         ClusterServiceUtils.setState(clusterService, clusterService.state()); // force state update to trigger listener
 
@@ -445,16 +465,21 @@ public void testSetUserBasedOnActionOrigin() {
         SecurityServerTransportInterceptor interceptor = new SecurityServerTransportInterceptor(
             settings,
             threadPool,
-            mock(AuthenticationService.class),
-            mock(AuthorizationService.class),
             mockSslService(),
             securityContext,
             new DestructiveOperations(
                 Settings.EMPTY,
                 new ClusterSettings(Settings.EMPTY, Collections.singleton(DestructiveOperations.REQUIRES_NAME_SETTING))
             ),
-            mock(CrossClusterAccessAuthenticationService.class),
-            mockLicenseState
+            new CrossClusterAccessTransportInterceptor(
+                mock(CrossClusterAccessAuthenticationService.class),
+                mock(AuthenticationService.class),
+                mock(AuthorizationService.class),
+                mockLicenseState,
+                securityContext,
+                threadPool,
+                settings
+            )
         );
 
         final AtomicBoolean calledWrappedSender = new AtomicBoolean(false);
@@ -1155,16 +1180,21 @@ public void testProfileFiltersCreatedDifferentlyForDifferentTransportAndRemoteCl
         final var securityServerTransportInterceptor = new SecurityServerTransportInterceptor(
             builder.build(),
             threadPool,
-            mock(AuthenticationService.class),
-            mock(AuthorizationService.class),
             sslService,
             securityContext,
             new DestructiveOperations(
                 Settings.EMPTY,
                 new ClusterSettings(Settings.EMPTY, Collections.singleton(DestructiveOperations.REQUIRES_NAME_SETTING))
             ),
-            mock(CrossClusterAccessAuthenticationService.class),
-            mockLicenseState
+            new CrossClusterAccessTransportInterceptor(
+                mock(CrossClusterAccessAuthenticationService.class),
+                mock(AuthenticationService.class),
+                mock(AuthorizationService.class),
+                mockLicenseState,
+                securityContext,
+                threadPool,
+                builder.build()
+            )
         );
 
         final Map<String, ServerTransportFilter> profileFilters = securityServerTransportInterceptor.getProfileFilters();
@@ -1213,16 +1243,21 @@ public void testNoProfileFilterForRemoteClusterWhenTheFeatureIsDisabled() {
         final var securityServerTransportInterceptor = new SecurityServerTransportInterceptor(
             builder.build(),
             threadPool,
-            mock(AuthenticationService.class),
-            mock(AuthorizationService.class),
             sslService,
             securityContext,
             new DestructiveOperations(
                 Settings.EMPTY,
                 new ClusterSettings(Settings.EMPTY, Collections.singleton(DestructiveOperations.REQUIRES_NAME_SETTING))
             ),
-            mock(CrossClusterAccessAuthenticationService.class),
-            mockLicenseState
+            new CrossClusterAccessTransportInterceptor(
+                mock(CrossClusterAccessAuthenticationService.class),
+                mock(AuthenticationService.class),
+                mock(AuthorizationService.class),
+                mockLicenseState,
+                securityContext,
+                threadPool,
+                builder.build()
+            )
         );
 
         final Map<String, ServerTransportFilter> profileFilters = securityServerTransportInterceptor.getProfileFilters();