Fixed issues (that have fixes) identified by AEM Analyse 1.6.6

.github/workflows/verify.yaml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11]
+        java: [11]
 
     steps:
       - name: Checkout code

all/pom.xml

@@ -187,7 +187,7 @@
                     <plugin>
                         <groupId>com.adobe.aem</groupId>
                         <artifactId>aemanalyser-maven-plugin</artifactId>
-                        <version>1.5.8</version> <!-- Make sure to use the latest release -->
+                        <version>1.6.6</version> <!-- Make sure to use the latest release -->
                         <executions>
                             <execution>
                                 <id>aem-analyser</id>

core/src/main/java/com/adobe/aem/commons/assetshare/components/actions/download/Download.java

@@ -22,7 +22,6 @@
 import com.adobe.aem.commons.assetshare.content.AssetModel;
 import com.adobe.cq.wcm.core.components.models.form.OptionItem;
 import com.adobe.cq.wcm.core.components.models.form.Options;
-import com.google.common.collect.ImmutableList;
 import org.osgi.annotation.versioning.ConsumerType;
 
 import java.util.ArrayList;
@@ -98,7 +97,7 @@
         }
 
         public List<OptionItem> getItems() {
-            return ImmutableList.copyOf(options);
+            return Collections.unmodifiableList(options);
         }
     }
 }

core/src/main/java/com/adobe/aem/commons/assetshare/components/predicates/impl/PagePredicateImpl.java

@@ -36,8 +36,6 @@
 import com.day.cq.search.eval.PathPredicateEvaluator;
 import com.day.cq.search.eval.TypePredicateEvaluator;
 import com.day.cq.wcm.api.Page;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.SlingHttpServletRequest;
@@ -53,11 +51,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Model(
         adaptables = {SlingHttpServletRequest.class},
@@ -161,7 +155,7 @@
             }
         }
 
-       return offset;
+        return offset;
     }
 
     public String getGuessTotal() {
@@ -248,47 +242,67 @@
             addFacetStrategyAsParameterPredicate(parameterGroup);
         }
 
-
         root.add(parameterGroup);
 
         return root;
     }
 
     private void addIndexTagAsParameterPredicate(final PredicateGroup parameterGroup) {
         String indexTag = getIndexTag();
-        if (StringUtils.isBlank(indexTag)) { return; }
+        if (StringUtils.isBlank(indexTag)) {
+            return;
+        }
+
+        Map<String, String> map = new HashMap<String, String>() {
+            {
+                put(Predicate.PARAM_OPTIONS_INDEXTAG, indexTag);
+            }
+        };
 
-        parameterGroup.addAll(PredicateConverter.createPredicates(ImmutableMap.<String, String>builder().
-                put(Predicate.PARAM_OPTIONS_INDEXTAG, indexTag).
-                build()));
+        parameterGroup.addAll(PredicateConverter.createPredicates(Collections.unmodifiableMap(map)));
     }
 
     private void addFacetStrategyAsParameterPredicate(final PredicateGroup parameterGroup) {
         String facetStrategy = getFacetStrategy();
-        if (StringUtils.isBlank(facetStrategy)) { return; }
+        if (StringUtils.isBlank(facetStrategy)) {
+            return;
+        }
+
+        Map<String, String> map = new HashMap<String, String>() {
+            {
+                put(Predicate.PARAM_FACET_STRATEGY, facetStrategy);
+            }
+        };
 
-        parameterGroup.addAll(PredicateConverter.createPredicates(ImmutableMap.<String, String>builder().
-                put(Predicate.PARAM_FACET_STRATEGY, facetStrategy).
-                build()));
+        parameterGroup.addAll(PredicateConverter.createPredicates(Collections.unmodifiableMap(map)));
     }
 
 
     private void addGuessTotalAsParameterPredicate(final PredicateGroup parameterGroup) {
-        parameterGroup.addAll(PredicateConverter.createPredicates(ImmutableMap.<String, String>builder().
-                put(Predicate.PARAM_GUESS_TOTAL, getGuessTotal()).
-                build()));
+        Map<String, String> map = new HashMap<String, String>() {
+            {
+                put(Predicate.PARAM_GUESS_TOTAL, getGuessTotal());
+
+            }
+        };
+
+        parameterGroup.addAll(PredicateConverter.createPredicates(Collections.unmodifiableMap(map)));
     }
 
     private void addOffsetAsParameterPredicate(final PredicateGroup parameterGroup) {
-        parameterGroup.addAll(PredicateConverter.createPredicates(ImmutableMap.<String, String>builder().
-                put(Predicate.PARAM_OFFSET,  String.valueOf(getOffset())).
-                build()));
+        Map<String, String> map = new HashMap<String, String>() {{
+            put(Predicate.PARAM_OFFSET, String.valueOf(getOffset()));
+        }};
+
+        parameterGroup.addAll(PredicateConverter.createPredicates(Collections.unmodifiableMap(map)));
     }
 
     private void addLimitAsParameterPredicate(final PredicateGroup parameterGroup) {
-        parameterGroup.addAll(PredicateConverter.createPredicates(ImmutableMap.<String, String>builder().
-                put(Predicate.PARAM_LIMIT, String.valueOf(getLimit())).
-                build()));
+        Map<String, String> map = new HashMap<String, String>() {{
+            put(Predicate.PARAM_LIMIT, String.valueOf(getLimit()));
+        }};
+
+        parameterGroup.addAll(PredicateConverter.createPredicates(Collections.unmodifiableMap(map)));
     }
 
     private void addSearchPredicateAsPredicateGroups(final PredicateGroup root) {
@@ -340,21 +354,22 @@
     }
 
     private void addTypeAsPredicate(final PredicateGroup root) {
-        root.addAll(PredicateConverter.createPredicates(ImmutableMap.<String, String>builder().
-                put(TypePredicateEvaluator.TYPE, DamConstants.NT_DAM_ASSET).
-                build()));
+        Map<String, String> map = new HashMap<>();
+        map.put(TypePredicateEvaluator.TYPE, DamConstants.NT_DAM_ASSET);
+
+        root.addAll(PredicateConverter.createPredicates(Collections.unmodifiableMap(map)));
     }
 
     private void addOrderByAsPredicate(final PredicateGroup root) {
-        Builder<String, String> orderPredicateBuilder = ImmutableMap.<String, String>builder().
-            put(Predicate.ORDER_BY, searchConfig.getOrderBy()).
-            put(Predicate.ORDER_BY + "." + Predicate.PARAM_SORT, searchConfig.getOrderBySort());
+        Map<String, String> map = new HashMap<>();
+        map.put(Predicate.ORDER_BY, searchConfig.getOrderBy());
+        map.put(Predicate.ORDER_BY + "." + Predicate.PARAM_SORT, searchConfig.getOrderBySort());
 
         if (!isOrderByCase()) {
-            orderPredicateBuilder.put(Predicate.ORDER_BY + "." + Predicate.PARAM_CASE, Predicate.IGNORE_CASE);
+            map.put(Predicate.ORDER_BY + "." + Predicate.PARAM_CASE, Predicate.IGNORE_CASE);
         }
 
-        root.addAll(PredicateConverter.createPredicates(orderPredicateBuilder.build()));
+        root.addAll(PredicateConverter.createPredicates(Collections.unmodifiableMap(map)));
     }
 
     private List<SearchPredicate> getSearchPredicates() {

core/src/main/java/com/adobe/aem/commons/assetshare/content/properties/impl/ContentTypeImpl.java

@@ -22,7 +22,7 @@
 import com.adobe.aem.commons.assetshare.content.properties.AbstractComputedProperty;
 import com.adobe.aem.commons.assetshare.content.properties.ComputedProperty;
 import com.day.cq.dam.api.Asset;
-import com.google.common.collect.ImmutableMap;
+
 import org.apache.commons.lang3.StringUtils;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
@@ -31,6 +31,8 @@
 import org.osgi.service.metatype.annotations.Designate;
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 
 import static com.adobe.aem.commons.assetshare.content.properties.ComputedProperty.DEFAULT_ASC_COMPUTED_PROPERTY_SERVICE_RANKING;
@@ -64,39 +66,38 @@ public String[] getTypes() {
 
 
     // Full mime type to label map
-    private static final Map<String, String> mimeTypeToLabelMap = ImmutableMap.<String, String>builder()
-            .put("image/vnd.adobe.photoshop",                                                   "Photoshop")
-            .put("application/msword",                                                          "Word Doc")
-            .put("application/vnd.openxmlformats-officedocument.wordprocessingml.document",    "Word Doc")
-            .put("application/vnd.ms-excel",                                                    "Excel")
-            .put("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",           "Excel")
-            .put("application/vnd.ms-powerpoint",                                               "PowerPoint")
-            .put("application/vnd.openxmlformats-officedocument.presentationml.presentation",   "PowerPoint")
-            .put("application/pdf",                                                             "PDF")
-            .put("application/xml",                                                             "XML")
-            .put("application/zip",                                                             "Zip")
-            .put("application/json",                                                            "JSON")
-            .put("application/vnd.adobe.illustrator",                                           "Illustrator")
-            .put("application/vnd.adobe.indesign",                                              "InDesign")
-            .put("application/vnd.adobe.indesignml",                                            "InDesign")
-            .put("application/vnd.adobe.indesignx",                                             "InDesign")
-            .put("application/vnd.adobe.aftereffects",                                          "After Effects")
-            .put("application/vnd.adobe.premiere",                                              "Premiere")
-            .put("application/vnd.adobe.xd",                                                    "XD")
-            .put("text/html",                                                                   "HTML")
-            .put("text/csv",                                                                    "CSV")
-            .build();
-
+    private static final Map<String, String> mimeTypeToLabelMap = Collections.unmodifiableMap(new HashMap<String, String>() {{
+        put("image/vnd.adobe.photoshop", "Photoshop");
+        put("application/msword", "Word Doc");
+        put("application/vnd.openxmlformats-officedocument.wordprocessingml.document", "Word Doc");
+        put("application/vnd.ms-excel", "Excel");
+        put("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "Excel");
+        put("application/vnd.ms-powerpoint", "PowerPoint");
+        put("application/vnd.openxmlformats-officedocument.presentationml.presentation", "PowerPoint");
+        put("application/pdf", "PDF");
+        put("application/xml", "XML");
+        put("application/zip", "Zip");
+        put("application/json", "JSON");
+        put("application/vnd.adobe.illustrator", "Illustrator");
+        put("application/vnd.adobe.indesign", "InDesign");
+        put("application/vnd.adobe.indesignml", "InDesign");
+        put("application/vnd.adobe.indesignx", "InDesign");
+        put("application/vnd.adobe.aftereffects", "After Effects");
+        put("application/vnd.adobe.premiere", "Premiere");
+        put("application/vnd.adobe.xd", "XD");
+        put("text/html", "HTML");
+        put("text/csv", "CSV");
+    }});
 
     // Fallback mime type prefix to label map
-    private static final Map<String, String> mimeTypePrefixToLabelMap = ImmutableMap.<String, String>builder()
-            .put("image",   "Image")
-            .put("video",   "Video")
-            .put("audio",   "Audio")
-            .put("font",    "Font")
-            .put("model",   "3D")
-            .put("text",    "Text")
-            .build();
+    private static final Map<String, String> mimeTypePrefixToLabelMap = Collections.unmodifiableMap(new HashMap<String, String>() {{
+        put("image", "Image");
+        put("video", "Video");
+        put("audio", "Audio");
+        put("font", "Font");
+        put("model", "3D");
+        put("text", "Text");
+    }});
 
     @Override
     public String get(Asset asset) {

core/src/main/java/com/adobe/aem/commons/assetshare/content/renditions/impl/AssetRenditionDispatchersImpl.java

@@ -21,7 +21,6 @@
 
 import com.adobe.aem.commons.assetshare.content.renditions.AssetRenditionDispatcher;
 import com.adobe.aem.commons.assetshare.content.renditions.AssetRenditionDispatchers;
-import com.google.common.collect.ImmutableList;
 import org.apache.sling.commons.osgi.Order;
 import org.apache.sling.commons.osgi.RankedServices;
 import org.osgi.service.component.annotations.Component;
@@ -74,7 +73,7 @@ public List<AssetRenditionDispatcher> getAssetRenditionDispatchers() {
         if (assetRenditionDispatchers == null || assetRenditionDispatchers.getList() == null) {
             return Collections.EMPTY_LIST;
         } else {
-            return ImmutableList.copyOf(assetRenditionDispatchers.getList());
+            return Collections.unmodifiableList((assetRenditionDispatchers.getList()));
         }
     }
 

core/src/main/java/com/adobe/aem/commons/assetshare/search/impl/predicateevaluators/PropertyValuesPredicateEvaluator.java

@@ -25,7 +25,6 @@
 import com.day.cq.search.eval.JcrPropertyPredicateEvaluator;
 import com.day.cq.search.eval.PredicateEvaluator;
 import com.day.cq.search.facets.FacetExtractor;
-import com.google.common.collect.ImmutableList;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.osgi.service.component.annotations.Activate;
@@ -213,7 +212,7 @@
 
     protected List<String> getValues(final String data, final List<String> delimiters) {
         if (delimiters.size() == 0) {
-            return ImmutableList.<String>builder().add(data).build();
+            Collections.unmodifiableList(Arrays.asList(data));
         }
 
         final String regex = delimiters.stream()

core/src/main/java/com/adobe/aem/commons/assetshare/util/impl/EmailServiceImpl.java

@@ -235,6 +235,7 @@ private Email getEmail(final MailTemplate mailTemplate,
                            final Class<? extends Email> mailType,
                            final Map<String, String> params) throws EmailException, MessagingException, IOException {
 
+        // We cannot get rid of StrLookup even tho its deprecated, because the AEM MailTemplate.getEmail(...) requires a parameter of this type
         final Email email = mailTemplate.getEmail(StrLookup.mapLookup(params), mailType);
 
         if (params.containsKey(EmailService.SENDER_EMAIL_ADDRESS)

core/src/main/java/com/adobe/aem/commons/assetshare/workflow/assetkit/impl/AssetKitCreatorWorkflowProcess.java

@@ -28,11 +28,11 @@
 import com.adobe.granite.workflow.exec.WorkflowProcess;
 import com.adobe.granite.workflow.metadata.MetaDataMap;
 import com.day.cq.commons.jcr.JcrUtil;
+import com.day.cq.search.Predicate;
 import com.day.cq.search.QueryBuilder;
 import com.day.cq.wcm.api.Page;
 import com.day.cq.wcm.api.PageManager;
 import com.day.cq.wcm.api.WCMException;
-import com.google.common.collect.ImmutableMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.resource.ModifiableValueMap;
 import org.apache.sling.api.resource.PersistenceException;
@@ -161,7 +161,9 @@
                 resource = resource.getChild(JCR_CONTENT);
                 if (resource.getChild("metadata") == null) {
                     try {
-                        resource = resource.getResourceResolver().create(resource, "metadata", ImmutableMap.of(JCR_PRIMARYTYPE, NT_UNSTRUCTURED));
+                        resource = resource.getResourceResolver().create(resource, "metadata", Collections.unmodifiableMap(new HashMap<String, String>() {{
+                            put(JCR_PRIMARYTYPE, NT_UNSTRUCTURED);
+                        }}));
                     } catch (PersistenceException e) {
                         throw new WorkflowException(String.format("Could not create missing metadata node for asset folder [ {} ].", resource.getPath()), e);
                     }

core/src/test/java/com/adobe/aem/commons/assetshare/content/impl/MetadataSchemaPropertiesImplTest.java

@@ -20,16 +20,13 @@
 package com.adobe.aem.commons.assetshare.content.impl;
 
 import com.adobe.aem.commons.assetshare.content.MetadataProperties;
-import com.google.common.collect.ImmutableMap;
+
 import io.wcm.testing.mock.aem.junit.AemContext;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static org.junit.Assert.assertEquals;
 
@@ -45,10 +42,9 @@ public void setUp() throws Exception {
     @Test
     public void collectExtraMetadataProperties() {
         ctx.registerInjectActivateService(new MetadataSchemaPropertiesImpl(),
-                ImmutableMap.<String, Object>builder().
-                put("extra.metadata.properties", new String[]{ "jcr:content/foo=My Foo", "jcr:content/metadata/bar=My Bar", "./jcr:content/foo=My Foo 2" }).
-                build());
-
+                Collections.unmodifiableMap(new HashMap<String, Object>() {{
+                        put("extra.metadata.properties", new String[]{"jcr:content/foo=My Foo", "jcr:content/metadata/bar=My Bar", "./jcr:content/foo=My Foo 2"});
+                    }}));
         MetadataSchemaPropertiesImpl metadataSchemaProperties = (MetadataSchemaPropertiesImpl) ctx.getService(MetadataProperties.class);
 
         Map<String, List<String>> collectedMetadata = new HashMap<>();
@@ -67,16 +63,15 @@ public void collectExtraMetadataProperties() {
     @Test
     public void removeMetadataProperties() {
         ctx.registerInjectActivateService(new MetadataSchemaPropertiesImpl(),
-                ImmutableMap.<String, Object>builder().
-                        put("blacklisted.metadata.properties", new String[]{ "jcr:content/foo" }).
-                        build());
-
+                Collections.unmodifiableMap(new HashMap<String, Object>() {{
+                    put("blacklisted.metadata.properties", new String[]{"jcr:content/foo"});
+                }}));
         MetadataSchemaPropertiesImpl metadataSchemaProperties = (MetadataSchemaPropertiesImpl) ctx.getService(MetadataProperties.class);
 
         Map<String, List<String>> collectedMetadata = new HashMap<>();
-        collectedMetadata.put("jcr:content/foo", Arrays.asList("Blacklisted"));
-        collectedMetadata.put("./jcr:content/foo", Arrays.asList("Blacklisted Too"));
-        collectedMetadata.put("./jcr:content/metadata/bar", Arrays.asList("Not blacklisted"));
+        collectedMetadata.put("jcr:content/foo", Collections.singletonList("Blacklisted"));
+        collectedMetadata.put("./jcr:content/foo", Collections.singletonList("Blacklisted Too"));
+        collectedMetadata.put("./jcr:content/metadata/bar", Collections.singletonList("Not blacklisted"));
 
         collectedMetadata = metadataSchemaProperties.removeBlacklistedMetadataProperties(collectedMetadata);