You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by st...@apache.org on 2019/03/19 15:09:15 UTC
svn commit: r1855838 - in /jackrabbit/oak/trunk/oak-security-spi/src:
main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java
test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java
Author: stillalex
Date: Tue Mar 19 15:09:15 2019
New Revision: 1855838
URL: http://svn.apache.org/viewvc?rev=1855838&view=rev
Log:
OAK-8142 CompositePrincipalProvider support for full text search
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java
Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java?rev=1855838&r1=1855837&r2=1855838&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java Tue Mar 19 15:09:15 2019
@@ -19,10 +19,16 @@ package org.apache.jackrabbit.oak.spi.se
import java.security.Principal;
import java.security.acl.Group;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
import com.google.common.collect.Iterators;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -128,4 +134,22 @@ public class CompositePrincipalProvider
public Iterator<? extends Principal> findPrincipals(int searchType) {
return findPrincipals(null, searchType);
}
+
+ public Iterator<? extends Principal> findPrincipals(@Nullable String nameHint, boolean fullText, int searchType,
+ long offset, long limit) {
+
+ List<Iterator<? extends Principal>> all = providers.stream()
+ .map((p) -> p.findPrincipals(nameHint, fullText, searchType, 0, limit)).collect(Collectors.toList());
+ Iterator<? extends Principal> principals = Iterators.mergeSorted(all, Comparator.comparing(Principal::getName));
+
+ Spliterator<? extends Principal> spliterator = Spliterators.spliteratorUnknownSize(principals, 0);
+ Stream<? extends Principal> stream = StreamSupport.stream(spliterator, false);
+ if (offset > 0) {
+ stream = stream.skip(offset);
+ }
+ if (limit >= 0) {
+ stream = stream.limit(limit);
+ }
+ return stream.iterator();
+ }
}
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java?rev=1855838&r1=1855837&r2=1855838&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java Tue Mar 19 15:09:15 2019
@@ -18,9 +18,12 @@ package org.apache.jackrabbit.oak.spi.se
import java.security.Principal;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
+import java.util.Random;
import java.util.Set;
import com.google.common.base.Predicate;
@@ -34,6 +37,8 @@ import org.apache.jackrabbit.api.securit
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -215,4 +220,49 @@ public class CompositePrincipalProviderT
}
return l;
}
+
+ @Test
+ public void testFindPrincipalsRandom() {
+ long seed = System.currentTimeMillis();
+ int bound = 10;
+ int inputSize = 3;
+ Random r = new Random(seed);
+
+ Comparator<Principal> comparator = Comparator.comparing(Principal::getName);
+ List<String> expected = new ArrayList<>();
+ Collection<Iterator<Principal>> input = new ArrayList<>();
+ for (int i = 0; i < inputSize; i++) {
+ List<Principal> l = new ArrayList<>();
+ int size = r.nextInt(bound);
+ for (int s = 0; s < size; s++) {
+ int v = r.nextInt(bound);
+ Principal p = new PrincipalImpl("p" + v);
+ expected.add(p.getName());
+ l.add(p);
+ }
+ Collections.sort(l, comparator);
+ input.add(l.iterator());
+ }
+ Principal pb = new PrincipalImpl("p" + bound);
+ expected.add(pb.getName());
+ input.add(Collections.singleton(pb).iterator());
+ input.add(Collections.<Principal>emptyIterator());
+
+ List<PrincipalProvider> in = new ArrayList<>();
+ for (Iterator<Principal> i : input) {
+ PrincipalProvider pp = mock(PrincipalProvider.class);
+ when(pp.findPrincipals(null, true, 1, 0, -1)).thenAnswer(new Answer<Iterator<Principal>>() {
+ @Override
+ public Iterator<Principal> answer(InvocationOnMock invocation) throws Throwable {
+ return i;
+ }
+ });
+ in.add(pp);
+ }
+
+ PrincipalProvider cpp = CompositePrincipalProvider.of(in);
+ Collections.sort(expected);
+ List<String> out = getNames(cpp.findPrincipals(null, true, 1, 0, -1));
+ assertEquals(expected, out);
+ }
}