Merge branch 'develop'

Author: stefanseifert

.github/workflows/release-from-tag.yml

@@ -15,5 +15,5 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ncipollo/release-action@v1
       with:
-        body: 'Changes: https://wcm.io/wcm/core-components/changes-report.html'
+        body: 'Changes: https://wcm.io/wcm/core-components/changes.html'
         token: ${{ secrets.GITHUB_TOKEN }}

build-deploy_aem65.sh

@@ -26,7 +26,7 @@ fi
 # install AEM 6.5 with service pack
 mvn --non-recursive wcmio-content-package:install \
     --activate-profiles=${MAVEN_PROFILES} \
-    -Dvault.artifact=adobe.binary.aem.65.servicepack:aem-service-pkg:zip:6.5.20.0 \
+    -Dvault.artifact=adobe.binary.aem.65.servicepack:aem-service-pkg:zip:6.5.22.0 \
     -Dvault.delayAfterInstallSec=30
 
 if [ "$?" -ne "0" ]; then

bundles/core/pom.xml

@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>2.0.4-2.25.4</version>
+    <version>2.0.6-2.25.4</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.wcm.core.components</artifactId>
-  <version>2.0.4-2.25.4</version>
+  <version>2.0.6-2.25.4</version>
   <packaging>jar</packaging>
 
   <name>WCM Core Components</name>

bundles/core/src/main/java/io/wcm/wcm/core/components/impl/models/helpers/PageListItemV4Impl.java

@@ -192,7 +192,8 @@ private Resource buildTeaserResource(@NotNull String delegateResourceType) {
       overriddenProperties.put(PN_LINK_CONTENT_REF, this.getPath());
     }
 
-    return new CoreResourceWrapper(resourceToBeWrapped, delegateResourceType, overriddenProperties, hiddenProperties);
+    return new CoreResourceWrapper(resourceToBeWrapped, resourceToBeWrapped.getPath(),
+        delegateResourceType, overriddenProperties, hiddenProperties);
   }
 
   @JsonIgnore

bundles/core/src/main/java/io/wcm/wcm/core/components/impl/models/v2/ImageV2Impl.java

@@ -50,6 +50,7 @@
  * <li>Build image using Media handler</li>
  * <li>Build link using Link handler</li>
  * </ul>
+ *
  * <p>
  * This image component does not take full use of all wcm.io Media handler features, but rather emulates
  * the behavior of the original AEM core image component and it special behavior.

bundles/core/src/main/java/io/wcm/wcm/core/components/impl/models/v2/TeaserV2Impl.java

@@ -112,8 +112,8 @@ private void activate() {
     boolean pretitleHidden = currentStyle.get(PN_PRETITLE_HIDDEN, false);
     boolean titleHidden = currentStyle.get(PN_TITLE_HIDDEN, false);
     boolean descriptionHidden = currentStyle.get(PN_DESCRIPTION_HIDDEN, false);
-    titleType = currentStyle.get(PN_TITLE_TYPE, (String)null);
-    showTitleType = currentStyle.get(Teaser.PN_SHOW_TITLE_TYPE, false);
+    titleType = currentStyle.get(PN_TITLE_TYPE, String.class);
+    showTitleType = currentStyle.get(PN_SHOW_TITLE_TYPE, false);
     imageLinkHidden = currentStyle.get(PN_IMAGE_LINK_HIDDEN, false);
     titleLinkHidden = currentStyle.get(PN_TITLE_LINK_HIDDEN, false);
     boolean actionsDisabled = currentStyle.get(PN_ACTIONS_DISABLED, false);
@@ -250,7 +250,7 @@ public String getDescription() {
   @Override
   public String getTitleType() {
     if (showTitleType) {
-      titleType = resource.getValueMap().get(Teaser.PN_TITLE_TYPE, titleType);
+      titleType = resource.getValueMap().get(PN_TITLE_TYPE, titleType);
     }
     return titleType;
   }

bundles/core/src/main/java/io/wcm/wcm/core/components/impl/models/v4/ListV4Impl.java

@@ -199,7 +199,7 @@ private Calendar getLastModifiedDate(ListItem item) {
     if (!link.isValid()) {
       return null;
     }
-    String linkText = itemResource.getValueMap().get(List.PN_LINK_TEXT, String.class);
+    String linkText = itemResource.getValueMap().get(PN_LINK_TEXT, String.class);
     if (StringUtils.isBlank(linkText)) {
       linkText = link.getUrl();
     }

bundles/core/src/main/java/io/wcm/wcm/core/components/impl/servlets/ImageWidthProxyServlet.java

@@ -39,6 +39,7 @@
  * This servlet acts as a "proxy" for the {@link io.wcm.handler.media.impl.ImageFileServlet}
  * that emulates support for the "widths" attributes of the core component and maps them
  * to media handler-URLs internally.
+ *
  * <p>
  * Expected selectors:
  * </p>

bundles/core/src/main/java/io/wcm/wcm/core/components/impl/util/ComponentFeatureImageResolver.java

@@ -56,7 +56,7 @@ public class ComponentFeatureImageResolver {
   private final MediaHandler mediaHandler;
   private final Map<String, Object> mediaHandlerProperties = new HashMap<>();
 
-  private boolean imageFromPageImage;
+  private final Boolean imageFromPageImage;
   private final boolean altValueFromPageImage;
   private boolean altValueFromDam;
   private final boolean isDecorative;
@@ -78,7 +78,7 @@ public ComponentFeatureImageResolver(@NotNull Resource componentResource,
 
     // component properties
     ValueMap props = componentResource.getValueMap();
-    this.imageFromPageImage = props.get(PN_IMAGE_FROM_PAGE_IMAGE, false);
+    this.imageFromPageImage = props.get(PN_IMAGE_FROM_PAGE_IMAGE, Boolean.class);
     this.altValueFromPageImage = props.get(PN_ALT_VALUE_FROM_PAGE_IMAGE, false);
     this.altValueFromDam = props.get(PN_ALT_VALUE_FROM_DAM, false);
     this.isDecorative = props.get(PN_IS_DECORATIVE, currentStyle.get(PN_IS_DECORATIVE, false));
@@ -106,15 +106,6 @@ public ComponentFeatureImageResolver mediaHandlerProperty(@NotNull String key, @
     return this;
   }
 
-  /**
-   * @param value Image from page image
-   * @return self
-   */
-  public ComponentFeatureImageResolver imageFromPageImage(boolean value) {
-    this.imageFromPageImage = value;
-    return this;
-  }
-
   /**
    * @param value Alt Value from DAM
    * @return self
@@ -131,16 +122,17 @@ public ComponentFeatureImageResolver altValueFromDam(boolean value) {
   public @NotNull Media buildMedia() {
     Media media = mediaHandler.invalid();
 
-    if (!imageFromPageImage) {
+    boolean useImageFromPageImage = imageFromPageImage != null && imageFromPageImage;
+    if (imageFromPageImage == null) {
       // image from resource properties
       media = buildMedia(componentResource);
       if (!media.isValid() && media.getMediaInvalidReason() == MediaInvalidReason.MEDIA_REFERENCE_MISSING) {
-        // fallback to image from page if no reference was given
-        imageFromPageImage = true;
+        // fallback to image from page if no reference was given and imageFromPageImage is neither enabled nor disabled
+        useImageFromPageImage = true;
       }
     }
 
-    if (imageFromPageImage) {
+    if (useImageFromPageImage) {
       // try to get feature image from target page
       if (targetPage != null) {
         Resource featuredImageResource = ComponentUtils.getFeaturedImage(targetPage);
@@ -168,7 +160,10 @@ public ComponentFeatureImageResolver altValueFromDam(boolean value) {
     if (resource == null) {
       return null;
     }
-    return new CoreResourceWrapper(resource, HandlerUnwrapper.getResourceType(componentResource));
+    return new CoreResourceWrapper(resource,
+        // use path of component resource to get policy mappings for those
+        componentResource.getPath(),
+        HandlerUnwrapper.getResourceType(componentResource));
   }
 
   /**

bundles/core/src/main/java/io/wcm/wcm/core/components/impl/util/CoreResourceWrapper.java

@@ -42,26 +42,30 @@
 @Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME, extensions = ExporterConstants.SLING_MODEL_EXTENSION)
 public final class CoreResourceWrapper extends ResourceWrapper {
 
-  private ValueMap valueMap;
-  private String overriddenResourceType;
+  private final String path;
+  private final ValueMap valueMap;
+  private final String overriddenResourceType;
 
   /**
    * @param resource Target resource
+   * @param path Path of wrapped resource
    * @param overriddenResourceType New resource type
    */
-  public CoreResourceWrapper(@NotNull Resource resource, @NotNull String overriddenResourceType) {
-    this(resource, overriddenResourceType, null, null);
+  public CoreResourceWrapper(@NotNull Resource resource, @NotNull String path, @NotNull String overriddenResourceType) {
+    this(resource, path, overriddenResourceType, null, null);
   }
 
   /**
    * @param resource Target resource
+   * @param path Path of wrapped resource
    * @param overriddenResourceType New resource type
    * @param overriddenProperties Properties to add/overwrite in value map
    * @param hiddenProperties Properties to hide from value map
    */
-  public CoreResourceWrapper(@NotNull Resource resource, @NotNull String overriddenResourceType,
+  public CoreResourceWrapper(@NotNull Resource resource, @NotNull String path, @NotNull String overriddenResourceType,
       @Nullable Map<String, Object> overriddenProperties, @Nullable Set<String> hiddenProperties) {
     super(resource);
+    this.path = path;
     if (StringUtils.isEmpty(overriddenResourceType)) {
       throw new IllegalArgumentException("The " + CoreResourceWrapper.class.getName() + " needs to override the resource type of " +
           "the wrapped resource, but the resourceType argument was null or empty.");
@@ -77,6 +81,11 @@ public CoreResourceWrapper(@NotNull Resource resource, @NotNull String overridde
     }
   }
 
+  @Override
+  public String getPath() {
+    return path;
+  }
+
   @Override
   @SuppressWarnings("unchecked")
   public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {

bundles/core/src/test/java/io/wcm/wcm/core/components/impl/models/v1/LanguageNavigationV1ImplTest.java

@@ -60,7 +60,7 @@ class LanguageNavigationV1ImplTest {
   private Page root_fr;
 
   @BeforeEach
-  void setUp() throws Exception {
+  void setUp() {
     loadComponentDefinition(context, RESOURCE_TYPE);
 
     root_en = context.pageManager().getPage(CONTENT_ROOT);

bundles/core/src/test/java/io/wcm/wcm/core/components/impl/models/v2/BreadcrumbV2ImplTest.java

@@ -59,7 +59,7 @@ class BreadcrumbV2ImplTest {
   private Page page3;
 
   @BeforeEach
-  void setUp() throws Exception {
+  void setUp() {
     loadComponentDefinition(context, RESOURCE_TYPE);
 
     root = context.pageManager().getPage(CONTENT_ROOT);

bundles/core/src/test/java/io/wcm/wcm/core/components/impl/models/v2/TeaserV2ImplTest.java

@@ -40,8 +40,10 @@
 import static io.wcm.handler.link.LinkNameConstants.PN_LINK_EXTERNAL_REF;
 import static io.wcm.handler.link.LinkNameConstants.PN_LINK_TYPE;
 import static io.wcm.handler.link.LinkNameConstants.PN_LINK_WINDOW_TARGET;
+import static io.wcm.handler.media.MediaNameConstants.NN_COMPONENT_MEDIA_RESPONSIVEIMAGE_SIZES;
 import static io.wcm.handler.media.MediaNameConstants.PN_COMPONENT_MEDIA_AUTOCROP;
 import static io.wcm.handler.media.MediaNameConstants.PN_COMPONENT_MEDIA_FORMATS;
+import static io.wcm.handler.media.MediaNameConstants.PN_COMPONENT_MEDIA_RESPONSIVE_TYPE;
 import static io.wcm.handler.media.MediaNameConstants.PN_MEDIA_REF_STANDARD;
 import static io.wcm.wcm.core.components.impl.models.helpers.DataLayerTestUtils.enableDataLayer;
 import static io.wcm.wcm.core.components.impl.models.v2.TeaserV2Impl.RESOURCE_TYPE;
@@ -69,6 +71,7 @@
 import com.adobe.cq.wcm.core.components.models.datalayer.ComponentData;
 import com.day.cq.dam.api.Asset;
 import com.day.cq.wcm.api.Page;
+import com.day.cq.wcm.api.policies.ContentPolicyMapping;
 
 import io.wcm.handler.link.type.ExternalLinkType;
 import io.wcm.handler.link.type.InternalLinkType;
@@ -199,6 +202,39 @@ void testTitleDescriptionImageFromPage() {
     assertValidMedia(underTest, "/content/dam/sample/sample.jpg/_jcr_content/renditions/original./sample.jpg");
   }
 
+  @Test
+  void testTitleDescriptionImageFromPage_WithContentPolicy() {
+    Page targetPage = context.create().page(page, "page1", null,
+        JCR_TITLE, "Page Title",
+        JCR_DESCRIPTION, "Page Description");
+    context.create().resource(targetPage, NN_PAGE_FEATURED_IMAGE,
+        PN_MEDIA_REF_STANDARD, asset.getPath());
+    context.currentResource(context.create().resource(page, "teaser",
+        PROPERTY_RESOURCE_TYPE, RESOURCE_TYPE,
+        JCR_TITLE, "Teaser Title",
+        JCR_DESCRIPTION, "Teaser Description",
+        PN_LINK_TYPE, InternalLinkType.ID,
+        PN_LINK_CONTENT_REF, targetPage.getPath(),
+        PN_TITLE_FROM_PAGE, true,
+        PN_DESCRIPTION_FROM_PAGE, true,
+        PN_IMAGE_FROM_PAGE_IMAGE, true,
+        PN_ALT_VALUE_FROM_PAGE_IMAGE, true));
+
+    ContentPolicyMapping policyMapping = context.contentPolicyMapping(RESOURCE_TYPE,
+        JCR_TITLE, "Teaser Mock Policy",
+        PN_COMPONENT_MEDIA_FORMATS, MediaFormats.SQUARE.getName(),
+        PN_COMPONENT_MEDIA_AUTOCROP, Boolean.TRUE,
+        PN_COMPONENT_MEDIA_RESPONSIVE_TYPE, "imageSizes");
+    context.create().resource(policyMapping.getPolicy().getPath() + "/" + NN_COMPONENT_MEDIA_RESPONSIVEIMAGE_SIZES,
+        "widths", "45,90");
+
+    Teaser underTest = AdaptTo.notNull(context.request(), Teaser.class);
+
+    assertEquals("Page Title", underTest.getTitle());
+    assertEquals("Page Description", underTest.getDescription());
+    assertValidMedia(underTest, "/content/dam/sample/sample.jpg/_jcr_content/renditions/original.image_file.90.90.35,0,125,90.file/sample.jpg");
+  }
+
   @Test
   void testTitleDescriptionFromPage_HtmlReservedChars() {
     Page targetPage = context.create().page(page, "page1", null,

bundles/core/src/test/java/io/wcm/wcm/core/components/impl/models/v3/BreadcrumbV3ImplTest.java

@@ -59,7 +59,7 @@ class BreadcrumbV3ImplTest {
   private Page page3;
 
   @BeforeEach
-  void setUp() throws Exception {
+  void setUp() {
     loadComponentDefinition(context, RESOURCE_TYPE);
 
     root = context.pageManager().getPage(CONTENT_ROOT);

bundles/core/src/test/java/io/wcm/wcm/core/components/impl/servlets/ImageWidthProxyServletTest.java

@@ -40,6 +40,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
+import org.mockito.Mock.Strictness;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import com.day.cq.dam.api.Asset;
@@ -63,7 +64,7 @@ class ImageWidthProxyServletTest {
   private Page page;
   private Asset asset;
 
-  @Mock(lenient = true)
+  @Mock(strictness = Strictness.LENIENT)
   private MockRequestDispatcherFactory requestDispatcherFactory;
   @Mock
   private RequestDispatcher requestDispatcher;

bundles/core/src/test/java/io/wcm/wcm/core/components/impl/util/ComponentFeatureImageResolverTest.java

@@ -208,6 +208,27 @@ void testComponentImageFromPage() {
     assertEquals("Feature Alt", media.getAsset().getAltText());
   }
 
+  @Test
+  void testComponentImageFromPage_Disabled() {
+    Resource component = context.create().resource(page1, "comp1",
+        PROPERTY_RESOURCE_TYPE, COMPONENT_RESOURCE_TYPE,
+        PN_MEDIA_REF_STANDARD, asset1.getPath(),
+        PN_MEDIA_ALTTEXT_STANDARD, "My Alt",
+        PN_IMAGE_FROM_PAGE_IMAGE, false,
+        PN_ALT_VALUE_FROM_PAGE_IMAGE, true);
+
+    // create feature image in page2
+    context.create().resource(page2, NN_PAGE_FEATURED_IMAGE,
+        PN_MEDIA_REF_STANDARD, asset2.getPath(),
+        PN_MEDIA_ALTTEXT_STANDARD, "Feature Alt");
+
+    Media media = newComponentFeatureImageResolver(component)
+        .targetPage(page2)
+        .buildMedia();
+
+    assertFalse(media.isValid());
+  }
+
   @Test
   @SuppressWarnings("null")
   void testComponentImageFromPage_FallbackCurrentPage() {

bundles/core/src/test/java/io/wcm/wcm/core/components/impl/util/CoreResourceWrapperTest.java

@@ -59,7 +59,9 @@ void testWrappingWithSimpleResource() {
         "a", 1,
         "b", 2,
         ResourceResolver.PROPERTY_RESOURCE_TYPE, "a/b/c");
-    Resource wrappedResource = new CoreResourceWrapper(resource, "d/e/f");
+    Resource wrappedResource = new CoreResourceWrapper(resource, resource.getPath(), "d/e/f");
+
+    assertEquals(resource.getPath(), wrappedResource.getPath());
 
     Map<String, Object> expectedProperties = new HashMap<>(resource.getValueMap());
     expectedProperties.put(ResourceResolver.PROPERTY_RESOURCE_TYPE, "d/e/f");
@@ -74,7 +76,9 @@ void testWrappingWithHiddenProperties() {
         "a", 1,
         "b", 2,
         ResourceResolver.PROPERTY_RESOURCE_TYPE, "a/b/c");
-    Resource wrappedResource = new CoreResourceWrapper(resource, "d/e/f", null, Set.of("b"));
+    Resource wrappedResource = new CoreResourceWrapper(resource, "/content/test2", "d/e/f", null, Set.of("b"));
+
+    assertEquals("/content/test2", wrappedResource.getPath());
 
     Map<String, Object> expectedProperties = new HashMap<>(resource.getValueMap());
     expectedProperties.put(ResourceResolver.PROPERTY_RESOURCE_TYPE, "d/e/f");
@@ -95,7 +99,7 @@ void testWrappingWithOverridenProperties() {
     Map<String, Object> overriddenProperties = ImmutableValueMap.of(
         "a", "1",
         "b", "2");
-    Resource wrappedResource = new CoreResourceWrapper(resource, "a/b/c", overriddenProperties, null);
+    Resource wrappedResource = new CoreResourceWrapper(resource, resource.getPath(), "a/b/c", overriddenProperties, null);
 
     // isResourceType()
     assertTrue(wrappedResource.isResourceType("a/b/c"));
@@ -113,7 +117,7 @@ void testWrappingWithOverridenProperties() {
   @Test
   @SuppressWarnings("null")
   void testNulls() {
-    assertThrows(IllegalArgumentException.class, () -> new CoreResourceWrapper(null, null));
+    assertThrows(IllegalArgumentException.class, () -> new CoreResourceWrapper(null, null, null));
   }
 
   @Test
@@ -124,7 +128,7 @@ void isResourceTypeDelegated() {
     when(toBeWrapped.getValueMap()).thenReturn(new ValueMapDecorator(Collections.emptyMap()));
     when(toBeWrapped.getResourceResolver()).thenReturn(resourceResolver);
     when(resourceResolver.isResourceType(any(CoreResourceWrapper.class), any(String.class))).thenReturn(true);
-    Resource wrappedResource = new CoreResourceWrapper(toBeWrapped, "a/b/c");
+    Resource wrappedResource = new CoreResourceWrapper(toBeWrapped, toBeWrapped.getPath(), "a/b/c");
     assertTrue(wrappedResource.isResourceType("a/b/c"));
     verify(resourceResolver).isResourceType(wrappedResource, "a/b/c");
   }

bundles/core/src/test/java/io/wcm/wcm/core/components/testcontext/AppAemContext.java

@@ -31,7 +31,6 @@
 import java.io.IOException;
 import java.util.Locale;
 
-import org.apache.sling.api.resource.PersistenceException;
 import org.jetbrains.annotations.NotNull;
 
 import io.wcm.handler.media.spi.MediaFormatProvider;
@@ -71,7 +70,7 @@ public static AemContext newAemContext() {
    */
   private static final AemContextCallback SETUP_CALLBACK = new AemContextCallback() {
     @Override
-    public void execute(@NotNull AemContext context) throws PersistenceException, IOException {
+    public void execute(@NotNull AemContext context) throws IOException {
 
       // context path strategy
       MockCAConfig.contextPathStrategyAbsoluteParent(context, ROOT_LEVEL - 1, ROOT_LEVEL);