Merge branch 'main' into SITES-41317

Author: Yahor Chaptsou

bundles/core/src/main/java/com/adobe/cq/wcm/core/components/internal/models/v1/contentfragment/ContentFragmentImpl.java

@@ -36,6 +36,7 @@
 import org.apache.sling.models.annotations.injectorspecific.SlingObject;
 import org.apache.sling.models.annotations.injectorspecific.ValueMapValue;
 import org.apache.sling.models.factory.ModelFactory;
+import org.apache.sling.settings.SlingSettingsService;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -45,13 +46,14 @@
 import com.adobe.cq.export.json.ContainerExporter;
 import com.adobe.cq.export.json.ExporterConstants;
 import com.adobe.cq.wcm.core.components.internal.ContentFragmentUtils;
-import com.adobe.cq.wcm.core.components.util.AbstractComponentImpl;
 import com.adobe.cq.wcm.core.components.internal.models.v1.datalayer.ContentFragmentDataImpl;
 import com.adobe.cq.wcm.core.components.models.contentfragment.ContentFragment;
 import com.adobe.cq.wcm.core.components.models.contentfragment.DAMContentFragment;
 import com.adobe.cq.wcm.core.components.models.datalayer.ComponentData;
 import com.adobe.cq.wcm.core.components.models.datalayer.ContentFragmentData;
 import com.adobe.cq.wcm.core.components.models.datalayer.builder.DataLayerBuilder;
+import com.adobe.cq.wcm.core.components.services.contentfragment.VcfUrlProvider;
+import com.adobe.cq.wcm.core.components.util.AbstractComponentImpl;
 
 @Model(
         adaptables = SlingHttpServletRequest.class,
@@ -72,6 +74,10 @@ public class ContentFragmentImpl extends AbstractComponentImpl implements Conten
      */
     public static final String RESOURCE_TYPE = "core/wcm/components/contentfragment/v1/contentfragment";
 
+    private static final String MASTER_VARIATION = "master";
+    private static final String PUBLISH_RUN_MODE = "publish";
+    private static final String VCF_DISPLAY_MODE = "vcf";
+
     @Self(injectionStrategy = InjectionStrategy.REQUIRED)
     private SlingHttpServletRequest slingHttpServletRequest;
 
@@ -84,6 +90,13 @@ public class ContentFragmentImpl extends AbstractComponentImpl implements Conten
     @OSGiService
     private ModelFactory modelFactory;
 
+    @OSGiService(injectionStrategy = InjectionStrategy.OPTIONAL)
+    private SlingSettingsService slingSettingsService;
+
+    @OSGiService(injectionStrategy = InjectionStrategy.OPTIONAL)
+    @Nullable
+    private VcfUrlProvider vcfUrlProvider;
+
     @SlingObject
     private ResourceResolver resourceResolver;
 
@@ -106,14 +119,27 @@ public class ContentFragmentImpl extends AbstractComponentImpl implements Conten
     @Nullable
     private String displayMode;
 
+    @ValueMapValue(name = ContentFragment.PN_VCF_TEMPLATE, injectionStrategy = InjectionStrategy.OPTIONAL)
+    @Nullable
+    private String vcfTemplate;
+
     private DAMContentFragment damContentFragment = new EmptyContentFragment();
 
+    private String fragmentId;
+
     @PostConstruct
     private void initModel() {
         if (StringUtils.isNotEmpty(fragmentPath)) {
             Resource fragmentResource = resourceResolver.getResource(fragmentPath);
             if (fragmentResource != null) {
                 damContentFragment = new DAMContentFragmentImpl(fragmentResource, contentTypeConverter, variationName, elementNames);
+                fragmentId = fragmentResource.getValueMap().get("jcr:uuid", String.class);
+                if (fragmentId == null) {
+                    Resource jcrContent = fragmentResource.getChild("jcr:content");
+                    if (jcrContent != null) {
+                        fragmentId = jcrContent.getValueMap().get("jcr:uuid", String.class);
+                    }
+                }
             }
         }
     }
@@ -224,6 +250,72 @@ public String[] getParagraphs() {
         return content.split("(?=(<p>|<h1>|<h2>|<h3>|<h4>|<h5>|<h6>))");
     }
 
+    @Nullable
+    @Override
+    public String getFragmentId() {
+        return fragmentId;
+    }
+
+    @Nullable
+    @Override
+    public String getVcfRenderUrl() {
+        VcfUrlProvider urls = vcfUrlProvider;
+        if (!isVcfMode() || StringUtils.isEmpty(fragmentId) || urls == null) {
+            return null;
+        }
+        return isPublishRunMode() ? buildPublishUrl(urls) : buildAuthorPreviewUrl(urls);
+    }
+
+    @Override
+    public boolean isVcfAuthRequired() {
+        VcfUrlProvider urls = vcfUrlProvider;
+        return isVcfMode() && !isPublishRunMode() && urls != null;
+    }
+
+    @Nullable
+    @Override
+    public String getVcfTemplatesApiBase() {
+        VcfUrlProvider urls = vcfUrlProvider;
+        return urls == null ? null : urls.getVcfTemplatesApiBase();
+    }
+
+    private boolean isVcfMode() {
+        return VCF_DISPLAY_MODE.equals(displayMode);
+    }
+
+    private String buildPublishUrl(VcfUrlProvider urls) {
+        String format = urls.getVcfPublishUrlFormat();
+        if (format == null || StringUtils.isEmpty(vcfTemplate)) {
+            return null;
+        }
+        String variation = hasNonMasterVariation() ? variationName : "main";
+        return String.format(format, vcfTemplate, fragmentId, variation);
+    }
+
+    private String buildAuthorPreviewUrl(VcfUrlProvider urls) {
+        String authorFormat = urls.getVcfAuthorUrlFormat();
+        if (authorFormat == null) {
+            return null;
+        }
+        String url = String.format(authorFormat, fragmentId);
+        List<String> params = new ArrayList<>();
+        if (StringUtils.isNotEmpty(vcfTemplate)) {
+            params.add("templateId=" + vcfTemplate);
+        }
+        if (hasNonMasterVariation()) {
+            params.add("variation=" + variationName);
+        }
+        return params.isEmpty() ? url : url + "?" + String.join("&", params);
+    }
+
+    private boolean hasNonMasterVariation() {
+        return StringUtils.isNotEmpty(variationName) && !MASTER_VARIATION.equals(variationName);
+    }
+
+    private boolean isPublishRunMode() {
+        return slingSettingsService != null && slingSettingsService.getRunModes().contains(PUBLISH_RUN_MODE);
+    }
+
     @Override
     @NotNull
     protected ComponentData getComponentData() {

bundles/core/src/main/java/com/adobe/cq/wcm/core/components/models/contentfragment/ContentFragment.java

@@ -24,6 +24,7 @@
 import com.adobe.cq.export.json.ComponentExporter;
 import com.adobe.cq.export.json.ContainerExporter;
 import com.adobe.cq.wcm.core.components.models.Component;
+import com.adobe.cq.wcm.core.components.services.contentfragment.VcfUrlProvider;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
@@ -63,6 +64,13 @@ public interface ContentFragment extends DAMContentFragment, ContainerExporter,
      */
     String PN_DISPLAY_MODE = "displayMode";
 
+    /**
+     * Name of the optional resource property that stores the Visual Content Fragment template id.
+     *
+     * @since com.adobe.cq.wcm.core.components.models.contentfragment 1.6.0
+     */
+    String PN_VCF_TEMPLATE = "vcfTemplate";
+
     /**
      * Returns resource type that is used for the internal responsive grid.
      *
@@ -118,4 +126,54 @@ default String getExportedType() {
     default String[] getParagraphs() {
         return null;
     }
+
+    /**
+     * Returns the JCR UUID of the referenced content fragment, or {@code null}
+     * if the fragment does not exist or has no UUID.
+     *
+     * @return the fragment UUID, or {@code null}
+     * @since com.adobe.cq.wcm.core.components.models.contentfragment 1.6.0
+     */
+    @Nullable
+    @JsonIgnore
+    default String getFragmentId() {
+        return null;
+    }
+
+    /**
+     * Returns the VCF render URL, or {@code null} when display mode is not VCF, the fragment has no id, or
+     * {@link VcfUrlProvider} is missing or incomplete. Author uses the preview API; publish uses the HTML delivery URL.
+     *
+     * @return the VCF render URL, or {@code null}
+     * @since com.adobe.cq.wcm.core.components.models.contentfragment 1.6.0
+     */
+    @Nullable
+    @JsonIgnore
+    default String getVcfRenderUrl() {
+        return null;
+    }
+
+    /**
+     * {@code true} on author in VCF mode when a {@link VcfUrlProvider} is present; {@code false} on publish.
+     *
+     * @return {@code true} if VCF auth is required
+     * @since com.adobe.cq.wcm.core.components.models.contentfragment 1.6.0
+     */
+    @JsonIgnore
+    default boolean isVcfAuthRequired() {
+        return false;
+    }
+
+    /**
+     * Base URL for the VCF templates API; the dialog appends {@code /{modelId}/templates?limit=...}.
+     * {@code null} if {@link VcfUrlProvider} is absent or provides no base.
+     *
+     * @return templates API base, or {@code null}
+     * @since com.adobe.cq.wcm.core.components.models.contentfragment 1.6.0
+     */
+    @Nullable
+    @JsonIgnore
+    default String getVcfTemplatesApiBase() {
+        return null;
+    }
 }

bundles/core/src/main/java/com/adobe/cq/wcm/core/components/models/contentfragment/package-info.java

@@ -13,7 +13,7 @@
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License.
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-@Version("1.5.1")
+@Version("1.6.0")
 package com.adobe.cq.wcm.core.components.models.contentfragment;
 
 import org.osgi.annotation.versioning.Version;

bundles/core/src/main/java/com/adobe/cq/wcm/core/components/services/contentfragment/VcfUrlProvider.java

@@ -0,0 +1,45 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2026 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.wcm.core.components.services.contentfragment;
+
+import org.jetbrains.annotations.Nullable;
+import org.osgi.annotation.versioning.ConsumerType;
+
+/**
+ * Optional OSGi service: VCF preview URL patterns and templates API base. Implemented by DAM Content Fragment;
+ * consumed by Core when the Content Fragment component uses {@code displayMode} {@code vcf}.
+ *
+ * @since com.adobe.cq.wcm.core.components.services.contentfragment 1.0.0
+ */
+@ConsumerType
+public interface VcfUrlProvider {
+
+    /** @return API root (optional for Core), or {@code null} */
+    @Nullable
+    String getVcfApiBase();
+
+    /** @return author preview format, one {@code %s} for fragment id, or {@code null} */
+    @Nullable
+    String getVcfAuthorUrlFormat();
+
+    /** @return publish HTML format, three {@code %s}: template id, fragment id, variation, or {@code null} */
+    @Nullable
+    String getVcfPublishUrlFormat();
+
+    /** @return templates API base (dialog appends {@code /{modelId}/templates?...}), or {@code null} */
+    @Nullable
+    String getVcfTemplatesApiBase();
+}

bundles/core/src/main/java/com/adobe/cq/wcm/core/components/services/contentfragment/package-info.java

@@ -0,0 +1,19 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2026 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+@Version("1.0.0")
+package com.adobe.cq.wcm.core.components.services.contentfragment;
+
+import org.osgi.annotation.versioning.Version;