OAK-11375 : made inplace changes and removed the util method

Author: Rishabh Kumar

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

@@ -17,11 +17,9 @@
 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;
-import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
 import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
 import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
 import org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration;
@@ -56,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;
@@ -139,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(CollectionUtils.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-commons/src/main/java/org/apache/jackrabbit/oak/commons/collections/CollectionUtils.java

@@ -36,7 +36,6 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -487,27 +486,6 @@ public static <K,V> Map<K, V> filterEntries(final @NotNull Map<K, V> map, final
                 .collect(LinkedHashMap::new, (m,e)->m.put(e.getKey(), e.getValue()), LinkedHashMap::putAll);
     }
 
-    /**
-     * Create a new {@link Map} after transforming the values of the given map
-     * based on the specified function.
-     *
-     * @param <K> the type of keys in the map
-     * @param <V1> the type of original values in the map
-     * @param <V2> the type of transformed values in the map
-     * @param map the map whose values are to be transformed, must not be null
-     * @param function the function to apply to the values, must not be null
-     * @return a new map containing the same keys as the given map, but with values transformed by the specified function
-     * @throws NullPointerException if the map or function is null
-     */
-    @NotNull
-    public static <K, V1, V2> Map<K, V2> transformValues(final @NotNull Map<K, V1> map, final @NotNull Function<? super V1, ? extends V2> function) {
-        Objects.requireNonNull(map);
-        Objects.requireNonNull(function);
-        return map.entrySet()
-                .stream() // using LinkedHashMap to maintain the order of previous map
-                .collect(LinkedHashMap::new, (m, e)->m.put(e.getKey(), function.apply(e.getValue())), LinkedHashMap::putAll);
-    }
-
     /**
      * Convert an {@code Iterator} to an {@code Iterable}.
      * <p>

oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/collections/CollectionUtilsTest.java

@@ -34,7 +34,6 @@
 import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -767,50 +766,6 @@ public void testFilterEntriesNullPredicate() {
         Assert.assertThrows(NullPointerException.class, () -> CollectionUtils.filterEntries(map, null));
     }
 
-    @Test
-    public void testTransformValues() {
-        final Map<String, Integer> map = new HashMap<>();
-        map.put("one", 1);
-        map.put("two", 2);
-        map.put("three", 3);
-
-        final Function<Integer, String> function = value -> "Number " + value;
-
-        final Map<String, String> result = CollectionUtils.transformValues(map, function);
-
-        Assert.assertEquals(3, result.size());
-        Assert.assertEquals("Number 1", result.get("one"));
-        Assert.assertEquals("Number 2", result.get("two"));
-        Assert.assertEquals("Number 3", result.get("three"));
-    }
-
-    @Test
-    public void testTransformValuesEmptyMap() {
-        final Map<String, Integer> map = new HashMap<>();
-        final Function<Integer, String> function = value -> "Number " + value;
-
-        final Map<String, String> result = CollectionUtils.transformValues(map, function);
-
-        Assert.assertTrue(result.isEmpty());
-    }
-
-    @Test
-    public void testTransformValuesNullMap() {
-        final Function<Integer, String> function = value -> "Number " + value;
-
-        Assert.assertThrows(NullPointerException.class, () -> CollectionUtils.transformValues(null, function));
-    }
-
-    @Test
-    public void testTransformValuesNullFunction() {
-        final Map<String, Integer> map = new HashMap<>();
-        map.put("one", 1);
-        map.put("two", 2);
-        map.put("three", 3);
-
-        Assert.assertThrows(NullPointerException.class, () -> CollectionUtils.transformValues(map, null));
-    }
-
     @Test
     public void ensureCapacity() {
         int capacity = CollectionUtils.ensureCapacity(8);

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

@@ -21,12 +21,8 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.jackrabbit.guava.common.collect.Maps;
 
 import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
 import org.apache.jackrabbit.oak.plugins.document.util.Utils;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.jetbrains.annotations.NotNull;
@@ -270,7 +266,9 @@ Commit build(@NotNull Revision revision) {
         requireNonNull(revision);
 
         Revision from = this.revision;
-        Map<Path, UpdateOp> operations = CollectionUtils.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);