Skip to content

Commit

Permalink
chore: Update BylineImplTest to use ArrayList instead of ImmutableList
Browse files Browse the repository at this point in the history
  • Loading branch information
@VirenderAbt
VirenderAbt committed Jul 31, 2024
1 parent 28cc0f5 commit d876fb2
Show file tree
Hide file tree
Showing 4 changed files with 366 additions and 37 deletions.
76 changes: 43 additions & 33 deletions core/src/main/java/com/adobe/aem/guides/wknd/core/models/impl/ImageListImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,15 @@
*/
package com.adobe.aem.guides.wknd.core.models.impl;

import com.adobe.aem.guides.wknd.core.models.ImageList;
import com.adobe.cq.wcm.core.components.models.Image;
import com.adobe.cq.wcm.core.components.models.datalayer.ComponentData;
import com.adobe.cq.wcm.core.components.models.datalayer.builder.DataLayerBuilder;
import com.adobe.cq.wcm.core.components.util.ComponentUtils;
import com.day.cq.commons.jcr.JcrConstants;
import com.day.cq.search.Predicate;
import com.day.cq.search.PredicateConverter;
import com.day.cq.search.PredicateGroup;
import com.day.cq.search.QueryBuilder;
import com.day.cq.search.eval.JcrPropertyPredicateEvaluator;
import com.day.cq.search.eval.PathPredicateEvaluator;
import com.day.cq.search.eval.TypePredicateEvaluator;
import com.day.cq.wcm.api.Page;
import com.day.cq.wcm.api.PageManager;
import com.day.cq.wcm.api.components.ComponentContext;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import javax.jcr.Session;

import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.SlingHttpServletRequest;
Expand All @@ -52,15 +43,23 @@
import org.apache.sling.models.annotations.via.ResourceSuperType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.jcr.Session;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import com.adobe.aem.guides.wknd.core.models.ImageList;
import com.adobe.cq.wcm.core.components.models.Image;
import com.adobe.cq.wcm.core.components.models.datalayer.ComponentData;
import com.adobe.cq.wcm.core.components.models.datalayer.builder.DataLayerBuilder;
import com.adobe.cq.wcm.core.components.util.ComponentUtils;
import com.day.cq.commons.jcr.JcrConstants;
import com.day.cq.search.Predicate;
import com.day.cq.search.PredicateConverter;
import com.day.cq.search.PredicateGroup;
import com.day.cq.search.QueryBuilder;
import com.day.cq.search.eval.JcrPropertyPredicateEvaluator;
import com.day.cq.search.eval.PathPredicateEvaluator;
import com.day.cq.search.eval.TypePredicateEvaluator;
import com.day.cq.wcm.api.Page;
import com.day.cq.wcm.api.PageManager;
import com.day.cq.wcm.api.components.ComponentContext;

@Model(
adaptables = {SlingHttpServletRequest.class},
Expand Down Expand Up @@ -101,7 +100,7 @@ public class ImageListImpl implements ImageList {
private List<ImageList.ListItem> imageListItems;

@Override
public final Collection<ImageList.ListItem> getListItems() {
public final List<ImageList.ListItem> getListItems() {
if (imageListItems == null) {
if (coreList == null) {
log.warn("Could not locate the AEM WCM Core Components List SlingModel via this component's ResourceSuperType. Returning an empty list.");
Expand All @@ -114,8 +113,8 @@ public final Collection<ImageList.ListItem> getListItems() {
.collect(Collectors.toList());
}
}

return ImmutableList.copyOf(imageListItems);
return List.copyOf(imageListItems);
//return ImmutableList.copyOf(imageListItems);
}

@Override
Expand Down Expand Up @@ -227,7 +226,7 @@ protected java.util.List<Resource> findPageComponentResources(final Page page, f
return componentResources;
}

final Map<String, String> params = ImmutableMap.<String, String>builder().
/*final Map<String, String> params = ImmutableMap.<String, String>builder().
put(PathPredicateEvaluator.PATH, page.getContentResource().getPath()).
put(TypePredicateEvaluator.TYPE, JcrConstants.NT_UNSTRUCTURED).
put(JcrPropertyPredicateEvaluator.PROPERTY, JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY).
Expand All @@ -237,8 +236,19 @@ protected java.util.List<Resource> findPageComponentResources(final Page page, f
put(Predicate.ORDER_BY, "@jcr:path").
put(Predicate.ORDER_BY + "." + Predicate.PARAM_SORT , Predicate.SORT_ASCENDING).
build();

final long start = System.currentTimeMillis();
*/

final Map<String, String> params = new HashMap<String, String>();
params.put(PathPredicateEvaluator.PATH, page.getContentResource().getPath());
params.put(TypePredicateEvaluator.TYPE, JcrConstants.NT_UNSTRUCTURED);
params.put(JcrPropertyPredicateEvaluator.PROPERTY, JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY);
params.put(JcrPropertyPredicateEvaluator.PROPERTY + "." + JcrPropertyPredicateEvaluator.VALUE, slingResourceType);
params.put(PredicateConverter.GROUP_PARAMETER_PREFIX + "." + PredicateGroup.PARAM_LIMIT, String.valueOf(limit));
params.put(PredicateConverter.GROUP_PARAMETER_PREFIX + "." + PredicateGroup.PARAM_GUESS_TOTAL, "true");
params.put(Predicate.ORDER_BY, "@jcr:path");
params.put(Predicate.ORDER_BY + "." + Predicate.PARAM_SORT , Predicate.SORT_ASCENDING);

final long start = System.currentTimeMillis();

final Iterator<Resource> resources = queryBuilder.createQuery(PredicateGroup.create(params),
request.getResourceResolver().adaptTo(Session.class)).getResult().getResources();
Expand Down
10 changes: 8 additions & 2 deletions core/src/test/java/com/adobe/aem/guides/wknd/core/models/impl/BylineImplTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@

import com.adobe.aem.guides.wknd.core.models.Byline;
import com.adobe.cq.wcm.core.components.models.Image;
import com.google.common.collect.ImmutableList;

import static org.mockito.Mockito.*;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

Expand Down Expand Up @@ -76,11 +76,17 @@ public void testGetName() {

@Test
public void testGetOccupations() {
List<String> expected = new ImmutableList.Builder<String>()
/*List<String> expected = new ImmutableList.Builder<String>()
.add("Blogger")
.add("Photographer")
.add("YouTuber")
.build();
*/
List<String> expected = new ArrayList<String>();
expected.add("Blogger");
expected.add("Photographer");
expected.add("YouTuber");


ctx.currentResource("/content/byline");
Byline byline = ctx.request().adaptTo(Byline.class);
Expand Down
7 changes: 5 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@
<bnd.version>5.1.2</bnd.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<aem.sdk.api>2023.7.12874.20230726T072051Z-230702</aem.sdk.api>
<aem.sdk.api>2024.7.17258.20240726T172406Z-240700</aem.sdk.api>
<componentGroupName>WKND Site</componentGroupName>
<core.wcm.components.version>2.25.4</core.wcm.components.version>
<uber.jar.version>6.5.17</uber.jar.version>
<wknd-shared.version>3.1.0</wknd-shared.version>
<wknd-shared.65.version>2.2.2</wknd-shared.65.version>
<aemanalyser.version>1.5.8</aemanalyser.version>
<aemanalyser.version>1.6.0</aemanalyser.version>

<releaseRepository-Id>central</releaseRepository-Id>
<releaseRepository-URL>https://artifactory-ent.devops.abbott:443/artifactory/bts-aem-191-maven-snapshots-local</releaseRepository-URL>
Expand Down Expand Up @@ -366,6 +366,9 @@ Bundle-DocURL:
<artifactId>aemanalyser-maven-plugin</artifactId>
<version>${aemanalyser.version}</version>
<extensions>true</extensions>
<configuration>
<strictValidation>true</strictValidation>
</configuration>
</plugin>
<!-- Content Package Plugin -->
<plugin>
Expand Down
Loading

0 comments on commit d876fb2

Please sign in to comment.