You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by re...@apache.org on 2025/02/17 13:08:19 UTC
(sling-org-apache-sling-resourceresolver) branch OAK-12658 created (now d1111dc)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch OAK-12658
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
at d1111dc OAK-12658: move updateTargetPaths
This branch includes the following new commits:
new 42ec45b OAK-12658: move addEntry
new d1111dc OAK-12658: move updateTargetPaths
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(sling-org-apache-sling-resourceresolver) 01/02: OAK-12658: move addEntry
Posted by re...@apache.org.
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 <ju...@gmx.de>
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;
+ }
+ }
}
(sling-org-apache-sling-resourceresolver) 02/02: OAK-12658: move updateTargetPaths
Posted by re...@apache.org.
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 d1111dcd44d0ea2bcc51fee023e985582aa0f8fa
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Mon Feb 17 14:08:04 2025 +0100
OAK-12658: move updateTargetPaths
---
.../resourceresolver/impl/mapping/MapEntries.java | 24 +++++++++++-----------
1 file changed, 12 insertions(+), 12 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 cef5655..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
@@ -1031,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();
@@ -1532,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
*