(sling-org-apache-sling-resourceresolver) branch master updated: OAK-12658: move methods to minimize diffs after extracting vp handling (#143)

[reschke]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new f25ed57   OAK-12658: move methods to minimize diffs after extracting 
vp handling (#143)
f25ed57 is described below

commit f25ed578fa6b3e8cd6e7d077a99b131b7be8a3aa
Author: Julian Reschke <julian.resc...@gmx.de>
AuthorDate: Mon Feb 17 14:09:28 2025 +0100

     OAK-12658: move methods to minimize diffs after extracting vp handling 
(#143)
    
    * OAK-12658: move addEntry
    
    * OAK-12658: move updateTargetPaths
---
 .../resourceresolver/impl/mapping/MapEntries.java  | 86 +++++++++++-----------
 1 file changed, 43 insertions(+), 43 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 b993ea0..170376f 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
@@ -839,37 +839,6 @@ public class MapEntries implements
         }
     }
 
-    /**
-     * Add an entry to the resolve map.
-     */
-    private boolean addEntry(final Map<String, List<MapEntry>> entryMap, final 
String key, final MapEntry entry) {
-
-        if (entry == null) {
-            log.trace("trying to add null entry for {}", key);
-            return false;
-        } else {
-            List<MapEntry> entries = entryMap.get(key);
-            if (entries == null) {
-                entries = new ArrayList<>();
-                entries.add(entry);
-                entryMap.put(key, entries);
-            } else {
-                List<MapEntry> entriesCopy = new ArrayList<>(entries);
-                entriesCopy.add(entry);
-                // and finally sort list
-                Collections.sort(entriesCopy);
-                entryMap.put(key, entriesCopy);
-                int size = entriesCopy.size();
-                if (size == 10) {
-                    log.debug(">= 10 MapEntries for {} - check your 
configuration", key);
-                } else if (size == 100) {
-                    log.info(">= 100 MapEntries for {} - check your 
configuration", key);
-                }
-            }
-            return true;
-        }
-    }
-
     /**
      * Load aliases - Search for all nodes (except under /jcr:system) below
      * configured alias locations having the sling:alias property
@@ -1062,18 +1031,6 @@ public class MapEntries implements
         return it;
     }
 
-    private void updateTargetPaths(final Map<String, List<String>> 
targetPaths, final String key, final String entry) {
-        if (entry == null) {
-           return;
-        }
-        List<String> entries = targetPaths.get(key);
-        if (entries == null) {
-            entries = new ArrayList<>();
-            targetPaths.put(key, entries);
-        }
-        entries.add(entry);
-    }
-
     private void loadConfiguration(final MapConfigurationProvider factory, 
final List<MapEntry> entries) {
         // virtual uris
         final Map<String, String> virtuals = factory.getVirtualURLMap();
@@ -1563,6 +1520,18 @@ public class MapEntries implements
         return targetPaths;
     }
 
+    private void updateTargetPaths(final Map<String, List<String>> 
targetPaths, final String key, final String entry) {
+        if (entry == null) {
+            return;
+        }
+        List<String> entries = targetPaths.get(key);
+        if (entries == null) {
+            entries = new ArrayList<>();
+            targetPaths.put(key, entries);
+        }
+        entries.add(entry);
+    }
+
     /**
      * Load vanity path given a resource
      *
@@ -1719,4 +1688,35 @@ public class MapEntries implements
         }
         return l == null ? null : l.iterator();
     }
+
+    /**
+     * Add an entry to the resolve map.
+     */
+    private boolean addEntry(final Map<String, List<MapEntry>> entryMap, final 
String key, final MapEntry entry) {
+
+        if (entry == null) {
+            log.trace("trying to add null entry for {}", key);
+            return false;
+        } else {
+            List<MapEntry> entries = entryMap.get(key);
+            if (entries == null) {
+                entries = new ArrayList<>();
+                entries.add(entry);
+                entryMap.put(key, entries);
+            } else {
+                List<MapEntry> entriesCopy = new ArrayList<>(entries);
+                entriesCopy.add(entry);
+                // and finally sort list
+                Collections.sort(entriesCopy);
+                entryMap.put(key, entriesCopy);
+                int size = entriesCopy.size();
+                if (size == 10) {
+                    log.debug(">= 10 MapEntries for {} - check your 
configuration", key);
+                } else if (size == 100) {
+                    log.info(">= 100 MapEntries for {} - check your 
configuration", key);
+                }
+            }
+            return true;
+        }
+    }
 }