svn commit: r1860351 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java

[angela]

Author: angela
Date: Wed May 29 15:45:39 2019
New Revision: 1860351

URL: http://svn.apache.org/viewvc?rev=1860351&view=rev
Log:
OAK-8373 : UserPrincipalProvider: redundant test for null in 
ResultRowToPrincipal, EveryonePredicate

Modified:
    
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/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=1860351&r1=1860350&r2=1860351&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
 Wed May 29 15:45:39 2019
@@ -398,8 +398,8 @@ class UserPrincipalProvider implements P
      */
     private final class ResultRowToPrincipal implements Function<ResultRow, 
Principal> {
         @Override
-        public Principal apply(@Nullable ResultRow resultRow) {
-            return (resultRow != null) ? 
createPrincipal(resultRow.getTree(null)) : null;
+        public Principal apply(ResultRow resultRow) {
+            return createPrincipal(resultRow.getTree(null));
         }
     }
 
@@ -410,9 +410,8 @@ class UserPrincipalProvider implements P
     private static final class EveryonePredicate implements 
Predicate<Principal> {
         private boolean servedEveryone = false;
         @Override
-        public boolean apply(@Nullable Principal principal) {
-            String pName = (principal == null) ? null : principal.getName();
-            if (EveryonePrincipal.NAME.equals(pName)) {
+        public boolean apply(Principal principal) {
+            if (EveryonePrincipal.NAME.equals(principal.getName())) {
                 if (servedEveryone) {
                     return false;
                 } else {