eds semantic html without a separate selector

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

@@ -15,6 +15,9 @@
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 package com.adobe.cq.forms.core.components.internal.models.v2.form;
 
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -32,6 +35,8 @@
 import org.apache.sling.models.annotations.injectorspecific.ValueMapValue;
 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.GuideSchemaType;
@@ -50,10 +55,12 @@
 import com.adobe.cq.forms.core.components.models.form.ThankYouOption;
 import com.adobe.cq.forms.core.components.util.AbstractContainerImpl;
 import com.adobe.cq.forms.core.components.util.ComponentUtils;
+import com.adobe.cq.forms.core.components.views.Views;
 import com.day.cq.commons.LanguageUtil;
 import com.day.cq.wcm.api.Page;
 import com.day.cq.wcm.api.PageManager;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Model(
     adaptables = { SlingHttpServletRequest.class, Resource.class },
@@ -63,6 +70,7 @@
 public class FormContainerImpl extends AbstractContainerImpl implements FormContainer {
     protected static final String RESOURCE_TYPE = "core/fd/components/form/container/v2/container";
 
+    private static final Logger logger = LoggerFactory.getLogger(FormContainerImpl.class);
     private static final String DOR_TYPE = "dorType";
     private static final String DOR_TEMPLATE_REF = "dorTemplateRef";
     private static final String DOR_TEMPLATE_TYPE = "dorTemplateType";
@@ -359,4 +367,33 @@
         return FormContainer.super.getName();
     }
 
+    @JsonIgnore
+    public String getFormDefinition() {
+        String result = null;
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            Writer writer = new StringWriter();
+            // return publish view specific properties only for runtime
+            mapper.writerWithView(Views.Publish.class).writeValue(writer, this);
+            result = writer.toString();
+        } catch (IOException e) {
+            logger.error("Unable to generate json from resource");
+        }
+        return result;
+    }
+
+    @Override
+    @Nullable
+    @JsonIgnore
+    public Boolean isEdgeDeliveryRequest() {
+        if (request != null) {
+            Object isEdgeDelivery = request.getAttribute("com.adobe.aem.wcm.franklin.internal.servlets.FranklinDeliveryServlet");
+            Boolean res = true;
+            if (isEdgeDelivery == null || isEdgeDelivery.equals(Boolean.FALSE)) {
+                res = false;
+            }
+            return res;
+        }
+        return false;
+    }
 }

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

@@ -363,4 +363,20 @@
         return null;
     }
 
+    @JsonIgnore
+    default String getFormDefinition() {
+        return null;
+    }
+
+    /**
+     * Returns whether this request is originating from edge delivery.
+     *
+     * @return whether this request is originating from edge delivery
+     * @since com.adobe.cq.forms.core.components.models.form 5.3.0
+     */
+    @Nullable
+    @JsonIgnore
+    default Boolean isEdgeDeliveryRequest() {
+        return null;
+    }
 }

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

@@ -230,6 +230,22 @@ void testGetThankYouMessage() throws Exception {
         assertEquals("Thank you for submitting.", formContainer.getThankYouMessage());
     }
 
+    @Test
+    void testGetIsEdgeDeliveryRequest() throws Exception {
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
+        MockSlingHttpServletRequest request = context.request();
+        request.setAttribute("com.adobe.aem.wcm.franklin.internal.servlets.FranklinDeliveryServlet", false);
+        assertFalse(formContainer.isEdgeDeliveryRequest());
+    }
+
+    @Test
+    void testGetIsEdgeDeliveryRequestTrue() throws Exception {
+        FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
+        MockSlingHttpServletRequest request = context.request();
+        request.setAttribute("com.adobe.aem.wcm.franklin.internal.servlets.FranklinDeliveryServlet", true);
+        assertTrue(formContainer.isEdgeDeliveryRequest());
+    }
+
     @Test
     void testGetThankYouOption() throws Exception {
         FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);

examples/ui.apps/src/main/content/jcr_root/apps/forms-components-examples/components/form/container/.content.xml

@@ -4,4 +4,5 @@
     jcr:title="Adaptive Form Container"
     jcr:description="Add an Adaptive Form to a page."
     sling:resourceSuperType="core/fd/components/form/container/v2/container"
+    cq:styleElements="[div,section,article,main,aside,header,footer]"
     componentGroup="Core Components Examples - Adaptive Form"/>

ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/container.html

@@ -13,9 +13,19 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+
+<div class="form" data-sly-use.container="com.adobe.cq.forms.core.components.models.form.FormContainer" data-sly-test.isEdgeDeliveryRequest="${container.edgeDeliveryRequest}">
+    <div>
+        <div>
+      <pre>
+          <code>${container.formDefinition}</code>
+      </pre>
+        </div>
+    </div>
+</div>
+<sly data-sly-test="${!isEdgeDeliveryRequest}">
 <sly data-sly-test="${wcmmode.edit}" data-sly-use.allowed="com.day.cq.wcm.foundation.AllowedComponentList"></sly>
-<form data-sly-use.container="com.adobe.cq.forms.core.components.models.form.FormContainer"
-      data-sly-use.grid="com.day.cq.wcm.foundation.model.responsivegrid.ResponsiveGrid"
+<form data-sly-use.grid="com.day.cq.wcm.foundation.model.responsivegrid.ResponsiveGrid"
       data-sly-use.templates="core/wcm/components/commons/v1/templates.html"
       action="${container.metadata.action}"
       id="${container.id}"
@@ -43,3 +53,4 @@
     </div>
 </form>
 <div data-cmp-adaptiveform-container-loader="${container.id}"></div>
+</sly>

ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/page/v1/page/body.html

@@ -0,0 +1,21 @@
+<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright 2021 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.
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
+
+<main>
+    <sly data-sly-use.templatedContainer="com.day.cq.wcm.foundation.TemplatedContainer"
+         data-sly-repeat.child="${templatedContainer.structureResources}"
+         data-sly-resource="${child.path @ resourceType=child.resourceType, decorationTagName='div'}"></sly>
+</main>