Merge pull request #1774 from adobe/masterTo650dec

Master to650dec

Author: im-shiv

.circleci/config.yml

@@ -121,6 +121,9 @@ executors:
   forms_executor_java8:
     docker:
       - image: cimg/openjdk:8.0-browsers
+  forms_executor_java21:
+    docker:
+      - image: cimg/openjdk:21.0-browsers
   test_executor_cloudready:
     docker:
       - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-qp:6.4.6-openjdk11
@@ -137,7 +140,7 @@ executors:
     docker:
       - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-qp:6.4.6-openjdk11
         <<: *docker_auth
-      - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem:6.5.24-load4-openjdk11
+      - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem:6.5.24.0-openjdk11
         <<: *docker_auth
 
 jobs:
@@ -185,6 +188,30 @@ jobs:
           conf: .circleci/codecov.yml
           flags: unittests
 
+  build-java-21:
+    executor: forms_executor_java21
+    working_directory: /home/circleci/build
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - maven-repo-java21-v1-{{ checksum "pom.xml" }}
+            - maven-repo-java21-v1-
+      - run:
+          name: Update permissions
+          command: sudo chown -R circleci /usr/local/lib/node_modules
+      - run:
+          name: Build with Java 21
+          command: node .circleci/ci/build.js
+      - save_cache:
+          paths:
+            - ~/.m2
+          key: maven-repo-java21-v1-{{ .Branch }}-{{ checksum "pom.xml" }}
+      - store_test_results:
+          path: bundles/core/target/surefire-reports
+      - store_artifacts:
+          path: bundles/core/target/surefire-reports
+
   build-java-8:
     executor: forms_executor_java8
     working_directory: /home/circleci/build
@@ -416,6 +443,10 @@ workflows:
           filters:
             tags:
               only: /.*/
+      - build-java-21:
+          filters:
+            tags:
+              only: /.*/
       - build-java-8:
           filters:
             tags:

bundles/af-core/pom.xml

@@ -573,7 +573,7 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-commons</artifactId>
-            <version>1.5.2</version>
+            <version>1.10.2</version>
             <scope>test</scope>
         </dependency>
         <!--

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/datalayer/ComponentDataImpl.java

@@ -32,6 +32,7 @@
 import com.day.cq.commons.jcr.JcrConstants;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public class ComponentDataImpl implements FormComponentData {
 
@@ -41,7 +42,25 @@ public class ComponentDataImpl implements FormComponentData {
 
     protected final Resource resource;
 
+    /**
+     * Creates a new ComponentDataImpl instance.
+     * 
+     * Note: This constructor stores references to FormComponent and Resource objects.
+     * These objects are designed to be immutable and shared across the system.
+     * The FormComponent interface provides read-only access to form component data,
+     * and the Resource interface represents an immutable JCR resource.
+     * 
+     * @param component The form component (immutable, read-only interface)
+     * @param resource The JCR resource (immutable, read-only interface)
+     */
+    @SuppressFBWarnings(
+        value = "EI_EXPOSE_REP2",
+        justification = "This constructor stores references to FormComponent and Resource objects. These objects are designed to be immutable and shared across the system. The FormComponent interface provides read-only access to form component data, and the Resource interface represents an immutable JCR resource. This is safe from a security perspective as these objects cannot be modified through the stored references.")
     public ComponentDataImpl(FormComponent component, Resource resource) {
+        // Both FormComponent and Resource are interfaces designed to be immutable
+        // and shared across the system. They provide read-only access to data.
+        // This is safe from a security perspective as these objects cannot be
+        // modified through the stored references.
         this.component = component;
         this.resource = resource;
     }

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

@@ -203,6 +203,6 @@ private static Set<String> aggregateReservedProperties() {
     }
 
     public static Set<String> getReservedProperties() {
-        return reservedProperties;
+        return new HashSet<>(reservedProperties);
     }
 }

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

@@ -103,7 +103,7 @@ public String getFragmentPath() {
         if (itemModels == null) {
             itemModels = getChildrenModels(request, ComponentExporter.class);
         }
-        return itemModels;
+        return new LinkedHashMap<>(itemModels);
     }
 
     protected <T> Map<String, T> getChildrenModels(@Nullable SlingHttpServletRequest request, @NotNull Class<T> modelClass) {
@@ -180,7 +180,7 @@ public List<Resource> getFragmentChildren() {
         if (filteredChildComponents == null) {
             filteredChildComponents = getFilteredChildrenResources(fragmentContainer);
         }
-        return filteredChildComponents;
+        return new ArrayList<>(filteredChildComponents);
     }
 
     @JsonIgnore

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

@@ -17,6 +17,7 @@
 
 import org.osgi.annotation.versioning.ProviderType;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -58,4 +59,13 @@ default boolean isEnforceEnum() {
      * @since com.adobe.cq.forms.core.components.models.form 0.0.1
      */
     String[] getEnumNames();
+
+    /**
+     * Returns screen reader friendly aria labels for the options.
+     *
+     * @return the list of aria labels for the options
+     * @since com.adobe.cq.forms.core.components.models.form 5.12.3
+     */
+    @JsonIgnore
+    String[] getOptionScreenReaderLabels();
 }

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

@@ -35,7 +35,7 @@
  * </p>
  */
 
-@Version("5.12.2")
+@Version("5.12.3")
 package com.adobe.cq.forms.core.components.models.form;
 
 import org.osgi.annotation.versioning.Version;

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

@@ -282,7 +282,7 @@ protected String getConstraintMessage(ConstraintType type) {
             putConstraintMessage(ConstraintType.VALIDATION_EXPRESSION, msgs.getValidationExpressionConstraintMessage());
             putConstraintMessage(ConstraintType.UNIQUE_ITEMS, msgs.getUniqueItemsConstraintMessage());
         }
-        return constraintMessages;
+        return new LinkedHashMap<>(constraintMessages);
     }
 
     /**

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

@@ -116,7 +116,7 @@ public List<? extends ComponentExporter> getItems() {
         if (childrenModels == null) {
             childrenModels = new ArrayList<>(getChildrenModels(request, ComponentExporter.class).values());
         }
-        return childrenModels;
+        return new ArrayList<>(childrenModels);
     }
 
     @NotNull
@@ -172,7 +172,7 @@ protected <T> Map<String, T> getChildrenModels(@Nullable SlingHttpServletRequest
         if (itemModels == null) {
             itemModels = getChildrenModels(request, ComponentExporter.class);
         }
-        return itemModels;
+        return new LinkedHashMap<>(itemModels);
     }
 
     protected List<Resource> getFilteredChildrenResources() {

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

@@ -543,7 +543,7 @@ private boolean isAllowedType(Object value) {
      * @return {@code Map<String, String>} returns all custom property key value pairs associated with the resource
      */
     private Map<String, Object> getCustomProperties() {
-        Map<String, Object> customProperties = new HashMap<>();
+        Map<String, Object> customProperties = new LinkedHashMap<>();
         Map<String, String> templateBasedCustomProperties;
         List<String> excludedPrefixes = Arrays.asList("fd:", "jcr:", "sling:");
         Set<String> reservedProperties = ReservedProperties.getReservedProperties();