[sling-org-apache-sling-resourceresolver] branch master updated: SLING-12025: Incorrect aliasing when optimzed alias resolution is off (#105)

[joerghoh]

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

joerghoh 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 5b07c7a  SLING-12025: Incorrect aliasing when optimzed alias 
resolution is off (#105)
5b07c7a is described below

commit 5b07c7a50d92ecc143c55cb022ee47fb55d77287
Author: Jörg Hoh <joerg...@users.noreply.github.com>
AuthorDate: Fri Sep 29 10:51:19 2023 +0200

    SLING-12025: Incorrect aliasing when optimzed alias resolution is off (#105)
    
    SLING-12025: document the inconsistent behavior in a test case
---
 .../impl/mapping/ResourceMapperImplTest.java       | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git 
a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/ResourceMapperImplTest.java
 
b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/ResourceMapperImplTest.java
index 42bbfe0..4e57850 100644
--- 
a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/ResourceMapperImplTest.java
+++ 
b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/ResourceMapperImplTest.java
@@ -109,6 +109,8 @@ public class ResourceMapperImplTest {
         resourceProvider.putResource("/there-multiple", PROP_ALIAS, 
"alias-value-3", "alias-value-4"); // with multivalued alias
         resourceProvider.putResource("/somewhere", PROP_ALIAS, 
"alias-value-2"); // with alias and also /etc/map
         resourceProvider.putResource("/there/that"); // parent has alias
+        resourceProvider.putResource("/content1");
+        resourceProvider.putResource("/content1/jcr:content", PROP_ALIAS, 
"jcr:content-alias"); // jcr:content resource
         resourceProvider.putResource("/content");
         resourceProvider.putResource("/content/virtual");
         resourceProvider.putResource("/content/virtual/foo"); // matches 
virtual.host.com.80 mapping entry
@@ -231,6 +233,38 @@ public class ResourceMapperImplTest {
             .allMappingsWithRequest("/app/alias-value", "/app/there")
             .verify(resolver, req);
     }
+    
+    /**
+     * Validates that a jcr:content resource cannot be aliased, but instead 
its parent resource is
+     * 
+     * NOTE: There is a bug in this behavior:
+     * * if optimiseAliasResolution is true, the behavior is working as 
expected
+     * * if optimiseAliasResolution is false the aliasing is not working
+     * 
+     * This bug exists for quite some time (and therefore should be considered 
a feature by now), so 
+     * this test expects different outcome in this case. Also see SLING-12025
+     *
+     * @throws LoginException
+     */
+    @Test
+    public void mapJcrContentResourceWithAlias() {
+
+        if (this.optimiseAliasResolution) {
+            ExpectedMappings.existingResource("/content1/jcr:content")
+                .singleMapping("/jcr:content-alias/jcr:content")
+                .singleMappingWithRequest("/app/jcr:content-alias/jcr:content")
+                .allMappings("/jcr:content-alias/jcr:content", 
"/content1/jcr:content")
+                .allMappingsWithRequest("/app/content1/jcr:content", 
"/app/jcr:content-alias/jcr:content")
+                .verify(resolver, req);
+        } else {
+            ExpectedMappings.existingResource("/content1/jcr:content")
+                .singleMapping("/content1/jcr:content")
+                .singleMappingWithRequest("/app/content1/jcr:content")
+                .allMappings("/content1/jcr:content")
+                .allMappingsWithRequest("/app/content1/jcr:content")
+                .verify(resolver, req);
+        }
+    }
 
     /**
      * Validates that mappings for a existing resource with multiple alias 
contain the alias and the resource's path