Merge branch 'develop'

Author: stefanseifert

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.15.0 \
+    -Dvault.artifact=adobe.binary.aem.65.servicepack:aem-service-pkg:zip:6.5.16.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>1.12.4-2.21.2</version>
+    <version>1.13.0-2.22.6</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.wcm.core.components</artifactId>
-  <version>1.12.4-2.21.2</version>
+  <version>1.13.0-2.22.6</version>
   <packaging>jar</packaging>
 
   <name>WCM Core Components</name>

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

@@ -19,51 +19,19 @@
  */
 package io.wcm.wcm.core.components.impl.models.helpers;
 
-import static com.adobe.cq.wcm.core.components.models.List.PN_TEASER_DELEGATE;
-import static com.day.cq.commons.jcr.JcrConstants.JCR_DESCRIPTION;
-import static com.day.cq.commons.jcr.JcrConstants.JCR_TITLE;
-import static io.wcm.handler.link.LinkNameConstants.PN_LINK_CONTENT_REF;
-import static io.wcm.handler.link.LinkNameConstants.PN_LINK_TYPE;
-
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.sling.api.resource.Resource;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.adobe.cq.wcm.core.components.models.ListItem;
-import com.adobe.cq.wcm.core.components.models.datalayer.PageData;
-import com.adobe.cq.wcm.core.components.models.datalayer.builder.DataLayerBuilder;
-import com.adobe.cq.wcm.core.components.util.ComponentUtils;
 import com.day.cq.wcm.api.Page;
 import com.day.cq.wcm.api.components.Component;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import io.wcm.handler.link.Link;
-import io.wcm.handler.link.type.InternalLinkType;
-import io.wcm.wcm.core.components.impl.link.LinkWrapper;
-import io.wcm.wcm.core.components.impl.util.CoreResourceWrapper;
 
 /**
  * {@link ListItem} implementation for page links.
  */
-public class PageListItemV2Impl extends AbstractListItemImpl implements ListItem {
-
-  private final Page page;
-  protected final LinkWrapper link;
-  private final Component parentComponent;
-  private final boolean showDescription;
-  private final boolean linkItems;
-  private Resource teaserResource;
-
-  private static final Logger log = LoggerFactory.getLogger(PageListItemV2Impl.class);
+public class PageListItemV2Impl extends PageListItemV4Impl implements ListItem {
 
   /**
    * @param page Page
@@ -76,12 +44,7 @@ public class PageListItemV2Impl extends AbstractListItemImpl implements ListItem
   public PageListItemV2Impl(@NotNull Page page, @NotNull Link link,
       @Nullable String parentId, @Nullable Component parentComponent,
       boolean showDescription, boolean linkItems) {
-    super(page.getContentResource(), parentId, parentComponent);
-    this.page = page;
-    this.link = new LinkWrapper(link);
-    this.parentComponent = parentComponent;
-    this.showDescription = showDescription;
-    this.linkItems = linkItems;
+    super(page, link, parentId, parentComponent, showDescription, linkItems, null);
   }
 
   /**
@@ -95,117 +58,4 @@ public PageListItemV2Impl(@NotNull Page page, @NotNull Link link,
     this(page, link, parentId, parentComponent, false, false);
   }
 
-  @Override
-  public @Nullable com.adobe.cq.wcm.core.components.commons.link.Link getLink() {
-    return link.orNull();
-  }
-
-  /**
-   * @deprecated Deprecated in API
-   */
-  @Override
-  @Deprecated
-  @JsonIgnore
-  public String getURL() {
-    return link.getURL();
-  }
-
-  @Override
-  public String getTitle() {
-    String title = page.getNavigationTitle();
-    if (title == null) {
-      title = page.getPageTitle();
-    }
-    if (title == null) {
-      title = page.getTitle();
-    }
-    if (title == null) {
-      title = page.getName();
-    }
-    return title;
-  }
-
-  @Override
-  public String getDescription() {
-    return page.getDescription();
-  }
-
-  @Override
-  public Calendar getLastModified() {
-    return page.getLastModified();
-  }
-
-  @Override
-  public String getPath() {
-    return page.getPath();
-  }
-
-  @Override
-  @JsonIgnore
-  public String getName() {
-    return page.getName();
-  }
-
-  @Override
-  @JsonIgnore
-  public @Nullable Resource getTeaserResource() {
-    if (teaserResource == null && parentComponent != null) {
-      String delegateResourceType = parentComponent.getProperties().get(PN_TEASER_DELEGATE, String.class);
-      if (delegateResourceType == null || StringUtils.isEmpty(delegateResourceType)) {
-        log.error("In order for list rendering delegation to work correctly you need to set up the teaserDelegate property on" +
-            " the {} component; its value has to point to the resource type of a teaser component.", parentComponent.getPath());
-      }
-      else {
-        teaserResource = buildTeaserResource(delegateResourceType);
-      }
-    }
-    return teaserResource;
-  }
-
-  /**
-   * Builds a wrapped teaser resource based on the target page with title and description from this link item,
-   * linking to the target page.
-   * @param delegateResourceType Delegate resource type
-   * @return Wrapped teaser resource
-   */
-  private Resource buildTeaserResource(@NotNull String delegateResourceType) {
-    Map<String, Object> overriddenProperties = new HashMap<>();
-    Set<String> hiddenProperties = new HashSet<>();
-
-    Resource resourceToBeWrapped = ComponentUtils.getFeaturedImage(page);
-    if (resourceToBeWrapped != null) {
-      // use the page featured image and inherit properties from the page item
-      overriddenProperties.put(JCR_TITLE, this.getTitle());
-      if (showDescription) {
-        overriddenProperties.put(JCR_DESCRIPTION, this.getDescription());
-      }
-    }
-    else {
-      // use the page content node and inherit properties from the page item
-      resourceToBeWrapped = page.getContentResource();
-      if (resourceToBeWrapped == null) {
-        return null;
-      }
-      if (!showDescription) {
-        hiddenProperties.add(JCR_DESCRIPTION);
-      }
-    }
-    if (linkItems) {
-      overriddenProperties.put(PN_LINK_TYPE, InternalLinkType.ID);
-      overriddenProperties.put(PN_LINK_CONTENT_REF, this.getPath());
-    }
-
-    return new CoreResourceWrapper(resourceToBeWrapped, delegateResourceType, overriddenProperties, hiddenProperties);
-  }
-
-  // --- data layer ---
-
-  @Override
-  protected @NotNull PageData getComponentData() {
-    return DataLayerBuilder.extending(super.getComponentData()).asPage()
-        .withTitle(this::getTitle)
-        .withLinkUrl(link::getURL)
-        .build();
-  }
-
 }