Revert "Merge branch master_260924" (#1426)

.circleci/config.yml

@@ -239,7 +239,6 @@ jobs:
       TYPE: cypress
       BROWSER: chrome
       CONTEXTPATH: lc
-
     resource_class: xlarge
     working_directory: /home/circleci/build
     parallelism: 8

.circleci/docker-compose.yml

@@ -6,7 +6,7 @@ services:
     entrypoint: tail -f /dev/null  # Keeps the container running
 
   circleci-aem-cloudready:
-    image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem-cloudready:17689-rel-openjdk11
+    image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem-cloudready:3f4b114b96-openjdk11
     depends_on:
       - circleci-qp
     # Add any additional configurations or environment variables if needed

VERSIONS.md

@@ -2,6 +2,7 @@
 
 See below for a full list of minimum system requirements for historical versions of the Forms Core Components:
 
+
 | Forms Core Components | WCM Core Components | AEM 6.5 | Java  | Maven  |  
 |-----------------------|---------------------|---------| ----- | ------ |
 | 1.1.52                | 2.24.6             | 6.5.20+ | 8, 11 | 3.3.9+ |

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

@@ -37,7 +37,6 @@
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
 import com.adobe.cq.forms.core.components.internal.form.ReservedProperties;
 import com.adobe.cq.forms.core.components.models.form.Button;
-import com.adobe.cq.forms.core.components.models.form.FieldType;
 import com.adobe.cq.forms.core.components.util.AbstractBaseImpl;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
@@ -88,11 +87,6 @@ public String getButtonType() {
         return buttonType;
     }
 
-    @Override
-    public String getFieldType() {
-        return super.getFieldType(FieldType.BUTTON);
-    }
-
     @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_DOR_EXCLUSION)
     @Default(booleanValues = false)
     protected boolean dorExclusion;

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

@@ -34,7 +34,6 @@
 import com.adobe.cq.forms.core.components.internal.form.ReservedProperties;
 import com.adobe.cq.forms.core.components.models.form.CheckBox;
 import com.adobe.cq.forms.core.components.models.form.CheckBoxGroup;
-import com.adobe.cq.forms.core.components.models.form.FieldType;
 import com.adobe.cq.forms.core.components.util.AbstractOptionsFieldImpl;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
@@ -84,9 +83,4 @@ public Integer getMaxItems() {
     public Type getType() {
         return super.getType(); // check box group always has type array // we always return boolean[], string[] or number[]
     }
-
-    @Override
-    public String getFieldType() {
-        return super.getFieldType(FieldType.CHECKBOX_GROUP);
-    }
 }

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

@@ -36,7 +36,6 @@
 import com.adobe.cq.forms.core.components.internal.form.ReservedProperties;
 import com.adobe.cq.forms.core.components.models.form.ConstraintType;
 import com.adobe.cq.forms.core.components.models.form.DatePicker;
-import com.adobe.cq.forms.core.components.models.form.FieldType;
 import com.adobe.cq.forms.core.components.util.AbstractFieldImpl;
 import com.adobe.cq.forms.core.components.util.ComponentUtils;
 
@@ -84,11 +83,6 @@ public Date getExclusiveMinimumDate() {
         return ComponentUtils.clone(exclusiveMinimumVaue);
     }
 
-    @Override
-    public String getFieldType() {
-        return super.getFieldType(FieldType.DATE_INPUT);
-    }
-
     public @NotNull Map<ConstraintType, String> getConstraintMessages() {
         Map<ConstraintType, String> res = super.getConstraintMessages();
         String msg = getConstraintMessage(ConstraintType.MINIMUM);

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

@@ -28,7 +28,6 @@
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
 import com.adobe.cq.forms.core.components.internal.form.ReservedProperties;
 import com.adobe.cq.forms.core.components.models.form.DropDown;
-import com.adobe.cq.forms.core.components.models.form.FieldType;
 import com.adobe.cq.forms.core.components.util.AbstractOptionsFieldImpl;
 
 @Model(
@@ -57,9 +56,4 @@ public Integer getMaxItems() {
     public Boolean isMultiSelect() {
         return multiSelect;
     }
-
-    @Override
-    public String getFieldType() {
-        return super.getFieldType(FieldType.DROP_DOWN);
-    }
 }

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

@@ -34,7 +34,6 @@
 import com.adobe.cq.export.json.ExporterConstants;
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
 import com.adobe.cq.forms.core.components.internal.form.ReservedProperties;
-import com.adobe.cq.forms.core.components.models.form.FieldType;
 import com.adobe.cq.forms.core.components.models.form.FileInput;
 import com.adobe.cq.forms.core.components.util.AbstractFieldImpl;
 
@@ -80,11 +79,6 @@ public Type getType() {
         }
     }
 
-    @Override
-    public String getFieldType() {
-        return super.getFieldType(FieldType.FILE_INPUT);
-    }
-
     @Override
     public Boolean isMultiple() {
         return multiSelection;

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

@@ -30,7 +30,6 @@
 import com.adobe.cq.export.json.ExporterConstants;
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
 import com.adobe.cq.forms.core.components.internal.form.ReservedProperties;
-import com.adobe.cq.forms.core.components.models.form.FieldType;
 import com.adobe.cq.forms.core.components.models.form.NumberInput;
 import com.adobe.cq.forms.core.components.util.AbstractFieldImpl;
 import com.adobe.cq.forms.core.components.util.ComponentUtils;
@@ -130,11 +129,6 @@ public Type getType() {
         }
     }
 
-    @Override
-    public String getFieldType() {
-        return super.getFieldType(FieldType.NUMBER_INPUT);
-    }
-
     @PostConstruct
     private void initNumberInput() {
         Object tempExclusiveMaximumValue = ComponentUtils.getExclusiveValue(exclusiveMaximum, maximumAsStr != null ? maximumAsStr : maximum,

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

@@ -32,7 +32,6 @@
 import com.adobe.cq.export.json.ExporterConstants;
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
 import com.adobe.cq.forms.core.components.internal.form.ReservedProperties;
-import com.adobe.cq.forms.core.components.models.form.FieldType;
 import com.adobe.cq.forms.core.components.models.form.Panel;
 import com.adobe.cq.forms.core.components.util.AbstractContainerImpl;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -108,11 +107,6 @@ public Type getType() {
         return null;
     }
 
-    @Override
-    public String getFieldType() {
-        return super.getFieldType(FieldType.PANEL);
-    }
-
     @Override
     @JsonInclude(JsonInclude.Include.NON_NULL)
     @Nullable

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

@@ -32,7 +32,6 @@
 import com.adobe.cq.export.json.ExporterConstants;
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
 import com.adobe.cq.forms.core.components.internal.form.ReservedProperties;
-import com.adobe.cq.forms.core.components.models.form.FieldType;
 import com.adobe.cq.forms.core.components.models.form.RadioButton;
 import com.adobe.cq.forms.core.components.util.AbstractOptionsFieldImpl;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -69,9 +68,4 @@ private void initRadioButtonModel() {
     public Orientation getOrientation() {
         return orientation;
     }
-
-    @Override
-    public String getFieldType() {
-        return super.getFieldType(FieldType.RADIO_GROUP);
-    }
 }

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

@@ -34,7 +34,6 @@
 import com.adobe.cq.export.json.ExporterConstants;
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
 import com.adobe.cq.forms.core.components.internal.form.ReservedProperties;
-import com.adobe.cq.forms.core.components.models.form.FieldType;
 import com.adobe.cq.forms.core.components.models.form.StaticImage;
 import com.adobe.cq.forms.core.components.util.AbstractFormComponentImpl;
 import com.day.cq.wcm.foundation.Image;
@@ -139,9 +138,4 @@ public String getLinkUrl() {
         }
         return properties;
     }
-
-    @Override
-    public String getFieldType() {
-        return super.getFieldType(FieldType.IMAGE);
-    }
 }

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

@@ -28,7 +28,6 @@
 import com.adobe.cq.export.json.ExporterConstants;
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
 import com.adobe.cq.forms.core.components.internal.form.ReservedProperties;
-import com.adobe.cq.forms.core.components.models.form.FieldType;
 import com.adobe.cq.forms.core.components.models.form.Text;
 import com.adobe.cq.forms.core.components.util.AbstractFormComponentImpl;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -70,9 +69,4 @@ public boolean isRichText() {
     public String getText() {
         return getValue();
     }
-
-    @Override
-    public String getFieldType() {
-        return super.getFieldType(FieldType.PLAIN_TEXT);
-    }
 }

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

@@ -79,8 +79,9 @@ public boolean isMultiLine() {
     public String getFieldType() {
         if (isMultiLine()) {
             return FieldType.MULTILINE_INPUT.getValue();
+        } else {
+            return super.getFieldType();
         }
-        return super.getFieldType(FieldType.TEXT_INPUT);
     }
 
     @Override

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

@@ -49,7 +49,6 @@
 import com.adobe.cq.forms.core.components.internal.models.v1.form.FormMetaDataImpl;
 import com.adobe.cq.forms.core.components.models.form.AutoSaveConfiguration;
 import com.adobe.cq.forms.core.components.models.form.Container;
-import com.adobe.cq.forms.core.components.models.form.FieldType;
 import com.adobe.cq.forms.core.components.models.form.FormClientLibManager;
 import com.adobe.cq.forms.core.components.models.form.FormContainer;
 import com.adobe.cq.forms.core.components.models.form.FormMetaData;
@@ -129,11 +128,6 @@ public class FormContainerImpl extends AbstractContainerImpl implements FormCont
     @Self(injectionStrategy = InjectionStrategy.OPTIONAL)
     private AutoSaveConfiguration autoSaveConfig;
 
-    @Override
-    public String getFieldType() {
-        return super.getFieldType(FieldType.FORM);
-    }
-
     @PostConstruct
     protected void initFormContainerModel() {
         if (request != null) {

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

@@ -35,7 +35,6 @@
 import com.adobe.cq.forms.core.components.internal.Heading;
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
 import com.adobe.cq.forms.core.components.internal.form.ReservedProperties;
-import com.adobe.cq.forms.core.components.models.form.FieldType;
 import com.adobe.cq.forms.core.components.models.form.FormTitle;
 import com.adobe.cq.forms.core.components.util.AbstractFormComponentImpl;
 import com.adobe.cq.forms.core.components.util.ComponentUtils;
@@ -70,11 +69,6 @@ public class TitleImplV2 extends AbstractFormComponentImpl implements FormTitle
 
     private Heading heading;
 
-    @Override
-    public String getFieldType() {
-        return super.getFieldType(FieldType.PLAIN_TEXT);
-    }
-
     /**
      * Translation of the title property
      */

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

@@ -35,10 +35,7 @@ public enum FieldType {
     PANEL("panel"),
     FORM("form"),
     CHECKBOX_GROUP("checkbox-group"),
-    IMAGE("image"),
-    TELEPHONE("tel"),
-    PASSWORD("password"),
-    RANGE("range");
+    IMAGE("image");
 
     private String value;
 

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

@@ -64,7 +64,7 @@ public interface FormContainer extends Container {
      */
     String PN_CLIENT_LIB_REF = GuideConstants.CLIENT_LIB_REF;
 
-    String DEFAULT_FORMS_SPEC_VERSION = "0.14.1";
+    String DEFAULT_FORMS_SPEC_VERSION = "0.14.0";
 
     /**
      * Returns form metadata {@link FormMetaData}

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

@@ -20,7 +20,6 @@
 
 import com.adobe.aemds.guide.service.GuideException;
 import com.adobe.cq.forms.core.components.models.form.Captcha;
-import com.adobe.cq.forms.core.components.models.form.FieldType;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
@@ -32,11 +31,6 @@ public abstract class AbstractCaptchaImpl extends AbstractFieldImpl implements C
     @JsonIgnore
     public abstract String getProvider();
 
-    @Override
-    public String getFieldType() {
-        return super.getFieldType(FieldType.CAPTCHA);
-    }
-
     public abstract Map<String, Object> getCaptchaProperties();
 
     public Map<String, Object> getProperties() {

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

@@ -22,7 +22,6 @@
 
 import com.adobe.cq.forms.core.components.internal.form.ReservedProperties;
 import com.adobe.cq.forms.core.components.models.form.Base;
-import com.adobe.cq.forms.core.components.models.form.FieldType;
 
 /**
  * Abstract class which can be used as base class for {@link Base} implementations.
@@ -58,9 +57,4 @@ public Object[] getEnums() {
             return ComponentUtils.coerce(type, enums);
         }
     }
-
-    @Override
-    public String getFieldType() {
-        return super.getFieldType(FieldType.CHECKBOX);
-    }
 }

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

@@ -78,7 +78,7 @@ public class AbstractFormComponentImpl extends AbstractComponentImpl implements
     protected String dataRef;
 
     // mandatory property else adapt should fail for adaptive form components
-    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_FIELDTYPE)
+    @ValueMapValue(name = ReservedProperties.PN_FIELDTYPE)
     protected String fieldTypeJcr;
     private FieldType fieldType;
 
@@ -148,9 +148,7 @@ public class AbstractFormComponentImpl extends AbstractComponentImpl implements
     @PostConstruct
     protected void initBaseModel() {
         // first check if this is in the supported list of field type
-        if (StringUtils.isNotEmpty(fieldTypeJcr)) {
-            fieldType = FieldType.fromString(fieldTypeJcr);
-        }
+        fieldType = FieldType.fromString(fieldTypeJcr);
         if (request != null && i18n == null) {
             i18n = GuideUtils.getI18n(request, resource);
         }
@@ -218,13 +216,6 @@ public String getFieldType() {
         return fieldType.getValue();
     }
 
-    protected String getFieldType(@Nonnull FieldType defaultFieldType) {
-        if (fieldType == null) {
-            return defaultFieldType.getValue();
-        }
-        return fieldType.getValue();
-    }
-
     /**
      * Returns {@code true} if form field should be visible, otherwise {@code false}.
      *

bundles/af-core/src/test/java/com/adobe/cq/forms/core/Utils.java

@@ -125,14 +125,14 @@ public static void testSchemaValidation(@NotNull Object model) {
         // create an instance of the JsonSchemaFactory using version flag
         JsonSchemaFactory schemaFactory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7);
         try {
-            InputStream schemaStream = Utils.class.getResourceAsStream("/schema/0.14.1/adaptive-form.schema.json");
+            InputStream schemaStream = Utils.class.getResourceAsStream("/schema/0.14.0/adaptive-form.schema.json");
             JsonSchema schema = schemaFactory.getSchema(schemaStream);
             // read data from the stream and store it into JsonNode
             JsonNode json = objectMapper.readTree(jsonStream);
             // if there is a version bump of schema, then it needs to be validated against its corresponding sling model here
             // by explicitly checking the model implementation
             if (!(model instanceof FormContainerImpl)) {
-                InputStream formContainerTemplate = Utils.class.getResourceAsStream("/schema/0.14.1/form.json");
+                InputStream formContainerTemplate = Utils.class.getResourceAsStream("/schema/0.14.0/form.json");
                 JsonNode formContainerTemplateNode = objectMapper.readTree(formContainerTemplate);
                 ((ObjectNode) formContainerTemplateNode).putArray("items").add(json);
                 json = formContainerTemplateNode;

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

@@ -35,7 +35,6 @@ public class ButtonImplTest {
     private static final String CONTENT_ROOT = "/content";
     private static final String PATH_BUTTON_1 = CONTENT_ROOT + "/button";
     private static final String PATH_BUTTON_CUSTOMIZED = CONTENT_ROOT + "/button-customized";
-    private static final String PATH_BUTTON_NO_FIELDTYPE = CONTENT_ROOT + "/button-without-fieldtype";
     private final AemContext context = FormsCoreComponentTestContext.newAemContext();
 
     @BeforeEach
@@ -142,10 +141,4 @@ void testGetProperties() {
         Button button = Utils.getComponentUnderTest(PATH_BUTTON_1, Button.class, context);
         assertEquals("button", button.getProperties().get("fd:buttonType"));
     }
-
-    @Test
-    void testNoFieldType() {
-        Button button = Utils.getComponentUnderTest(PATH_BUTTON_NO_FIELDTYPE, Button.class, context);
-        assertEquals(FieldType.BUTTON.getValue(), button.getFieldType());
-    }
 }