Adding support for sling mappings (#1670) (#1671)

Author: rismehta

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java

@@ -22,11 +22,13 @@
 import java.util.function.Consumer;
 
 import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.osgi.services.HttpClientBuilderFactory;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.models.annotations.Default;
 import org.apache.sling.models.annotations.Exporter;
@@ -152,6 +154,9 @@ public class FormContainerImpl extends AbstractContainerImpl implements FormCont
     @Self(injectionStrategy = InjectionStrategy.OPTIONAL)
     private AutoSaveConfiguration autoSaveConfig;
 
+    @Inject
+    private ResourceResolver resourceResolver;
+
     @Override
     public String getFieldType() {
         return super.getFieldType(FieldType.FORM);
@@ -316,13 +321,13 @@ public String getAction() {
                     ComponentUtils.getEncodedPath(resource.getPath() + ".model.json");
             }
         }
-        return getContextPath() + ADOBE_GLOBAL_API_ROOT + FORMS_RUNTIME_API_GLOBAL_ROOT + "/submit/" + getId();
+        return getContextPath() + resourceResolver.map(ADOBE_GLOBAL_API_ROOT + FORMS_RUNTIME_API_GLOBAL_ROOT + "/submit/" + getId());
     }
 
     @Override
     @JsonIgnore
     public String getDataUrl() {
-        return getContextPath() + ADOBE_GLOBAL_API_ROOT + FORMS_RUNTIME_API_GLOBAL_ROOT + "/data/" + getId();
+        return getContextPath() + resourceResolver.map(ADOBE_GLOBAL_API_ROOT + FORMS_RUNTIME_API_GLOBAL_ROOT + "/data/" + getId());
     }
 
     @Override
@@ -460,7 +465,8 @@ public String getName() {
 
     @Override
     public String getCustomFunctionUrl() {
-        return getContextPath() + ADOBE_GLOBAL_API_ROOT + FORMS_RUNTIME_API_GLOBAL_ROOT + "/customfunctions/" + getId();
+        return getContextPath() + resourceResolver.map(ADOBE_GLOBAL_API_ROOT + FORMS_RUNTIME_API_GLOBAL_ROOT + "/customfunctions/"
+            + getId());
     }
 
     @JsonIgnore

bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java

@@ -227,6 +227,66 @@ void testGetDataUrl() throws Exception {
             .getDataUrl());
     }
 
+    @Test
+    void testGetActionWithResourceResolverMapping() throws Exception {
+        // Create a spy of the resource resolver to mock the map method
+        org.apache.sling.api.resource.ResourceResolver resourceResolver = Mockito.spy(context.resourceResolver());
+
+        // Mock the map method to return a mapped path
+        String originalPath = "/adobe/forms/af/submit/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==";
+        String mappedPath = "/content/adobe/forms/af/submit/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==";
+        Mockito.when(resourceResolver.map("/adobe/forms/af/submit/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==")).thenReturn(mappedPath);
+
+        // Set the mocked resource resolver in the context
+        context.registerService(org.apache.sling.api.resource.ResourceResolver.class, resourceResolver);
+
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
+        String action = formContainer.getAction();
+
+        // Verify that the mapped path is used in the action URL
+        assertTrue(action.contains(mappedPath));
+
+        // Verify that the map method was called with the correct path (called during mock setup + actual execution)
+        Mockito.verify(resourceResolver, times(2)).map("/adobe/forms/af/submit/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==");
+    }
+
+    @Test
+    void testGetDataUrlWithResourceResolverMapping() throws Exception {
+        // Create a spy of the resource resolver to mock the map method
+        org.apache.sling.api.resource.ResourceResolver resourceResolver = Mockito.spy(context.resourceResolver());
+
+        // Mock the map method to return a mapped path
+        String originalPath = "/adobe/forms/af/data/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==";
+        String mappedPath = "/content/adobe/forms/af/data/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==";
+        Mockito.when(resourceResolver.map("/adobe/forms/af/data/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==")).thenReturn(mappedPath);
+
+        // Set the mocked resource resolver in the context
+        context.registerService(org.apache.sling.api.resource.ResourceResolver.class, resourceResolver);
+
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
+        String dataUrl = formContainer.getDataUrl();
+
+        // Verify that the mapped path is used in the data URL
+        assertTrue(dataUrl.contains(mappedPath));
+        assertEquals(mappedPath, dataUrl);
+
+        // Verify that the map method was called with the correct path (called during mock setup + actual execution)
+        Mockito.verify(resourceResolver, times(2)).map("/adobe/forms/af/data/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==");
+    }
+
+    @Test
+    void testResourceResolverMappingIdentityWhenNoMapping() throws Exception {
+        // Test the case where resourceResolver.map() returns the same path (no mapping configured)
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
+
+        String action = formContainer.getAction();
+        String dataUrl = formContainer.getDataUrl();
+
+        // These should match the original expected values when no mapping is applied
+        assertEquals("/adobe/forms/af/submit/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==", action);
+        assertEquals("/adobe/forms/af/data/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==", dataUrl);
+    }
+
     @Test
     void testGetDorProperties() throws Exception {
         FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
@@ -597,6 +657,30 @@ void testCustomFunctionUrl() throws Exception {
         assertEquals("/adobe/forms/af/customfunctions/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==", formContainer.getCustomFunctionUrl());
     }
 
+    @Test
+    void testGetCustomFunctionUrlWithResourceResolverMapping() throws Exception {
+        // Create a spy of the resource resolver to mock the map method
+        org.apache.sling.api.resource.ResourceResolver resourceResolver = Mockito.spy(context.resourceResolver());
+
+        // Mock the map method to return a mapped path
+        String originalPath = "/adobe/forms/af/customfunctions/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==";
+        String mappedPath = "/content/adobe/forms/af/customfunctions/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==";
+        Mockito.when(resourceResolver.map("/adobe/forms/af/customfunctions/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==")).thenReturn(mappedPath);
+
+        // Set the mocked resource resolver in the context
+        context.registerService(org.apache.sling.api.resource.ResourceResolver.class, resourceResolver);
+
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
+        String customFunctionUrl = formContainer.getCustomFunctionUrl();
+
+        // Verify that the mapped path is used in the custom function URL
+        assertTrue(customFunctionUrl.contains(mappedPath));
+        assertEquals(mappedPath, customFunctionUrl);
+
+        // Verify that the map method was called with the correct path (called during mock setup + actual execution)
+        Mockito.verify(resourceResolver, times(2)).map("/adobe/forms/af/customfunctions/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==");
+    }
+
     @Test
     public void testGetAutoSaveProperties() throws Exception {
         context.load().json(BASE + "/test-content-auto-save.json", PATH_FORM_WITH_AUTO_SAVE);