(sling-org-apache-sling-resourceresolver) branch 1.x updated: SLING-12908: alias refactoring - remove warn/loggingfor non-optimize case (#198)

[reschke]

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

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


The following commit(s) were added to refs/heads/1.x by this push:
     new c0d93376 SLING-12908: alias refactoring - remove warn/loggingfor 
non-optimize case (#198)
c0d93376 is described below

commit c0d933766a17b9a054d22ad49844476f52ecd23b
Author: Julian Reschke <julian.resc...@gmx.de>
AuthorDate: Mon Aug 25 19:19:09 2025 +0200

    SLING-12908: alias refactoring - remove warn/loggingfor non-optimize case 
(#198)
---
 .../resourceresolver/impl/mapping/AliasHandler.java    | 18 ------------------
 .../resourceresolver/impl/mapping/MapEntries.java      |  5 -----
 .../impl/mapping/MapEntriesHandler.java                | 10 ----------
 3 files changed, 33 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/AliasHandler.java
 
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/AliasHandler.java
index fdc8fa6b..4f1cdfe4 100644
--- 
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/AliasHandler.java
+++ 
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/AliasHandler.java
@@ -201,7 +201,6 @@ class AliasHandler {
             } catch (Exception ex) {
                 log.error("Alias init failed", ex);
                 aliasMapsMap = UNITIALIZED_MAP;
-                logDisableAliasOptimization(ex);
             }
         }
 
@@ -654,21 +653,4 @@ class AliasHandler {
         }
         return invalid;
     }
-
-    private final AtomicLong lastTimeLogged = new AtomicLong(-1);
-
-    void logDisableAliasOptimization(@Nullable Exception e) {
-        if (e != null) {
-            log.error(
-                    "Unexpected problem during initialization of optimize 
alias resolution. Therefore disabling optimize alias resolution. Please fix the 
problem.",
-                    e);
-        } else {
-            final long now = System.currentTimeMillis();
-            long LOGGING_ERROR_PERIOD = TimeUnit.MINUTES.toMillis(5);
-            if (now - lastTimeLogged.getAndSet(now) > LOGGING_ERROR_PERIOD) {
-                log.error(
-                        "A problem occurred during initialization of optimize 
alias resolution. Optimize alias resolution is disabled. Check the logs for the 
reported problem.");
-            }
-        }
-    }
 }
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 fa9a48bd..62f8b9c8 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
@@ -751,11 +751,6 @@ public class MapEntries implements MapEntriesHandler, 
ResourceChangeListener, Ex
         }
     }
 
-    @Override
-    public void logDisableAliasOptimization() {
-        this.ah.logDisableAliasOptimization(null);
-    }
-
     private MapEntry getMapEntry(final String url, final int status, final 
String... redirect) {
         try {
             return new MapEntry(url, status, false, 0, redirect);
diff --git 
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesHandler.java
 
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesHandler.java
index 64ac5733..e00d0ff1 100644
--- 
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesHandler.java
+++ 
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesHandler.java
@@ -76,11 +76,6 @@ public interface MapEntriesHandler {
         public boolean isOptimizeAliasResolutionEnabled() {
             return false;
         }
-
-        @Override
-        public void logDisableAliasOptimization() {
-            // nothing to do
-        }
     };
 
     /**
@@ -90,11 +85,6 @@ public interface MapEntriesHandler {
      */
     boolean isOptimizeAliasResolutionEnabled();
 
-    /**
-     * Log an error if alias optimization should be used but is currently 
disabled
-     */
-    void logDisableAliasOptimization();
-
     /**
      * Returns all alias entries for children of the specified 
<code>parentPath</code>
      *