Fix sig

Author: n1v0lg

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

@@ -1127,8 +1127,8 @@ Collection<Object> createComponents(
                 apiKeyService,
                 serviceAccountService,
                 operatorPrivilegesService.get(),
-                telemetryProvider.getMeterRegistry(),
-                cloudApiKeyService.get()
+                cloudApiKeyService.get(),
+                telemetryProvider.getMeterRegistry()
             )
         );
         components.add(authcService.get());

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/AuthenticationService.java

@@ -93,8 +93,8 @@ public AuthenticationService(
         ApiKeyService apiKeyService,
         ServiceAccountService serviceAccountService,
         OperatorPrivilegesService operatorPrivilegesService,
-        MeterRegistry meterRegistry,
-        CloudApiKeyService cloudApiKeyService
+        CloudApiKeyService cloudApiKeyService,
+        MeterRegistry meterRegistry
     ) {
         this.realms = realms;
         this.auditTrailService = auditTrailService;

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/AuthenticationServiceTests.java

@@ -372,8 +372,8 @@ public void init() throws Exception {
             apiKeyService,
             serviceAccountService,
             operatorPrivilegesService,
-            MeterRegistry.NOOP,
-            mock()
+            mock(),
+            MeterRegistry.NOOP
         );
     }
 
@@ -666,8 +666,8 @@ public void testAuthenticateSmartRealmOrderingDisabled() {
             apiKeyService,
             serviceAccountService,
             operatorPrivilegesService,
-            MeterRegistry.NOOP,
-            mock()
+            mock(),
+            MeterRegistry.NOOP
         );
         User user = new User("_username", "r1");
         when(firstRealm.supports(token)).thenReturn(true);
@@ -1051,8 +1051,8 @@ public void testAuthenticateTransportContextAndHeader() throws Exception {
                 apiKeyService,
                 serviceAccountService,
                 operatorPrivilegesService,
-                MeterRegistry.NOOP,
-                mock()
+                mock(),
+                MeterRegistry.NOOP
             );
             boolean requestIdAlreadyPresent = randomBoolean();
             SetOnce<String> reqId = new SetOnce<>();
@@ -1103,8 +1103,8 @@ public void testAuthenticateTransportContextAndHeader() throws Exception {
                     apiKeyService,
                     serviceAccountService,
                     operatorPrivilegesService,
-                    MeterRegistry.NOOP,
-                    mock()
+                    mock(),
+                    MeterRegistry.NOOP
                 );
                 threadContext2.putHeader(AuthenticationField.AUTHENTICATION_KEY, authHeaderRef.get());
 
@@ -1128,8 +1128,8 @@ public void testAuthenticateTransportContextAndHeader() throws Exception {
                 apiKeyService,
                 serviceAccountService,
                 operatorPrivilegesService,
-                MeterRegistry.NOOP,
-                mock()
+                mock(),
+                MeterRegistry.NOOP
             );
             service.authenticate("_action", new InternalRequest(), InternalUsers.SYSTEM_USER, ActionListener.wrap(result -> {
                 if (requestIdAlreadyPresent) {
@@ -1192,8 +1192,8 @@ public void testWrongTokenDoesNotFallbackToAnonymous() {
             apiKeyService,
             serviceAccountService,
             operatorPrivilegesService,
-            MeterRegistry.NOOP,
-            mock()
+            mock(),
+            MeterRegistry.NOOP
         );
 
         try (ThreadContext.StoredContext ignore = threadContext.stashContext()) {
@@ -1238,8 +1238,8 @@ public void testWrongApiKeyDoesNotFallbackToAnonymous() {
             apiKeyService,
             serviceAccountService,
             operatorPrivilegesService,
-            MeterRegistry.NOOP,
-            mock()
+            mock(),
+            MeterRegistry.NOOP
         );
         doAnswer(invocationOnMock -> {
             final GetRequest request = (GetRequest) invocationOnMock.getArguments()[0];
@@ -1304,8 +1304,8 @@ public void testAnonymousUserRest() throws Exception {
             apiKeyService,
             serviceAccountService,
             operatorPrivilegesService,
-            MeterRegistry.NOOP,
-            mock()
+            mock(),
+            MeterRegistry.NOOP
         );
         RestRequest request = new FakeRestRequest();
 
@@ -1342,8 +1342,8 @@ public void testAuthenticateRestRequestDisallowAnonymous() throws Exception {
             apiKeyService,
             serviceAccountService,
             operatorPrivilegesService,
-            MeterRegistry.NOOP,
-            mock()
+            mock(),
+            MeterRegistry.NOOP
         );
         RestRequest request = new FakeRestRequest();
 
@@ -1375,8 +1375,8 @@ public void testAnonymousUserTransportNoDefaultUser() throws Exception {
             apiKeyService,
             serviceAccountService,
             operatorPrivilegesService,
-            MeterRegistry.NOOP,
-            mock()
+            mock(),
+            MeterRegistry.NOOP
         );
         InternalRequest message = new InternalRequest();
         boolean requestIdAlreadyPresent = randomBoolean();
@@ -1412,8 +1412,8 @@ public void testAnonymousUserTransportWithDefaultUser() throws Exception {
             apiKeyService,
             serviceAccountService,
             operatorPrivilegesService,
-            MeterRegistry.NOOP,
-            mock()
+            mock(),
+            MeterRegistry.NOOP
         );
 
         InternalRequest message = new InternalRequest();

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/support/SecondaryAuthenticatorTests.java

@@ -160,8 +160,8 @@ public void setupMocks() throws Exception {
             apiKeyService,
             serviceAccountService,
             OperatorPrivileges.NOOP_OPERATOR_PRIVILEGES_SERVICE,
-            MeterRegistry.NOOP,
-            mock()
+            mock(),
+            MeterRegistry.NOOP
         );
         authenticator = new SecondaryAuthenticator(securityContext, authenticationService, auditTrail);
     }