fixup!

Author: jfreden

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

@@ -85,24 +85,23 @@ default boolean checkPreConditions(SecurityIndexManager.State securityIndexManag
 
     public static final Integer ROLE_METADATA_FLATTENED_MIGRATION_VERSION = 1;
     public static final Integer ROLE_MAPPING_CLEANUP_DUPLICATES = 2;
+    private static final Logger logger = LogManager.getLogger(SecurityMigration.class);
 
     public static final TreeMap<Integer, SecurityMigration> MIGRATIONS_BY_VERSION = new TreeMap<>(
         Map.of(ROLE_METADATA_FLATTENED_MIGRATION_VERSION, new SecurityMigration() {
-            private static final Logger logger = LogManager.getLogger(SecurityMigration.class);
-
             @Override
-            public void migrate(SecurityIndexManager securityIndexManager, Client client, ActionListener<Void> listener) {
+            public void migrate(SecurityIndexManager indexManager, Client client, ActionListener<Void> listener) {
                 BoolQueryBuilder filterQuery = new BoolQueryBuilder().filter(QueryBuilders.termQuery("type", "role"))
                     .mustNot(QueryBuilders.existsQuery("metadata_flattened"));
                 SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().query(filterQuery).size(0).trackTotalHits(true);
-                SearchRequest countRequest = new SearchRequest(securityIndexManager.getConcreteIndexName());
+                SearchRequest countRequest = new SearchRequest(indexManager.getConcreteIndexName());
                 countRequest.source(searchSourceBuilder);
 
                 client.search(countRequest, ActionListener.wrap(response -> {
                     // If there are no roles, skip migration
                     if (response.getHits().getTotalHits().value > 0) {
                         logger.info("Preparing to migrate [" + response.getHits().getTotalHits().value + "] roles");
-                        updateRolesByQuery(securityIndexManager.getConcreteIndexName(), client, filterQuery, listener);
+                        updateRolesByQuery(indexManager.getConcreteIndexName(), client, filterQuery, listener);
                     } else {
                         listener.onResponse(null);
                     }
@@ -138,11 +137,9 @@ public int minMappingVersion() {
                 return ADD_REMOTE_CLUSTER_AND_DESCRIPTION_FIELDS.id();
             }
         }, ROLE_MAPPING_CLEANUP_DUPLICATES, new SecurityMigration() {
-            private static final Logger logger = LogManager.getLogger(SecurityMigration.class);
-
             @Override
-            public void migrate(SecurityIndexManager securityIndexManager, Client client, ActionListener<Void> listener) {
-                Set<String> clusterStateRoleMappingNames = securityIndexManager.getReservedStateRoleMappingNames();
+            public void migrate(SecurityIndexManager indexManager, Client client, ActionListener<Void> listener) {
+                Set<String> clusterStateRoleMappingNames = indexManager.getReservedStateRoleMappingNames();
 
                 // No role mappings in cluster state -> no cleanup needed
                 if (clusterStateRoleMappingNames.isEmpty()) {