Author: reschke Date: Tue Apr 10 14:46:02 2018 New Revision: 1828822 URL: http://svn.apache.org/viewvc?rev=1828822&view=rev Log: OAK-7024: java.security.acl deprecated in Java 10, marked for removal in Java 12
avoid use of Guava emptyIterator() Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java?rev=1828822&r1=1828821&r2=1828822&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java Tue Apr 10 14:46:02 2018 @@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.spi.se import java.lang.reflect.Field; import java.security.Principal; +import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -26,7 +27,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterators; import org.apache.jackrabbit.api.security.principal.PrincipalManager; import org.apache.jackrabbit.oak.api.Root; @@ -183,13 +183,13 @@ public class CompositePrincipalConfigura @Nonnull @Override public Iterator<? extends Principal> findPrincipals(@Nullable String nameHint, int searchType) { - return Iterators.emptyIterator(); + return Collections.emptyIterator(); } @Nonnull @Override public Iterator<? extends Principal> findPrincipals(int searchType) { - return Iterators.emptyIterator(); + return Collections.emptyIterator(); } }