Skip to content

Commit 34851c1

Browse files
rishabhdaimRishabh Kumar
andauthored
OAK-11582 : removed usage of Guava's Iterables.removeAll() with Stream (#2167)
Co-authored-by: Rishabh Kumar <diam@adobe.com>
1 parent f9723a2 commit 34851c1

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L4_CustomPrivilegeTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@
1717
package org.apache.jackrabbit.oak.exercise.security.privilege;
1818

1919
import java.security.Principal;
20+
import java.util.Arrays;
21+
import java.util.LinkedHashSet;
2022
import java.util.Set;
2123
import java.util.UUID;
24+
import java.util.stream.Collectors;
2225
import javax.jcr.security.Privilege;
2326

2427
import org.apache.jackrabbit.guava.common.collect.Iterables;
2528
import org.apache.jackrabbit.api.security.authorization.PrivilegeManager;
2629
import org.apache.jackrabbit.oak.AbstractSecurityTest;
27-
import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
28-
import org.apache.jackrabbit.oak.commons.collections.SetUtils;
2930
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
3031
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
3132
import org.junit.Test;
@@ -116,10 +117,9 @@ private static void assertEqualPrivileges(Set<String> expectedNames, Privilege[]
116117
fail();
117118
}
118119

119-
Iterable<String> resultNames = IterableUtils.transform(SetUtils.toSet(result),
120-
Object::toString);
120+
Set<String> resultNames = Arrays.stream(result).map(Object::toString).collect(Collectors.toCollection(LinkedHashSet::new));
121121

122-
Iterables.removeAll(resultNames, expectedNames);
122+
resultNames.removeAll(expectedNames);
123123
assertFalse(resultNames.iterator().hasNext());
124124
}
125125

0 commit comments

Comments
 (0)