move RemoteClusterCredentials record

Author: slobodanadamovic

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

@@ -147,8 +147,7 @@ public <T extends TransportResponse> void sendRequest(
                 TransportRequestOptions options,
                 TransportResponseHandler<T> handler
             ) {
-                final Optional<SecurityServerTransportInterceptor.RemoteClusterCredentials> remoteClusterCredentials =
-                    getRemoteClusterCredentials(connection);
+                final Optional<RemoteClusterCredentials> remoteClusterCredentials = getRemoteClusterCredentials(connection);
                 if (remoteClusterCredentials.isPresent()) {
                     sendWithCrossClusterAccessHeaders(remoteClusterCredentials.get(), connection, action, request, options, handler);
                 } else {
@@ -164,9 +163,7 @@ public <T extends TransportResponse> void sendRequest(
             /**
              * Returns cluster credentials if the connection is remote, and cluster credentials are set up for the target cluster.
              */
-            private Optional<SecurityServerTransportInterceptor.RemoteClusterCredentials> getRemoteClusterCredentials(
-                Transport.Connection connection
-            ) {
+            private Optional<RemoteClusterCredentials> getRemoteClusterCredentials(Transport.Connection connection) {
                 final Optional<RemoteConnectionManager.RemoteClusterAliasWithCredentials> remoteClusterAliasWithCredentials =
                     remoteClusterCredentialsResolver.apply(connection);
                 if (remoteClusterAliasWithCredentials.isEmpty()) {
@@ -182,15 +179,12 @@ private Optional<SecurityServerTransportInterceptor.RemoteClusterCredentials> ge
                 }
 
                 return Optional.of(
-                    new SecurityServerTransportInterceptor.RemoteClusterCredentials(
-                        remoteClusterAlias,
-                        ApiKeyService.withApiKeyPrefix(remoteClusterCredentials.toString())
-                    )
+                    new RemoteClusterCredentials(remoteClusterAlias, ApiKeyService.withApiKeyPrefix(remoteClusterCredentials.toString()))
                 );
             }
 
             private <T extends TransportResponse> void sendWithCrossClusterAccessHeaders(
-                final SecurityServerTransportInterceptor.RemoteClusterCredentials remoteClusterCredentials,
+                final RemoteClusterCredentials remoteClusterCredentials,
                 final Transport.Connection connection,
                 final String action,
                 final TransportRequest request,
@@ -383,4 +377,12 @@ public Map<String, ServerTransportFilter> getProfileFilters(
         return Collections.unmodifiableMap(profileFilters);
     }
 
+    record RemoteClusterCredentials(String clusterAlias, String credentials) {
+
+        @Override
+        public String toString() {
+            return "RemoteClusterCredentials{clusterAlias='" + clusterAlias + "', credentials='::es_redacted::'}";
+        }
+    }
+
 }

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

@@ -420,11 +420,4 @@ public void onFailure(Exception e) {
         }
     }
 
-    record RemoteClusterCredentials(String clusterAlias, String credentials) {
-
-        @Override
-        public String toString() {
-            return "RemoteClusterCredentials{clusterAlias='" + clusterAlias + "', credentials='::es_redacted::'}";
-        }
-    }
 }