OAK-11381 : removed usage of Guava's Maps.asMap (#1972)

Co-authored-by: Rishabh Kumar <diam@adobe.com>

Author: rishabhdaim

oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java

@@ -19,7 +19,6 @@
 
 package org.apache.jackrabbit.oak.plugins.index.lucene;
 
-import org.apache.jackrabbit.guava.common.collect.Maps;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.api.jmx.CheckpointMBean;
 import org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean;
@@ -47,6 +46,7 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
@@ -212,25 +212,25 @@ public void flagActiveDeletionSafe() {
      * @return true if all running index cycles have been through; false otherwise
      */
     private boolean waitForRunningIndexCycles() {
-        Map<IndexStatsMBean, Long> origIndexLaneToExecutinoCountMap = Maps.asMap(
-                new HashSet<>(StreamSupport.stream(asyncIndexInfoService.getAsyncLanes().spliterator(), false)
-                        .map(lane -> asyncIndexInfoService.getInfo(lane).getStatsMBean())
-                        .filter(bean -> {
-                            String beanStatus;
-                            try {
-                                if (bean != null) {
-                                    beanStatus = bean.getStatus();
-                                } else {
-                                    return false;
-                                }
-                            } catch (Exception e) {
-                                LOG.warn("Exception during getting status for {}. Ignoring this indexer lane", bean.getName(), e);
-                                return false;
-                            }
-                            return STATUS_RUNNING.equals(beanStatus);
-                        })
-                        .collect(Collectors.toList())),
-                IndexStatsMBean::getTotalExecutionCount);
+        Map<IndexStatsMBean, Long> origIndexLaneToExecutinoCountMap = new HashSet<>(StreamSupport.stream(asyncIndexInfoService.getAsyncLanes().spliterator(), false)
+                .map(lane -> asyncIndexInfoService.getInfo(lane).getStatsMBean())
+                .filter(bean -> {
+                    String beanStatus;
+                    try {
+                        if (bean != null) {
+                            beanStatus = bean.getStatus();
+                        } else {
+                            return false;
+                        }
+                    } catch (Exception e) {
+                        LOG.warn("Exception during getting status for {}. Ignoring this indexer lane", bean.getName(), e);
+                        return false;
+                    }
+                    return STATUS_RUNNING.equals(beanStatus);
+                })
+                .collect(Collectors.toList()))
+                .stream()
+                .collect(Collectors.toMap(Function.identity(), IndexStatsMBean::getTotalExecutionCount));
 
         if (!origIndexLaneToExecutinoCountMap.isEmpty()) {
             LOG.info("Found running index lanes ({}). Sleep a bit before continuing.",

oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupport.java

@@ -19,12 +19,12 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import javax.jcr.Credentials;
 import javax.jcr.SimpleCredentials;
 
-import org.apache.jackrabbit.guava.common.collect.Maps;
-
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -64,7 +64,7 @@ public String getUserId(@NotNull Credentials credentials) {
     public Map<String, ?> getAttributes(@NotNull Credentials credentials) {
         if (credentials instanceof SimpleCredentials) {
             final SimpleCredentials sc = (SimpleCredentials) credentials;
-            return Maps.asMap(Set.of(sc.getAttributeNames()), sc::getAttribute);
+            return Set.of(sc.getAttributeNames()).stream().collect(Collectors.toMap(Function.identity(), sc::getAttribute));
         } else {
             return Collections.emptyMap();
         }