date time fixes

Author: dgurjar

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

@@ -137,7 +137,6 @@ private FormConstants() {
 
     public static final String PROP_FRAGMENT_PATH = "fragmentPath";
 
-<<<<<<< HEAD
     /** The resource type for review v1 */
     public static final String RT_FD_FORM_REVIEW_V1 = RT_FD_FORM_PREFIX + "review/v1/review";
 

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

@@ -83,6 +83,9 @@ private ReservedProperties() {
     public static final String PN_MAX_LENGTH = "maxLength";
     public static final String PN_MINIMUM_DATE = "minimumDate";
     public static final String PN_MAXIMUM_DATE = "maximumDate";
+    public static final String PN_MINIMUM_DATE_TIME = "minimumDateTime";
+    public static final String PN_DEFAULT_DATE_TIME = "defaultDateTime";
+    public static final String PN_MAXIMUM_DATE_TIME = "maximumDateTime";
     public static final String PN_MAXIMUM = "maximum";
     public static final String PN_MINIMUM = "minimum";
     public static final String PN_EXCLUSIVE_MINIMUM = "exclusiveMinimum";

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

@@ -1,5 +1,5 @@
 /**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright 2024 Adobe
+ ~ Copyright 2025 Adobe
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 package com.adobe.cq.forms.core.components.internal.models.v1.form;
 
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Map;
+
 import javax.annotation.Nullable;
 import javax.annotation.PostConstruct;
 
@@ -25,13 +29,15 @@
 import org.apache.sling.models.annotations.Model;
 import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
 import org.apache.sling.models.annotations.injectorspecific.ValueMapValue;
+import org.jetbrains.annotations.NotNull;
 
 import com.adobe.cq.export.json.ComponentExporter;
 import com.adobe.cq.export.json.ExporterConstants;
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
-import com.adobe.cq.forms.core.components.models.form.DateTime;
+import com.adobe.cq.forms.core.components.models.form.*;
 import com.adobe.cq.forms.core.components.util.AbstractFieldImpl;
-import com.adobe.cq.forms.core.components.util.ComponentUtils;
+import com.adobe.xfa.ut.StringUtils;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 @Model(
     adaptables = { SlingHttpServletRequest.class, Resource.class },
@@ -41,70 +47,60 @@
     name = ExporterConstants.SLING_MODEL_EXPORTER_NAME,
     extensions = ExporterConstants.SLING_MODEL_EXTENSION)
 public class DateTimeImpl extends AbstractFieldImpl implements DateTime {
-
-    private Object exclusiveMinimumVaue;
-    private Object exclusiveMaximumValue;
-
     @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL)
     @Nullable
     private String pattern;
 
     @Override
     public String getFieldType() {
-        return super.getFieldType();
+        return super.getFieldType(FieldType.DATETIME_INPUT);
     }
 
-    @Override
-    public Integer getMinLength() {
-        return minLength;
-    }
+    @PostConstruct
+    private void initTextInput() {}
 
     @Override
-    public Integer getMaxLength() {
-        return maxLength;
+    public String getMinimumDateTime() {
+        return getFormattedDate(minimumDateTime);
     }
 
     @Override
-    public Long getMinimum() {
-        return minimum;
+    public String getMaximumDateTime() {
+        return getFormattedDate(maximumDateTime);
     }
 
-    @Override
-    public Long getMaximum() {
-        return maximum;
-    }
+    private String getFormattedDate(String dateTime) {
+        if (!StringUtils.isEmpty(dateTime)) {
+            OffsetDateTime formattedTime = OffsetDateTime.parse(dateTime);
+            return formattedTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm"));
+        }
+        return dateTime;
 
-    @Override
-    public String getFormat() {
-        return displayFormat;
     }
 
-    @Override
-    public String getPattern() {
-        return pattern;
+    public @NotNull Map<ConstraintType, String> getConstraintMessages() {
+        Map<ConstraintType, String> res = super.getConstraintMessages();
+        String msg = getConstraintMessage(ConstraintType.MINIMUM);
+        if (msg != null) {
+            res.put(ConstraintType.MINIMUM, msg);
+        }
+        msg = getConstraintMessage(ConstraintType.MAXIMUM);
+        if (msg != null) {
+            res.put(ConstraintType.MAXIMUM, msg);
+        }
+        return res;
     }
 
     @Override
-    public Long getExclusiveMaximum() {
-        return (Long) exclusiveMaximumValue;
+    @Nullable
+    public String getFormat() {
+        return "date-time";
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = Base.DATE_TIME_FORMATTER, timezone = "UTC")
     @Override
-    public Long getExclusiveMinimum() {
-        return (Long) exclusiveMinimumVaue;
-    }
-
-    @PostConstruct
-    private void initTextInput() {
-        exclusiveMaximumValue = ComponentUtils.getExclusiveValue(exclusiveMaximum, maximum, null);
-        exclusiveMinimumVaue = ComponentUtils.getExclusiveValue(exclusiveMinimum, minimum, null);
-        // in json either, exclusiveMaximum or maximum should be present
-        if (exclusiveMaximumValue != null) {
-            maximum = null;
-        }
-        if (exclusiveMinimumVaue != null) {
-            minimum = null;
-        }
+    public Object[] getDefault() {
+        return defaultValue;
     }
 
 }

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

@@ -35,6 +35,8 @@
 public interface Base extends FormComponent {
     public final String DATE_FORMATTER = "yyyy-MM-dd";
 
+    public final String DATE_TIME_FORMATTER = "yyyy-MM-dd'T'HH:mm:ss";
+
     /**
      * Constant representing the default language used, typically "en-US".
      *

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

@@ -1,6 +1,6 @@
 
 /**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright 2024 Adobe
+ ~ Copyright 2025 Adobe
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
@@ -22,17 +22,9 @@
 /**
  * Interface for {@code Password} Sling Model used for the {@code /apps/core/fd/components/form/password/v1/password} component.
  *
- * @since com.adobe.cq.forms.core.components.models.form 2.0.0
+ * @since com.adobe.cq.forms.core.components.models.form 5.11.0
  */
 @ConsumerType
-public interface DateTime extends Field, StringConstraint, NumberConstraint {
+public interface DateTime extends Field, DateTimeConstraint {
 
-    /**
-     * Returns the validation pattern (regex) for the password field.
-     *
-     * @return the validation pattern
-     * @since com.adobe.cq.forms.core.components.models.form 2.0.0
-     */
-    String getPattern();
-
-}
+}

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

@@ -0,0 +1,46 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2025 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~     http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+
+package com.adobe.cq.forms.core.components.models.form;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public interface DateTimeConstraint extends FormatConstraint {
+    /**
+     * Returns the minimum value for the date. The constraint is applicable only for field with type date
+     *
+     * @return minimum date
+     * @since com.adobe.cq.forms.core.components.models.form 5.11.0
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    @JsonProperty("minimum")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = Base.DATE_TIME_FORMATTER, timezone = "UTC")
+    String getMinimumDateTime();
+
+    /**
+     * Returns the maximum value for the date. The constraint is applicable only for field with type date
+     *
+     * @return maximum date
+     * @since com.adobe.cq.forms.core.components.models.form 5.11.0
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    @JsonProperty("maximum")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = Base.DATE_TIME_FORMATTER, timezone = "UTC")
+    String getMaximumDateTime();
+
+}

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

@@ -38,7 +38,7 @@ public enum FieldType {
     IMAGE("image"),
     TELEPHONE("tel"),
     PASSWORD("password"),
-    DATETIME("date-time"),
+    DATETIME_INPUT("datetime-input"),
     RANGE("range"),
     COLOR("color"),
     URL("url"),

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.2";
+    String DEFAULT_FORMS_SPEC_VERSION = "0.15.0";
 
     /**
      * Returns form metadata {@link FormMetaData}

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

@@ -87,6 +87,14 @@ public abstract class AbstractFieldImpl extends AbstractBaseImpl implements Fiel
     @Nullable
     protected Date maximumDate;
 
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_MINIMUM_DATE_TIME)
+    @Nullable
+    protected String minimumDateTime;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_MAXIMUM_DATE_TIME)
+    @Nullable
+    protected String maximumDateTime;
+
     /** Do not do any changes, this is just present for backward compatibility **/
     @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_MAXIMUM)
     @Nullable

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

@@ -126,19 +126,19 @@ 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.2/adaptive-form.schema.json");
+            InputStream schemaStream = Utils.class.getResourceAsStream("/schema/0.15.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.2/form.json");
+                InputStream formContainerTemplate = Utils.class.getResourceAsStream("/schema/0.15.0/form.json");
                 JsonNode formContainerTemplateNode = objectMapper.readTree(formContainerTemplate);
                 ((ObjectNode) formContainerTemplateNode).putArray("items").add(json);
                 json = formContainerTemplateNode;
             }
-            // create set of validation message and store result in it
+            // create set of validation message and st ore result in it
             Set<ValidationMessage> validationResult = schema.validate(json);
             // show the validation errors
             if (!validationResult.isEmpty()) {