Author: angela
Date: Tue Mar 26 12:17:12 2019
New Revision: 1856308
URL: http://svn.apache.org/viewvc?rev=1856308&view=rev
Log:
OAK-8169 : Missing nullability annotations with UserPrincipalProvider and
PrincipalProviderImpl
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
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=1856308&r1=1856307&r2=1856308&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
Tue Mar 26 12:17:12 2019
@@ -136,7 +136,7 @@ class PrincipalProviderImpl implements P
@NotNull
@Override
- public Iterator<? extends Principal> findPrincipals(final String nameHint,
final boolean fullText, final int searchType, long offset,
+ public Iterator<? extends Principal> findPrincipals(@Nullable 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=1856308&r1=1856307&r2=1856308&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
Tue Mar 26 12:17:12 2019
@@ -155,14 +155,15 @@ class UserPrincipalProvider implements P
return principals;
}
+ @NotNull
@Override
- public Iterator<? extends Principal> findPrincipals(final String nameHint,
final int searchType) {
+ public Iterator<? extends Principal> findPrincipals(@Nullable final String
nameHint, final int searchType) {
return findPrincipals(nameHint, false, searchType, 0, -1);
}
@NotNull
@Override
- public Iterator<? extends Principal> findPrincipals(final String nameHint,
final boolean fullText, final int searchType, long offset,
+ public Iterator<? extends Principal> findPrincipals(@Nullable final String
nameHint, final boolean fullText, final int searchType, long offset,
long limit) {
if (offset < 0) {
offset = 0;