(sling-org-apache-sling-resourceresolver) branch SLING-12701 updated: SLING-12701: MapEntries - move alias handling into inner class - add factory to constructor

[re...@apache.org]

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 d836955b SLING-12701: MapEntries - move alias handling into inner class - add factory to constructor
d836955b is described below

commit d836955b61f7fec6673acb1cfbda9d274fc0f921
Author: Julian Reschke <re...@apache.org>
AuthorDate: Thu Mar 6 19:18:32 2025 +0100

    SLING-12701: MapEntries - move alias handling into inner class - add factory to constructor
---
 .../sling/resourceresolver/impl/mapping/MapEntries.java  | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 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 b4632b0a..49e2e4dd 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
@@ -159,7 +159,7 @@ public class MapEntries implements
         this.detectedConflictingAliases = new AtomicLong(0);
         this.detectedInvalidAliases = new AtomicLong(0);
 
-        this.ah = new AliasHandler();
+        this.ah = new AliasHandler(this.factory);
 
         this.useOptimizeAliasResolution = ah.initializeAliases();
 
@@ -767,6 +767,12 @@ public class MapEntries implements
 
  class AliasHandler {
 
+   private final MapConfigurationProvider factory;
+
+    public AliasHandler(MapConfigurationProvider factory) {
+        this.factory = factory;
+    }
+
     /**
      * Actual initializer. Guards itself against concurrent use by using a
      * ReentrantLock. Does nothing if the resource resolver has already been
@@ -778,15 +784,15 @@ public class MapEntries implements
         MapEntries.this.initializing.lock();
         try {
             final ResourceResolver resolver = MapEntries.this.resolver;
-            final MapConfigurationProvider factory = MapEntries.this.factory;
+            final MapConfigurationProvider factory = this.factory;
             if (resolver == null || factory == null) {
-                return MapEntries.this.factory.isOptimizeAliasResolutionEnabled();
+                return this.factory.isOptimizeAliasResolutionEnabled();
             }
 
             List<String> conflictingAliases = new ArrayList<>();
             List<String> invalidAliases = new ArrayList<>();
 
-            boolean isOptimizeAliasResolutionEnabled = MapEntries.this.factory.isOptimizeAliasResolutionEnabled();
+            boolean isOptimizeAliasResolutionEnabled = this.factory.isOptimizeAliasResolutionEnabled();
 
             //optimization made in SLING-2521
             if (isOptimizeAliasResolutionEnabled) {
@@ -997,7 +1003,7 @@ public class MapEntries implements
      * generate alias query based on configured alias locations
      */
     private String generateAliasQuery() {
-        final Set<String> allowedLocations = MapEntries.this.factory.getAllowedAliasLocations();
+        final Set<String> allowedLocations = this.factory.getAllowedAliasLocations();
 
         StringBuilder baseQuery = new StringBuilder("SELECT [sling:alias] FROM [nt:base] WHERE");