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/14 15:22:57 UTC
svn commit: r1855533 - in /jackrabbit/oak/trunk:
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/
oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/
oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi...
Author: stillalex
Date: Thu Mar 14 15:22:57 2019
New Revision: 1855533
URL: http://svn.apache.org/viewvc?rev=1855533&view=rev
Log:
OAK-8131 Principal Management APIs full text support
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrincipalManagerDelegator.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImpl.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalQueryManager.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrincipalManagerDelegator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrincipalManagerDelegator.java?rev=1855533&r1=1855532&r2=1855533&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrincipalManagerDelegator.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PrincipalManagerDelegator.java Thu Mar 14 15:22:57 2019
@@ -126,13 +126,13 @@ public class PrincipalManagerDelegator i
}
@Override
- public PrincipalIterator findPrincipals(String simpleFilter, int searchType, long offset, long limit) {
+ public PrincipalIterator findPrincipals(String simpleFilter, boolean fullText, int searchType, long offset, long limit) {
return delegate.safePerform(new SessionOperation<PrincipalIterator>("findPrincipals") {
@NotNull
@Override
public PrincipalIterator perform() {
if (principalManager instanceof PrincipalQueryManager) {
- return ((PrincipalQueryManager) principalManager).findPrincipals(simpleFilter, searchType, offset,
+ return ((PrincipalQueryManager) principalManager).findPrincipals(simpleFilter, fullText, searchType, offset,
limit);
} else {
PrincipalIterator pi = principalManager.findPrincipals(simpleFilter, searchType);
Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImpl.java?rev=1855533&r1=1855532&r2=1855533&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImpl.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImpl.java Thu Mar 14 15:22:57 2019
@@ -80,7 +80,7 @@ public class PrincipalManagerImpl implem
}
@Override
- public PrincipalIterator findPrincipals(String simpleFilter, int searchType, long offset, long limit) {
- return new PrincipalIteratorAdapter(principalProvider.findPrincipals(simpleFilter, searchType, offset, limit));
+ public PrincipalIterator findPrincipals(String simpleFilter, boolean fullText, int searchType, long offset, long limit) {
+ return new PrincipalIteratorAdapter(principalProvider.findPrincipals(simpleFilter, fullText, searchType, offset, limit));
}
}
Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java?rev=1855533&r1=1855532&r2=1855533&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java Thu Mar 14 15:22:57 2019
@@ -138,6 +138,7 @@ public interface PrincipalProvider {
* Find the principals that match the specified nameHint and search type.
*
* @param nameHint A name hint to use for non-exact matching.
+ * @param fullText hint to use a full text query for search
* @param searchType Limit the search to certain types of principals. Valid
* values are any of
* <ul><li>{@link org.apache.jackrabbit.api.security.principal.PrincipalManager#SEARCH_TYPE_ALL}</li></ul>
@@ -149,7 +150,7 @@ public interface PrincipalProvider {
* @throws IllegalArgumentException if {@code offset} is negative
*/
@NotNull
- default Iterator<? extends Principal> findPrincipals(@Nullable String nameHint, int searchType, long offset, long limit) {
+ default Iterator<? extends Principal> findPrincipals(@Nullable String nameHint, boolean fullText, int searchType, long offset, long limit) {
if (offset < 0) {
throw new IllegalArgumentException(Long.toString(offset));
}
Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalQueryManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalQueryManager.java?rev=1855533&r1=1855532&r2=1855533&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalQueryManager.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalQueryManager.java Thu Mar 14 15:22:57 2019
@@ -37,6 +37,7 @@ public interface PrincipalQueryManager {
* An implementation may limit the number of principals returned.
* If there are no matching principals, an empty iterator is returned.
* @param simpleFilter
+ * @param fullText
* @param searchType Any of the following constants:
* <ul>
* <li>{@link PrincipalManager#SEARCH_TYPE_ALL}</li>
@@ -48,5 +49,5 @@ public interface PrincipalQueryManager {
* @return a <code>PrincipalIterator</code> over the <code>Principal</code>s
* matching the given filter and search type.
*/
- PrincipalIterator findPrincipals(String simpleFilter, int searchType, long offset, long limit);
+ PrincipalIterator findPrincipals(String simpleFilter, boolean fullText, int searchType, long offset, long limit);
}
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=1855533&r1=1855532&r2=1855533&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 14 15:22:57 2019
@@ -199,9 +199,9 @@ public class CompositePrincipalProviderT
to = Math.min(offset + limit, to);
}
List<String> sub = expected.subList(offset, to);
- Iterator<? extends Principal> i0 = pp.findPrincipals(null, PrincipalManager.SEARCH_TYPE_ALL, offset, limit);
+ Iterator<? extends Principal> i0 = pp.findPrincipals(null, false, PrincipalManager.SEARCH_TYPE_ALL, offset, limit);
assertEquals(sub, getNames(i0));
- Iterator<? extends Principal> i1 = pp.findPrincipals("", PrincipalManager.SEARCH_TYPE_ALL, offset,
+ Iterator<? extends Principal> i1 = pp.findPrincipals("", false, PrincipalManager.SEARCH_TYPE_ALL, offset,
limit);
assertEquals(sub, getNames(i1));
}