From 4a078704c84f456bbff7971bb8c27fe000e812c8 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Mon, 29 Sep 2025 14:13:06 +0530 Subject: [PATCH 1/6] feat: add publish instance URL support for form submission routing --- .../internal/models/v2/form/FormContainerImpl.java | 4 ++++ .../core/components/models/form/FormContainer.java | 12 ++++++++++++ .../core/components/models/form/package-info.java | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java index 8e06b55d06..b9ce49dee5 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java @@ -101,6 +101,9 @@ public class FormContainerImpl extends AbstractContainerImpl implements FormCont @OSGiService(injectionStrategy = InjectionStrategy.OPTIONAL) private HttpClientBuilderFactory clientBuilderFactory; + // @OSGiService + // private Externalizer externalizer; + private static final String DRAFT_PREFILL_SERVICE = "service://FP/draft/"; @SlingObject(injectionStrategy = InjectionStrategy.OPTIONAL) @@ -509,6 +512,7 @@ private Map getSubmitProperties() { ((Map) submitProps.get(SS_SPREADSHEET)).put(entry.getKey(), entry.getValue()); } } + submitProps.put("aemDomainPublish", System.getenv("AEM_DOMAIN_PUBLISH")); } return submitProps; } diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java index 463ccbbbd4..2c720aee64 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java @@ -15,6 +15,7 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ package com.adobe.cq.forms.core.components.models.form; +import java.net.MalformedURLException; import java.util.Collections; import java.util.Map; import java.util.function.Consumer; @@ -308,6 +309,17 @@ default String getLang() { return Base.DEFAULT_LANGUAGE; } + /** + * Returns the publish instance URL for the form. + * + * @return the publish instance URL as a String, or null if not available + * @throws MalformedURLException if the URL is malformed + * @since com.adobe.cq.forms.core.components.models.form 5.12.4 + */ + default String getPublishInstance() throws MalformedURLException { + return null; + } + /** * Returns the language of the containing page * diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java index 28bc21d5c0..04df00824b 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java @@ -35,7 +35,7 @@ *

*/ -@Version("5.12.3") +@Version("5.12.4") package com.adobe.cq.forms.core.components.models.form; import org.osgi.annotation.versioning.Version; From 92fd81d95e11c4217fdf40d5d381a3392d38f722 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Mon, 29 Sep 2025 14:13:13 +0530 Subject: [PATCH 2/6] feat: add publish instance URL support for form submission routing --- .../components/internal/models/v2/form/FormContainerImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java index b9ce49dee5..b01595f37b 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java @@ -101,8 +101,6 @@ public class FormContainerImpl extends AbstractContainerImpl implements FormCont @OSGiService(injectionStrategy = InjectionStrategy.OPTIONAL) private HttpClientBuilderFactory clientBuilderFactory; - // @OSGiService - // private Externalizer externalizer; private static final String DRAFT_PREFILL_SERVICE = "service://FP/draft/"; From 3bbd035c9fabcce49e01db6b8775930ef046a8ee Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Mon, 29 Sep 2025 14:23:41 +0530 Subject: [PATCH 3/6] refactor: simplify form action URL generation in FormContainerImpl --- .../internal/models/v2/form/FormContainerImpl.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java index b01595f37b..e00a1e44b9 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java @@ -313,17 +313,12 @@ public String getRoleAttribute() { @Override public String getAction() { - List supportedSubmitActions = ComponentUtils.getSupportedSubmitActions(clientBuilderFactory); String resourceType = resource.getValueMap().get("sling:resourceType", String.class); - if (supportedSubmitActions.contains(resource.getValueMap().get(ReservedProperties.PN_SUBMIT_ACTION_NAME))) { - if (resourceType != null && resourceType.contains("/franklin")) { - return ""; - } else { - return "https://forms.adobe.com" + ADOBE_GLOBAL_API_ROOT + FORMS_RUNTIME_API_GLOBAL_ROOT + "/submit/" + - ComponentUtils.getEncodedPath(resource.getPath() + ".model.json"); - } + if (resourceType != null && resourceType.contains("/franklin")) { + return ""; + } else { + return getContextPath() + resourceResolver.map(ADOBE_GLOBAL_API_ROOT + FORMS_RUNTIME_API_GLOBAL_ROOT + "/submit/" + getId()); } - return getContextPath() + resourceResolver.map(ADOBE_GLOBAL_API_ROOT + FORMS_RUNTIME_API_GLOBAL_ROOT + "/submit/" + getId()); } @Override From 5f333d4a3fc9c37f528d9982887b3ff6ff01d48a Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Sun, 5 Oct 2025 12:54:39 +0530 Subject: [PATCH 4/6] refactor: simplify form action URL generation in FormContainerImpl --- .../core/components/models/form/FormContainer.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java index 2c720aee64..2906591942 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java @@ -309,17 +309,6 @@ default String getLang() { return Base.DEFAULT_LANGUAGE; } - /** - * Returns the publish instance URL for the form. - * - * @return the publish instance URL as a String, or null if not available - * @throws MalformedURLException if the URL is malformed - * @since com.adobe.cq.forms.core.components.models.form 5.12.4 - */ - default String getPublishInstance() throws MalformedURLException { - return null; - } - /** * Returns the language of the containing page * From 75694df3ef3f6e71063e643b92120eb55850df36 Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Sun, 5 Oct 2025 13:03:16 +0530 Subject: [PATCH 5/6] chore: ran format-code on the changes --- .../components/internal/models/v2/form/FormContainerImpl.java | 1 - .../cq/forms/core/components/models/form/FormContainer.java | 1 - 2 files changed, 2 deletions(-) diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java index e00a1e44b9..a57cdd5383 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java @@ -101,7 +101,6 @@ public class FormContainerImpl extends AbstractContainerImpl implements FormCont @OSGiService(injectionStrategy = InjectionStrategy.OPTIONAL) private HttpClientBuilderFactory clientBuilderFactory; - private static final String DRAFT_PREFILL_SERVICE = "service://FP/draft/"; @SlingObject(injectionStrategy = InjectionStrategy.OPTIONAL) diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java index 2906591942..463ccbbbd4 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java @@ -15,7 +15,6 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ package com.adobe.cq.forms.core.components.models.form; -import java.net.MalformedURLException; import java.util.Collections; import java.util.Map; import java.util.function.Consumer; From 00d227a7d05af1f00d8e2578738be1670b8ce5cd Mon Sep 17 00:00:00 2001 From: deepprakash345 Date: Sun, 5 Oct 2025 13:07:27 +0530 Subject: [PATCH 6/6] chore: reverted version upgrade on package --- .../cq/forms/core/components/models/form/package-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java index 04df00824b..28bc21d5c0 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java @@ -35,7 +35,7 @@ *

*/ -@Version("5.12.4") +@Version("5.12.3") package com.adobe.cq.forms.core.components.models.form; import org.osgi.annotation.versioning.Version;