FORMS-17068 Fetch custom properties from CoreComponentCustomPropertiesProvider which are behind FT and make part of FormContainer get properties. (#1467)

Also updated FOrms SDK version

Author: girotraapankaj

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

@@ -27,16 +27,14 @@
 import org.apache.sling.models.annotations.Default;
 import org.apache.sling.models.annotations.Exporter;
 import org.apache.sling.models.annotations.Model;
-import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
-import org.apache.sling.models.annotations.injectorspecific.Self;
-import org.apache.sling.models.annotations.injectorspecific.SlingObject;
-import org.apache.sling.models.annotations.injectorspecific.ValueMapValue;
+import org.apache.sling.models.annotations.injectorspecific.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.adobe.aemds.guide.common.GuideContainer;
+import com.adobe.aemds.guide.service.CoreComponentCustomPropertiesProvider;
 import com.adobe.aemds.guide.service.GuideSchemaType;
 import com.adobe.aemds.guide.utils.GuideConstants;
 import com.adobe.aemds.guide.utils.GuideUtils;
@@ -80,6 +78,9 @@ public class FormContainerImpl extends AbstractContainerImpl implements FormCont
     public static final String FD_FORM_DATA_ENABLED = "fd:formDataEnabled";
     public static final String FD_ROLE_ATTRIBUTE = "fd:roleAttribute";
 
+    @OSGiService(injectionStrategy = InjectionStrategy.OPTIONAL)
+    private CoreComponentCustomPropertiesProvider coreComponentCustomPropertiesProvider;
+
     @SlingObject(injectionStrategy = InjectionStrategy.OPTIONAL)
     @Nullable
     private SlingHttpServletRequest request;
@@ -318,7 +319,14 @@ public String getLanguageDirection() {
 
     @Override
     public @NotNull Map<String, Object> getProperties() {
-        Map<String, Object> properties = super.getProperties();
+        Map<String, Object> properties = new LinkedHashMap<>();
+        if (coreComponentCustomPropertiesProvider != null) {
+            Map<String, Object> customProperties = coreComponentCustomPropertiesProvider.getProperties();
+            if (customProperties != null) {
+                properties.putAll(customProperties);
+            }
+        }
+        properties.putAll(super.getProperties());
         if (getSchemaType() != null) {
             properties.put(FD_SCHEMA_TYPE, getSchemaType());
         }

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

@@ -23,6 +23,7 @@
 
 import com.adobe.aemds.guide.model.HCaptchaConfiguration;
 import com.adobe.aemds.guide.model.ReCaptchaConfigurationModel;
+import com.adobe.aemds.guide.model.TurnstileConfiguration;
 import com.adobe.aemds.guide.service.CloudConfigurationProvider;
 import com.adobe.aemds.guide.service.GuideException;
 import com.adobe.cq.forms.core.Utils;
@@ -54,10 +55,20 @@ public ReCaptchaConfigurationModel getRecaptchaCloudConfiguration(Resource resou
             return null;
         }
 
+        @Override
+        public String getCustomFunctionUrl(Resource resource) {
+            return null;
+        }
+
         @Override
         public HCaptchaConfiguration getHCaptchaCloudConfiguration(Resource resource) throws GuideException {
             return hCaptchaConfiguration;
         }
+
+        @Override
+        public TurnstileConfiguration getTurnstileCloudConfiguration(Resource resource) throws GuideException {
+            return null;
+        }
     };
 
     @BeforeEach

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

@@ -25,6 +25,7 @@
 
 import com.adobe.aemds.guide.model.HCaptchaConfiguration;
 import com.adobe.aemds.guide.model.ReCaptchaConfigurationModel;
+import com.adobe.aemds.guide.model.TurnstileConfiguration;
 import com.adobe.aemds.guide.service.CloudConfigurationProvider;
 import com.adobe.aemds.guide.service.GuideException;
 import com.adobe.cq.forms.core.Utils;
@@ -55,10 +56,20 @@ public ReCaptchaConfigurationModel getRecaptchaCloudConfiguration(Resource resou
             return reCaptchaConfiguration;
         }
 
+        @Override
+        public String getCustomFunctionUrl(Resource resource) {
+            return null;
+        }
+
         @Override
         public HCaptchaConfiguration getHCaptchaCloudConfiguration(Resource resource) throws GuideException {
             return null;
         }
+
+        @Override
+        public TurnstileConfiguration getTurnstileCloudConfiguration(Resource resource) throws GuideException {
+            return null;
+        }
     };
 
     @BeforeEach

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

@@ -39,6 +39,7 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 
+import com.adobe.aemds.guide.service.CoreComponentCustomPropertiesProvider;
 import com.adobe.aemds.guide.service.GuideLocalizationService;
 import com.adobe.aemds.guide.utils.GuideConstants;
 import com.adobe.cq.export.json.ComponentExporter;
@@ -490,4 +491,37 @@ public void testGetIsHamburgerMenuEnabled() {
         FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
         assertFalse(Boolean.valueOf(formContainer.getIsHamburgerMenuEnabled().toString()));
     }
+
+    /**
+     * Test to check if the properties are fetched from the CoreComponentCustomPropertiesProvider are part of form container properties or
+     * not
+     * Also, if same properties is set in form container, then it should override the properties from CoreComponentCustomPropertiesProvider
+     * 
+     * @throws Exception
+     */
+    @Test
+    void testGetPropertiesForCoreComponentCustomPropertiesProvider() throws Exception {
+        CoreComponentCustomPropertiesProvider coreComponentCustomPropertiesProvider = Mockito.mock(
+            CoreComponentCustomPropertiesProvider.class);
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
+        Utils.setInternalState(formContainer, "coreComponentCustomPropertiesProvider", coreComponentCustomPropertiesProvider);
+        Mockito.when(coreComponentCustomPropertiesProvider.getProperties()).thenReturn(new HashMap<String, Object>() {
+            {
+                put("fd:changeEventBehaviour", "deps");
+                put("customProp", "customValue");
+            }
+        });
+        assertEquals("deps", formContainer.getProperties().get("fd:changeEventBehaviour"));
+        assertEquals("customPropValue", formContainer.getProperties().get("customProp"));
+    }
+
+    @Test
+    void testGetPropertiesForCoreComponentCustomPropertiesProviderForNull() throws Exception {
+        CoreComponentCustomPropertiesProvider coreComponentCustomPropertiesProvider = Mockito.mock(
+            CoreComponentCustomPropertiesProvider.class);
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
+        Utils.setInternalState(formContainer, "coreComponentCustomPropertiesProvider", coreComponentCustomPropertiesProvider);
+        Mockito.when(coreComponentCustomPropertiesProvider.getProperties()).thenReturn(null);
+        assertEquals("customPropValue", formContainer.getProperties().get("customProp"));
+    }
 }

parent/pom.xml

@@ -1128,7 +1128,7 @@
             <dependency>
                 <groupId>com.adobe.aem</groupId>
                 <artifactId>aem-forms-sdk-api</artifactId>
-                <version>2024.04.18.00-240300</version>
+                <version>2024.09.08.00-240800</version>
             </dependency>
 
             <dependency>