From 24e14337e546efa7ce2933d5bef13aea21aa3386 Mon Sep 17 00:00:00 2001 From: Nikolaj Volgushev Date: Mon, 21 Aug 2023 17:46:39 +0200 Subject: [PATCH] Nit --- .../org/elasticsearch/xpack/security/Security.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java index b4e441541ec22..f6f62c443060c 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java @@ -543,7 +543,7 @@ public class Security extends Plugin private final SetOnce threadContext = new SetOnce<>(); private final SetOnce tokenService = new SetOnce<>(); private final SetOnce securityActionFilter = new SetOnce<>(); - private final SetOnce crossClusterAccessAuthcServiceRef = new SetOnce<>(); + private final SetOnce crossClusterAccessAuthcService = new SetOnce<>(); private final SetOnce sharedGroupFactory = new SetOnce<>(); private final SetOnce dlsBitsetCache = new SetOnce<>(); @@ -994,13 +994,8 @@ Collection createComponents( final RemoteClusterCredentialsResolver remoteClusterCredentialsResolver = new RemoteClusterCredentialsResolver(settings); DestructiveOperations destructiveOperations = new DestructiveOperations(settings, clusterService.getClusterSettings()); - final CrossClusterAccessAuthenticationService crossClusterAccessAuthcService = new CrossClusterAccessAuthenticationService( - clusterService, - apiKeyService, - authcService.get() - ); - crossClusterAccessAuthcServiceRef.set(crossClusterAccessAuthcService); - components.add(crossClusterAccessAuthcService); + crossClusterAccessAuthcService.set(new CrossClusterAccessAuthenticationService(clusterService, apiKeyService, authcService.get())); + components.add(crossClusterAccessAuthcService.get()); securityInterceptor.set( new SecurityServerTransportInterceptor( settings, @@ -1010,7 +1005,7 @@ Collection createComponents( getSslService(), securityContext.get(), destructiveOperations, - crossClusterAccessAuthcServiceRef.get(), + crossClusterAccessAuthcService.get(), remoteClusterCredentialsResolver, getLicenseState() )