Merge pull request #1970 from apache/OAK-11375

OAK-11375 : removed usage of Guava's Maps.transformValues

Author: rishabhdaim

oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalPolicyImporterTest.java

@@ -17,7 +17,6 @@
 package org.apache.jackrabbit.oak.spi.security.authorization.principalbased.impl;
 
 import org.apache.jackrabbit.guava.common.collect.Iterables;
-import org.apache.jackrabbit.guava.common.collect.Maps;
 import org.apache.jackrabbit.api.security.user.User;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -55,6 +54,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants.REP_GLOB;
 import static org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants.REP_ITEM_NAMES;
@@ -138,13 +138,13 @@ private List<PropInfo> mockPropInfos(@Nullable String effectivePath,  @NotNull S
     }
 
     private List<PropInfo> mockPropInfos(@NotNull Map<String, String> restrictions, int propertyType) throws RepositoryException {
-        return mockPropInfos(Maps.transformValues(restrictions, string -> {
+        return mockPropInfos(restrictions.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> {
             try {
-                return new Value[] {getValueFactory(root).createValue(string, propertyType)};
-            } catch (ValueFormatException e) {
-                throw new RuntimeException(e);
+                return new Value[] {getValueFactory(root).createValue(e.getValue(), propertyType)};
+            } catch (ValueFormatException ex) {
+                throw new RuntimeException(ex);
             }
-        }));
+        })));
     }
 
     private List<PropInfo> mockPropInfos(@NotNull Map<String, Value[]> restrictions) throws RepositoryException {

oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitBuilder.java

@@ -22,8 +22,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.jackrabbit.guava.common.collect.Maps;
-
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.plugins.document.util.Utils;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -268,8 +266,9 @@ Commit build(@NotNull Revision revision) {
         requireNonNull(revision);
 
         Revision from = this.revision;
-        Map<Path, UpdateOp> operations = Maps.transformValues(
-                this.operations, op -> rewrite(op, from, revision));
+        Map<Path, UpdateOp> operations = this.operations.entrySet()
+                .stream()
+                .collect(LinkedHashMap::new, (m,e)->m.put(e.getKey(), rewrite(e.getValue(), from, revision)), LinkedHashMap::putAll);
         return new Commit(nodeStore, revision, baseRevision, startRevisions,
                 operations, addedNodes, removedNodes, nodesWithBinaries,
                 bundledNodes);