Skip to content

Commit 34145d6

Browse files
author
Rishabh Kumar
committed
OAK-11382 : removed usage of Guava's Maps.toMap
1 parent 9111252 commit 34145d6

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/TestPrincipalProvider.java

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@
2121
import java.util.Enumeration;
2222
import java.util.HashSet;
2323
import java.util.Iterator;
24+
import java.util.LinkedHashMap;
2425
import java.util.LinkedHashSet;
2526
import java.util.Map;
2627
import java.util.Set;
2728
import java.util.function.Predicate;
2829

2930
import org.apache.jackrabbit.guava.common.collect.Iterables;
3031
import org.apache.jackrabbit.guava.common.collect.Iterators;
31-
import org.apache.jackrabbit.guava.common.collect.Maps;
32-
3332
import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
3433
import org.apache.jackrabbit.api.security.principal.ItemBasedPrincipal;
3534
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
@@ -55,18 +54,20 @@ public TestPrincipalProvider(boolean exposesEveryone) {
5554

5655
public TestPrincipalProvider(String... principalNames) {
5756
this.exposesEveryone = true;
58-
this.principals = Maps.toMap(CollectionUtils.toLinkedSet(Arrays.asList(principalNames)), input -> new ItemBasedPrincipal() {
59-
@NotNull
60-
@Override
61-
public String getPath() {
62-
return "/path/to/principal/" + input;
63-
}
64-
65-
@Override
66-
public String getName() {
67-
return input;
68-
}
69-
});
57+
this.principals = CollectionUtils.toLinkedSet(Arrays.asList(principalNames))
58+
.stream() // using LinkedHashMap to maintain the order of LinkedSet
59+
.collect(LinkedHashMap::new, (m, e)-> m.put(e, new ItemBasedPrincipal() {
60+
@NotNull
61+
@Override
62+
public String getPath() {
63+
return "/path/to/principal/" + e;
64+
}
65+
66+
@Override
67+
public String getName() {
68+
return e;
69+
}
70+
}), LinkedHashMap::putAll);
7071
}
7172

7273
public Iterable<Principal> getTestPrincipals() {

0 commit comments

Comments
 (0)