From d876fb2d936b7592232ff578d942abc12594ada5 Mon Sep 17 00:00:00 2001
From: virender-choudhary-abbott-com <Virender.choudhary@abbott.com>
Date: Tue, 30 Jul 2024 21:17:12 -0500
Subject: [PATCH] chore: Update BylineImplTest to use ArrayList instead of
 ImmutableList

---
 .../wknd/core/models/impl/ImageListImpl.java  |  76 +++--
 .../wknd/core/models/impl/BylineImplTest.java |  10 +-
 pom.xml                                       |   7 +-
 settings.xml                                  | 310 ++++++++++++++++++
 4 files changed, 366 insertions(+), 37 deletions(-)
 create mode 100644 settings.xml

diff --git a/core/src/main/java/com/adobe/aem/guides/wknd/core/models/impl/ImageListImpl.java b/core/src/main/java/com/adobe/aem/guides/wknd/core/models/impl/ImageListImpl.java
index c1a1b61b64..7ed23f3239 100644
--- a/core/src/main/java/com/adobe/aem/guides/wknd/core/models/impl/ImageListImpl.java
+++ b/core/src/main/java/com/adobe/aem/guides/wknd/core/models/impl/ImageListImpl.java
@@ -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;
@@ -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},
@@ -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.");
@@ -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
@@ -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).
@@ -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();
diff --git a/core/src/test/java/com/adobe/aem/guides/wknd/core/models/impl/BylineImplTest.java b/core/src/test/java/com/adobe/aem/guides/wknd/core/models/impl/BylineImplTest.java
index 8e8c0ee7a1..398c981fb6 100644
--- a/core/src/test/java/com/adobe/aem/guides/wknd/core/models/impl/BylineImplTest.java
+++ b/core/src/test/java/com/adobe/aem/guides/wknd/core/models/impl/BylineImplTest.java
@@ -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;
 
@@ -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);
diff --git a/pom.xml b/pom.xml
index 6b070c9835..f25ae459b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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>
diff --git a/settings.xml b/settings.xml
new file mode 100644
index 0000000000..d467494f8d
--- /dev/null
+++ b/settings.xml
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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.
+-->
+
+<!--
+ | This is the configuration file for Maven. It can be specified at two levels:
+ |
+ |  1. User Level. This settings.xml file provides configuration for a single user, 
+ |                 and is normally provided in ${user.home}/.m2/settings.xml.
+ |
+ |                 NOTE: This location can be overridden with the CLI option:
+ |
+ |                 -s /path/to/user/settings.xml
+ |
+ |  2. Global Level. This settings.xml file provides configuration for all Maven
+ |                 users on a machine (assuming they're all using the same Maven
+ |                 installation). It's normally provided in 
+ |                 ${maven.home}/conf/settings.xml.
+ |
+ |                 NOTE: This location can be overridden with the CLI option:
+ |
+ |                 -gs /path/to/global/settings.xml
+ |
+ | The sections in this sample file are intended to give you a running start at
+ | getting the most out of your Maven installation. Where appropriate, the default
+ | values (values used when the setting is not specified) are provided.
+ |
+ |-->
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <!-- localRepository
+   | The path to the local repository maven will use to store artifacts.
+   |
+   | Default: ~/.m2/repository
+  <localRepository>/path/to/local/repo</localRepository>
+  -->
+
+    <!-- interactiveMode
+   | This will determine whether maven prompts you when it needs input. If set to false,
+   | maven will use a sensible default value, perhaps based on some other setting, for
+   | the parameter in question.
+   |
+   | Default: true
+  <interactiveMode>true</interactiveMode>
+  -->
+
+    <!-- offline
+   | Determines whether maven should attempt to connect to the network when executing a build.
+   | This will have an effect on artifact downloads, artifact deployment, and others.
+   |
+   | Default: false
+  <offline>false</offline>
+  -->
+
+    <!-- pluginGroups
+   | This is a list of additional group identifiers that will be searched when resolving plugins by their prefix, i.e.
+   | when invoking a command line like "mvn prefix:goal". Maven will automatically add the group identifiers
+   | "org.apache.maven.plugins" and "org.codehaus.mojo" if these are not already contained in the list.
+   |-->
+    <pluginGroups>
+        <!-- pluginGroup
+     | Specifies a further group identifier to use for plugin lookup.
+    <pluginGroup>com.your.plugins</pluginGroup>
+    -->
+    </pluginGroups>
+
+    <!-- proxies
+   | This is a list of proxies which can be used on this machine to connect to the network.
+   | Unless otherwise specified (by system property or command-line switch), the first proxy
+   | specification in this list marked as active will be used.
+   |-->
+    <proxies>
+        <!-- proxy
+     | Specification for one proxy, to be used in connecting to the network.
+     |
+    <proxy>
+      <id>optional</id>
+      <active>true</active>
+      <protocol>http</protocol>
+      <username>proxyuser</username>
+      <password>proxypass</password>
+      <host>proxy.host.net</host>
+      <port>80</port>
+      <nonProxyHosts>local.net|some.host.com</nonProxyHosts>
+    </proxy>
+    -->
+    </proxies>
+
+    <!-- servers
+   | This is a list of authentication profiles, keyed by the server-id used within the system.
+   | Authentication profiles can be used whenever maven must make a connection to a remote server.
+   |-->
+    <servers>
+        <!-- server
+     | Specifies the authentication information to use when connecting to a particular server, identified by
+     | a unique name within the system (referred to by the 'id' attribute below).
+     | 
+     | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are 
+     |       used together.
+     |
+    <server>
+      <id>deploymentRepo</id>
+      <username>repouser</username>
+      <password>repopwd</password>
+    </server>
+    -->
+
+        <!-- Another sample, using keys to authenticate.
+    <server>
+      <id>siteServer</id>
+      <privateKey>/path/to/private/key</privateKey>
+      <passphrase>optional; leave empty if not used.</passphrase>
+    </server>
+    -->
+    <server>
+      <username>virender.choudhary@abbott.com</username>
+      <password>cmVmdGtuOjAxOjE3NTM3OTk3NjI6YVJpYjdzanFwekh5QVB3UkdDaU1XWU5ET3JP</password>
+      <id>central</id>
+    </server>
+    <server>
+      <username>virender.choudhary@abbott.com</username>
+      <password>cmVmdGtuOjAxOjE3NTM3OTk3NjI6YVJpYjdzanFwekh5QVB3UkdDaU1XWU5ET3JP</password>
+      <id>snapshots</id>
+    </server>
+    </servers>
+
+    <!-- mirrors
+   | This is a list of mirrors to be used in downloading artifacts from remote repositories.
+   | 
+   | It works like this: a POM may declare a repository to use in resolving certain artifacts.
+   | However, this repository may have problems with heavy traffic at times, so people have mirrored
+   | it to several places.
+   |
+   | That repository definition will have a unique id, so we can create a mirror reference for that
+   | repository, to be used as an alternate download site. The mirror site will be the preferred 
+   | server for that repository.
+   |-->
+    <mirrors>
+        <!-- mirror
+     | Specifies a repository mirror site to use instead of a given repository. The repository that
+     | this mirror serves has an ID that matches the mirrorOf element of this mirror. IDs are used
+     | for inheritance and direct lookup purposes, and must be unique across the set of mirrors.
+     |
+    <mirror>
+      <id>mirrorId</id>
+      <mirrorOf>repositoryId</mirrorOf>
+      <name>Human Readable Name for this Mirror.</name>
+      <url>http://my.repository.com/repo/path</url>
+    </mirror>
+     -->
+    </mirrors>
+
+    <!-- profiles
+   | This is a list of profiles which can be activated in a variety of ways, and which can modify
+   | the build process. Profiles provided in the settings.xml are intended to provide local machine-
+   | specific paths and repository locations which allow the build to work in the local environment.
+   |
+   | For example, if you have an integration testing plugin - like cactus - that needs to know where
+   | your Tomcat instance is installed, you can provide a variable here such that the variable is 
+   | dereferenced during the build process to configure the cactus plugin.
+   |
+   | As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
+   | section of this document (settings.xml) - will be discussed later. Another way essentially
+   | relies on the detection of a system property, either matching a particular value for the property,
+   | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a 
+   | value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
+   | Finally, the list of active profiles can be specified directly from the command line.
+   |
+   | NOTE: For profiles defined in the settings.xml, you are restricted to specifying only artifact
+   |       repositories, plugin repositories, and free-form properties to be used as configuration
+   |       variables for plugins in the POM.
+   |
+   |-->
+    <profiles>
+        <!-- profile
+     | Specifies a set of introductions to the build process, to be activated using one or more of the
+     | mechanisms described above. For inheritance purposes, and to activate profiles via <activatedProfiles/>
+     | or the command line, profiles have to have an ID that is unique.
+     |
+     | An encouraged best practice for profile identification is to use a consistent naming convention
+     | for profiles, such as 'env-dev', 'env-test', 'env-production', 'user-jdcasey', 'user-brett', etc.
+     | This will make it more intuitive to understand what the set of introduced profiles is attempting
+     | to accomplish, particularly when you only have a list of profile id's for debug.
+     |
+     | This profile example uses the JDK version to trigger activation, and provides a JDK-specific repo.
+    <profile>
+      <id>jdk-1.4</id>
+ 
+      <activation>
+        <jdk>1.4</jdk>
+      </activation>
+ 
+      <repositories>
+        <repository>
+          <id>jdk14</id>
+          <name>Repository for JDK 1.4 builds</name>
+          <url>http://www.myhost.com/maven/jdk14</url>
+          <layout>default</layout>
+          <snapshotPolicy>always</snapshotPolicy>
+        </repository>
+      </repositories>
+    </profile>
+    -->
+
+        <!--
+     | Here is another profile, activated by the system property 'target-env' with a value of 'dev',
+     | which provides a specific path to the Tomcat instance. To use this, your plugin configuration
+     | might hypothetically look like:
+     |
+     | ...
+     | <plugin>
+     |   <groupId>org.myco.myplugins</groupId>
+     |   <artifactId>myplugin</artifactId>
+     |   
+     |   <configuration>
+     |     <tomcatLocation>${tomcatPath}</tomcatLocation>
+     |   </configuration>
+     | </plugin>
+     | ...
+     |
+     | NOTE: If you just wanted to inject this configuration whenever someone set 'target-env' to
+     |       anything, you could just leave off the <value/> inside the activation-property.
+     |
+    <profile>
+      <id>env-dev</id>
+ 
+      <activation>
+        <property>
+          <name>target-env</name>
+          <value>dev</value>
+        </property>
+      </activation>
+ 
+      <properties>
+        <tomcatPath>/path/to/tomcat/instance</tomcatPath>
+      </properties>
+    </profile>
+    -->
+
+
+
+        <!-- ====================================================== -->
+        <!-- A D O B E   P U B L I C   P R O F I L E                -->
+        <!-- ====================================================== -->
+        <profile>
+            <id>adobe-public</id>
+
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+
+            <properties>
+                <releaseRepository-Id>adobe-public-releases</releaseRepository-Id>
+                <releaseRepository-Name>Adobe Public Releases</releaseRepository-Name>
+                <releaseRepository-URL>https://repo.adobe.com/nexus/content/groups/public</releaseRepository-URL>
+            </properties>
+
+            <repositories>
+                <repository>
+                    <id>adobe-public-releases</id>
+                    <name>Adobe Public Repository</name>
+                    <url>https://repo.adobe.com/nexus/content/groups/public</url>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </repository>
+            </repositories>
+
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>adobe-public-releases</id>
+                    <name>Adobe Public Repository</name>
+                    <url>https://repo.adobe.com/nexus/content/groups/public</url>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+
+    <activeProfiles>
+        <activeProfile>adobe-public</activeProfile>
+    </activeProfiles>
+</settings>
\ No newline at end of file