This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-12658 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit 42ec45b02642c3c4a8bee7f0dcd7939d16e9417a Author: Julian Reschke <[email protected]> AuthorDate: Mon Feb 17 13:57:18 2025 +0100 OAK-12658: move addEntry --- .../resourceresolver/impl/mapping/MapEntries.java | 62 +++++++++++----------- 1 file changed, 31 insertions(+), 31 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..cef5655 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 @@ -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; + } + } }
