(sling-org-apache-sling-resourceresolver) branch SLING-12701 updated: SLING-12701: MapEntries - move alias handling into inner class - remove resolver parameter from loadAliases

[reschke]

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch SLING-12701
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git


The following commit(s) were added to refs/heads/SLING-12701 by this push:
     new bc6b969f SLING-12701: MapEntries - move alias handling into inner 
class - remove resolver parameter from loadAliases
bc6b969f is described below

commit bc6b969f08876e0b91385c30329652e065e105d1
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Thu Mar 6 20:41:00 2025 +0100

    SLING-12701: MapEntries - move alias handling into inner class - remove 
resolver parameter from loadAliases
---
 .../apache/sling/resourceresolver/impl/mapping/MapEntries.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java 
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
index 294d1606..8938dbb8 100644
--- 
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
+++ 
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
@@ -806,7 +806,7 @@ public class MapEntries implements
             //optimization made in SLING-2521
             if (isOptimizeAliasResolutionEnabled) {
                 try {
-                    final Map<String, Map<String, Collection<String>>> 
loadedMap = this.loadAliases(resolver, conflictingAliases, invalidAliases);
+                    final Map<String, Map<String, Collection<String>>> 
loadedMap = this.loadAliases(conflictingAliases, invalidAliases);
                     MapEntries.this.aliasMapsMap = loadedMap;
 
                     // warn if there are more than a few defunct aliases
@@ -961,8 +961,10 @@ public class MapEntries implements
      * Load aliases - Search for all nodes (except under /jcr:system) below
      * configured alias locations having the sling:alias property
      */
-    private Map<String, Map<String, Collection<String>>> loadAliases(final 
ResourceResolver resolver,
-                                                                     
List<String> conflictingAliases, List<String> invalidAliases) {
+    private Map<String, Map<String, Collection<String>>> 
loadAliases(List<String> conflictingAliases, List<String> invalidAliases) 
throws LoginException {
+
+        final ResourceResolver resolver = factory
+                
.getServiceResourceResolver(factory.getServiceUserAuthenticationInfo("mapping"));
 
         final Map<String, Map<String, Collection<String>>> map = new 
ConcurrentHashMap<>();
         final String baseQueryString = generateAliasQuery();