Revert "FORMS-18986 XFA to AF (#1532)" (#1648)

This reverts commit 9b1eb2a.

Author: rismehta

.gitignore

@@ -9,7 +9,6 @@
 
 # auto-generated clientlib
 ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-base/**
-ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-base-xfa/**
 
 # xfa not supported in 650 yet
 ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-base-xfa/**

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

@@ -165,8 +165,6 @@ private ReservedProperties() {
     public static final String FD_AUTO_SAVE_INTERVAL = "fd:autoSaveInterval";
     public static final String FD_EXCLUDE_FROM_DOR_IF_HIDDEN = "excludeFromDoRIfHidden";
 
-    public static final String FD_XFA_SCRIPTS = "fd:xfaScripts";
-
     public static final String FD_DRAFT_ID = "fd:draftId";
 
     // Begin: Form submission related properties

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java

@@ -17,7 +17,17 @@
 
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.AbstractMap;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -58,12 +68,9 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 
 public class AbstractFormComponentImpl extends AbstractComponentImpl implements FormComponent {
     @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_DATAREF)
@@ -291,10 +298,6 @@ protected boolean getEditMode() {
         if (rulesProperties.size() > 0) {
             properties.put(CUSTOM_RULE_PROPERTY_WRAPPER, rulesProperties);
         }
-        List<String> disabledScripts = getDisabledXFAScripts();
-        if (!disabledScripts.isEmpty()) {
-            properties.put("fd:disabledXfaScripts", disabledScripts);
-        }
         return properties;
     }
 
@@ -547,24 +550,4 @@ public Map<String, Object> getDorProperties() {
         return customDorProperties;
     }
 
-    private List<String> getDisabledXFAScripts() {
-        Set<String> disabledScripts = new HashSet<>();
-        String xfaScripts = resource.getValueMap().get(ReservedProperties.FD_XFA_SCRIPTS, "");
-        if (StringUtils.isNotEmpty(xfaScripts)) {
-            // read string xfaScripts to jsonNode
-            ObjectMapper mapper = new ObjectMapper();
-            try {
-                ArrayNode node = (ArrayNode) mapper.readTree(xfaScripts);
-                // iterate through the array node and add the elements which have disabled property set to true
-                for (JsonNode jsonNode : node) {
-                    if (jsonNode.has("disabled") && jsonNode.get("disabled").asBoolean()) {
-                        disabledScripts.add(jsonNode.get("activity").asText());
-                    }
-                }
-            } catch (IOException e) {
-                logger.error("Error while parsing xfaScripts {} {}", e, resource.getPath());
-            }
-        }
-        return new ArrayList<>(disabledScripts);
-    }
 }

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractOptionsFieldImpl.java

@@ -18,7 +18,6 @@
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.IntStream;
 
 import org.apache.sling.models.annotations.Default;
@@ -116,7 +115,9 @@ public String[] getEnumNames() {
             Map<Object, String> map = getEnumPairs();
             String[] enumName = map.values().toArray(new String[0]);
             return Arrays.stream(enumName)
-                .map(p -> Optional.ofNullable(translate(ReservedProperties.PN_ENUM_NAMES, p)).orElse(""))
+                .map(p -> {
+                    return this.translate(ReservedProperties.PN_ENUM_NAMES, p);
+                })
                 .toArray(String[]::new);
         }
         return null;

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

@@ -57,7 +57,6 @@ public class CheckBoxGroupImplTest {
     private static final String PATH_CHECKBOX_GROUP_FOR_INSERTION_ORDER = CONTENT_ROOT + "/checkboxgroup-insertion-order";
     private static final String PATH_CHECKBOX_GROUP_FOR_BOOLEAN = CONTENT_ROOT + "/checkboxgroup-boolean";
     private static final String PATH_CHECKBOX_GROUP_NO_FIELDTYPE = CONTENT_ROOT + "/checkboxgroup-without-fieldtype";
-    private static final String PATH_CHECKBOX_GROUP_WITH_NULL_VALUES = CONTENT_ROOT + "/checkboxgroup-with-null-values";
 
     private final AemContext context = FormsCoreComponentTestContext.newAemContext();
 
@@ -299,18 +298,6 @@ void testGetEnumNames() {
         assertArrayEquals(new String[] { "m", "f", "o" }, checkboxGroup.getEnumNames());
     }
 
-    @Test
-    void testGetEnumNamesWithNullValues() throws Exception {
-        // Get the checkbox group under test
-        CheckBoxGroup checkboxGroup = getCheckBoxGroupUnderTest(PATH_CHECKBOX_GROUP);
-        String[] modifiedEnumNames = new String[] { null, "", "value3" };
-        FieldUtils.writeField(checkboxGroup, "enumNames", modifiedEnumNames, true);
-        // Now call getEnumNames() which should handle the null value by converting it to an empty string
-        String[] result = checkboxGroup.getEnumNames();
-        // Verify that nulls are converted to empty strings
-        assertArrayEquals(new String[] { "", "", "value3" }, result);
-    }
-
     @Test
     void testGetEnumNamesWithDuplicateEnumValues() {
         CheckBoxGroup checkboxGroup = getCheckBoxGroupUnderTest(PATH_CHECKBOX_GROUP_WITH_DUPLICATE_ENUMS);

bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImplTest.java

@@ -17,7 +17,6 @@
 package com.adobe.cq.forms.core.components.util;
 
 import java.lang.reflect.Method;
-import java.util.List;
 import java.util.Map;
 
 import org.apache.sling.api.resource.Resource;
@@ -49,9 +48,6 @@ public class AbstractFormComponentImplTest {
     private static final String PATH_COMPONENT_WITH_NO_VALIDATION_STATUS = CONTENT_ROOT + "/datepicker2";
     private static final String PATH_COMPONENT_WITH_INVALID_VALIDATION_STATUS = CONTENT_ROOT + "/datepicker3";
     private static final String PATH_COMPONENT_WITH_NO_RULE = CONTENT_ROOT + "/numberinput";
-    private static final String PATH_COMPONENT_WITH_DISABLED_XFA_SCRIPTS = CONTENT_ROOT + "/xfacomponent";
-    private static final String PATH_COMPONENT_WITH_INVALID_XFA_SCRIPTS = CONTENT_ROOT + "/xfacomponentinvalid";
-    private static final String PATH_COMPONENT_WITH_NO_XFA_SCRIPTS = CONTENT_ROOT + "/xfacomponentnone";
     private static final String AF_PATH = "/content/forms/af/testAf";
     private static final String PAGE_PATH = "/content/testPage";
 
@@ -105,34 +101,6 @@ public void testInvalidValidationStatusRule() {
         assertEquals("invalid", rulesProperties.get("validationStatus"));
     }
 
-    @Test
-    public void testDisabledXFAScripts() {
-        AbstractFormComponentImpl abstractFormComponentImpl = prepareTestClass(PATH_COMPONENT_WITH_DISABLED_XFA_SCRIPTS);
-        Map<String, Object> properties = abstractFormComponentImpl.getProperties();
-        List<String> disabledScripts = (List<String>) properties.get("fd:disabledXfaScripts");
-        assertNotNull(disabledScripts);
-        assertEquals(2, disabledScripts.size());
-        assertTrue(disabledScripts.contains("click"));
-        assertTrue(disabledScripts.contains("change"));
-    }
-
-    @Test
-    public void testInvalidXFAScripts() {
-        AbstractFormComponentImpl abstractFormComponentImpl = prepareTestClass(PATH_COMPONENT_WITH_INVALID_XFA_SCRIPTS);
-        Map<String, Object> properties = abstractFormComponentImpl.getProperties();
-        Object disabledScripts = properties.get("fd:disabledXfaScripts");
-        // Even with invalid JSON, we should get an empty list, not null
-        assertNull(disabledScripts);
-    }
-
-    @Test
-    public void testNoXFAScripts() {
-        AbstractFormComponentImpl abstractFormComponentImpl = prepareTestClass(PATH_COMPONENT_WITH_NO_XFA_SCRIPTS);
-        Map<String, Object> properties = abstractFormComponentImpl.getProperties();
-        Object disabledScripts = properties.get("fd:disabledXfaScripts");
-        assertNull(disabledScripts);
-    }
-
     @Test
     public void testEmbedWithIframe() {
         Resource resource = Mockito.mock(Resource.class);
@@ -179,6 +147,7 @@ public Page getCurrentPageToTest() {
         }
     }
 
+    @Test
     private AbstractFormComponentImpl prepareTestClass(String path) {
         Resource resource = context.resourceResolver().getResource(path);
         AbstractFormComponentImpl abstractFormComponentImpl = new AbstractFormComponentImpl();

bundles/af-core/src/test/resources/form/checkboxgroup/test-content.json

@@ -269,25 +269,5 @@
     ],
     "jcr:lastModified": "Tue Jul 30 2024 15:16:00 GMT+0530",
     "sling:resourceType": "forms-components-examples/components/form/checkboxgroup"
-  },
-  "checkboxgroup-with-null-values": {
-    "id": "checkboxgroup-with-null-values",
-    "jcr:primaryType": "nt:unstructured",
-    "sling:resourceType": "core/fd/components/form/checkboxgroup/v1/checkboxgroup",
-    "name": "nullValues",
-    "jcr:title": "Null Values Test",
-    "fieldType": "checkbox-group",
-    "type": "number[]",
-    "enum": [
-      0,
-      1,
-      2
-    ],
-    "enforceEnum": true,
-    "enumNames": [
-      "",
-      "",
-      "value3"
-    ]
   }
 }

bundles/af-core/src/test/resources/form/componentswithrule/test-content.json

@@ -43,16 +43,5 @@
       "jcr:primaryType": "nt:unstructured",
       "validationStatus" : "someInvalidStatus"
     }
-  },
-  "xfacomponent": {
-    "jcr:primaryType": "nt:unstructured",
-    "fd:xfaScripts": "[{\"activity\":\"click\",\"disabled\":true},{\"activity\":\"change\",\"disabled\":true},{\"activity\":\"initialize\",\"disabled\":false}]"
-  },
-  "xfacomponentinvalid": {
-    "jcr:primaryType": "nt:unstructured",
-    "fd:xfaScripts": "invalid json"
-  },
-  "xfacomponentnone": {
-    "jcr:primaryType": "nt:unstructured"
   }
 }