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/28 09:19:06 UTC
svn commit: r1856464 - in /jackrabbit/oak/trunk/oak-security-spi/src:
main/java/org/apache/jackrabbit/oak/spi/security/principal/
test/java/org/apache/jackrabbit/oak/spi/security/principal/
Author: stillalex
Date: Thu Mar 28 09:19:06 2019
New Revision: 1856464
URL: http://svn.apache.org/viewvc?rev=1856464&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
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/TestPrincipalProvider.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=1856464&r1=1856463&r2=1856464&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 Thu Mar 28 09:19:06 2019
@@ -141,7 +141,7 @@ public class CompositePrincipalProvider
long offset, long limit) {
List<Iterator<? extends Principal>> all = providers.stream()
- .map((p) -> p.findPrincipals(nameHint, fullText, searchType, 0, limit)).collect(Collectors.toList());
+ .map((p) -> p.findPrincipals(nameHint, fullText, searchType, 0, limit + offset)).collect(Collectors.toList());
Iterator<? extends Principal> principals = Iterators.mergeSorted(all, Comparator.comparing(Principal::getName));
Spliterator<? extends Principal> spliterator = Spliterators.spliteratorUnknownSize(principals, 0);
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=1856464&r1=1856463&r2=1856464&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 Thu Mar 28 09:19:06 2019
@@ -18,13 +18,14 @@ package org.apache.jackrabbit.oak.spi.se
import java.security.Principal;
import java.util.ArrayList;
+import java.util.Arrays;
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 java.util.TreeSet;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
@@ -37,17 +38,14 @@ 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.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -237,50 +235,53 @@ public class CompositePrincipalProviderT
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<>();
+ Collection<Collection<String>> input = new ArrayList<>();
for (int i = 0; i < inputSize; i++) {
- List<Principal> l = new ArrayList<>();
+ Set<String> l = new TreeSet<>();
int size = r.nextInt(bound);
- for (int s = 0; s < size; s++) {
+ while (size > 0) {
int v = r.nextInt(bound);
- Principal p = new PrincipalImpl("p" + v);
- expected.add(p.getName());
- l.add(p);
+ String n = "p" + v;
+ if (l.add(n)) {
+ expected.add(n);
+ size--;
+ }
}
- Collections.sort(l, comparator);
- input.add(l.iterator());
+ input.add(l);
}
- Principal pb = new PrincipalImpl("p" + bound);
- expected.add(pb.getName());
- input.add(Collections.singleton(pb).iterator());
- input.add(Collections.<Principal>emptyIterator());
+ input.add(Collections.emptyList());
+ String pb = "p" + bound;
+ expected.add(pb);
+ input.add(Collections.singleton(pb));
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);
+ for (Collection<String> i : input) {
+ TestPrincipalProvider t = new TestPrincipalProvider(i.toArray(new String[0]));
+ in.add(t);
}
-
PrincipalProvider cpp = CompositePrincipalProvider.of(in);
+
+ List<String> out = getNames(cpp.findPrincipals("p", true, PrincipalManager.SEARCH_TYPE_ALL, 0, -1));
Collections.sort(expected);
- List<String> out = getNames(cpp.findPrincipals(null, true, 1, 0, -1));
assertEquals(expected, out);
}
@Test
+ public void testFindPrincipalsRange() {
+ TestPrincipalProvider t0 = new TestPrincipalProvider("p2", "p3", "p4");
+ TestPrincipalProvider t1 = new TestPrincipalProvider("p1");
+ PrincipalProvider cpp = CompositePrincipalProvider.of(Arrays.asList(t0, t1));
+ List<String> out = getNames(cpp.findPrincipals("p", false, PrincipalManager.SEARCH_TYPE_ALL, 3, 1));
+ assertArrayEquals(new String[] {"p4"}, out.toArray(new String[0]));
+ }
+
+ @Test
public void testFindWithOffsetLimit() {
Iterator principals = new TestPrincipalProvider("p1", "p2", "p3", "p4").getTestPrincipals().iterator();
PrincipalProvider pp = mock(PrincipalProvider.class);
// NOTE: CompositePrincipalProvider passes 0 offset to the aggregated provider!
- when(pp.findPrincipals("p", false, PrincipalManager.SEARCH_TYPE_ALL, 0, 1)).thenReturn(principals);
+ when(pp.findPrincipals("p", false, PrincipalManager.SEARCH_TYPE_ALL, 0, 3)).thenReturn(principals);
PrincipalProvider cpp = CompositePrincipalProvider.of(ImmutableList.of(pp, EmptyPrincipalProvider.INSTANCE));
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/TestPrincipalProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/TestPrincipalProvider.java?rev=1856464&r1=1856463&r2=1856464&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/TestPrincipalProvider.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/TestPrincipalProvider.java Thu Mar 28 09:19:06 2019
@@ -21,7 +21,6 @@ import java.util.Enumeration;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -36,8 +35,6 @@ import org.apache.jackrabbit.api.securit
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import javax.jcr.RepositoryException;
-
public final class TestPrincipalProvider implements PrincipalProvider {
public static final Principal UNKNOWN = new PrincipalImpl("unknown");
@@ -74,7 +71,7 @@ public final class TestPrincipalProvider
}
public Iterable<Principal> all() {
- Set<Principal> all = Sets.newHashSet(principals.values());
+ Set<Principal> all = Sets.newLinkedHashSet(principals.values());
all.add(EveryonePrincipal.getInstance());
return all;
}