Author: stillalex
Date: Thu Mar 14 16:03:13 2019
New Revision: 1855536
URL: http://svn.apache.org/viewvc?rev=1855536&view=rev
Log:
OAK-8131 Principal Management APIs full text support
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/AbstractPrincipalProviderTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java?rev=1855536&r1=1855535&r2=1855536&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
Thu Mar 14 16:03:13 2019
@@ -131,12 +131,12 @@ class PrincipalProviderImpl implements P
@NotNull
@Override
public Iterator<? extends Principal> findPrincipals(@Nullable final String
nameHint, final int searchType) {
- return findPrincipals(nameHint, searchType, 0, -1);
+ return findPrincipals(nameHint, false, searchType, 0, -1);
}
@NotNull
@Override
- public Iterator<? extends Principal> findPrincipals(final String nameHint,
final int searchType, long offset,
+ public Iterator<? extends Principal> findPrincipals(final String nameHint,
final boolean fullText, final int searchType, long offset,
long limit) {
if (offset < 0) {
offset = 0;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java?rev=1855536&r1=1855535&r2=1855536&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
Thu Mar 14 16:03:13 2019
@@ -157,12 +157,12 @@ class UserPrincipalProvider implements P
@Override
public Iterator<? extends Principal> findPrincipals(final String nameHint,
final int searchType) {
- return findPrincipals(nameHint, searchType, 0, -1);
+ return findPrincipals(nameHint, false, searchType, 0, -1);
}
@NotNull
@Override
- public Iterator<? extends Principal> findPrincipals(final String nameHint,
final int searchType, long offset,
+ public Iterator<? extends Principal> findPrincipals(final String nameHint,
final boolean fullText, final int searchType, long offset,
long limit) {
if (offset < 0) {
offset = 0;
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/AbstractPrincipalProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/AbstractPrincipalProviderTest.java?rev=1855536&r1=1855535&r2=1855536&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/AbstractPrincipalProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/AbstractPrincipalProviderTest.java
Thu Mar 14 16:03:13 2019
@@ -416,7 +416,7 @@ public abstract class AbstractPrincipalP
}
List<String> sub = expected.subList(offset, to);
Iterator<? extends Principal> i1 =
principalProvider.findPrincipals("testGroup",
- PrincipalManager.SEARCH_TYPE_ALL, offset, limit);
+ false, PrincipalManager.SEARCH_TYPE_ALL, offset,
limit);
assertEquals(sub, getNames(i1));
}
}