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

[reschke]

Author: reschke
Date: Wed Jan  9 17:18:39 2019
New Revision: 1850882

URL: http://svn.apache.org/viewvc?rev=1850882&view=rev
Log:
OAK-7979: DeclaredMembershipPredicate does not compile with Guava 20

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/DeclaredMembershipPredicate.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/DeclaredMembershipPredicate.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/DeclaredMembershipPredicate.java?rev=1850882&r1=1850881&r2=1850882&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/DeclaredMembershipPredicate.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/DeclaredMembershipPredicate.java
 Wed Jan  9 17:18:39 2019
@@ -16,13 +16,13 @@
  */
 package org.apache.jackrabbit.oak.security.user;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 import javax.jcr.RepositoryException;
 
 import com.google.common.base.Predicate;
-import com.google.common.collect.Iterators;
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType;
@@ -45,7 +45,7 @@ public class DeclaredMembershipPredicate
         this.membershipProvider = userManager.getMembershipProvider();
         Tree groupTree = membershipProvider.getByID(groupId, 
AuthorizableType.GROUP);
         if (groupTree == null) {
-            contentIdIterator = Iterators.emptyIterator();
+            contentIdIterator = Collections.emptyIterator();
         } else {
             contentIdIterator = 
membershipProvider.getDeclaredMemberContentIDs(membershipProvider.getByID(groupId,
 AuthorizableType.GROUP));
         }