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 an...@apache.org on 2019/02/01 17:27:47 UTC
svn commit: r1852763 - in /jackrabbit/oak/trunk/oak-security-spi/src:
main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java
test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java
Author: angela
Date: Fri Feb 1 17:27:47 2019
New Revision: 1852763
URL: http://svn.apache.org/viewvc?rev=1852763&view=rev
Log:
OAK-8021 : PrivilegeBitsProvider.getBits(Privilege[],NameMapper) should use getOakNameOrNull
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java
Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java?rev=1852763&r1=1852762&r2=1852763&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java Fri Feb 1 17:27:47 2019
@@ -123,21 +123,7 @@ public final class PrivilegeBitsProvider
*/
@NotNull
public PrivilegeBits getBits(@NotNull Privilege[] privileges, @NotNull final NameMapper nameMapper) {
- return getBits(Iterables.filter(Iterables.transform(Arrays.asList(privileges), new Function<Privilege, String>() {
-
- @Override
- public String apply(@Nullable Privilege privilege) {
- if (privilege != null) {
- try {
- return nameMapper.getOakName(privilege.getName());
- } catch (RepositoryException e) {
- log.debug("Unable to resolve OAK name of privilege " + privilege, e);
- }
- }
- // null privilege or failed to resolve the privilege name
- return null;
- }
- }), Predicates.notNull()));
+ return getBits(Iterables.filter(Iterables.transform(Arrays.asList(privileges), privilege -> nameMapper.getOakNameOrNull(privilege.getName())), Predicates.notNull()));
}
/**
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java?rev=1852763&r1=1852762&r2=1852763&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java Fri Feb 1 17:27:47 2019
@@ -161,10 +161,9 @@ public class PrivilegeBitsProviderTest i
when(p.getName()).thenReturn("name");
NamePathMapper mapper = new NamePathMapper.Default() {
- @NotNull
@Override
- public String getOakName(@NotNull String jcrName) throws RepositoryException {
- throw new RepositoryException();
+ public String getOakNameOrNull(@NotNull String jcrName) {
+ return null;
}
};
assertSame(PrivilegeBits.EMPTY, bitsProvider.getBits(new Privilege[] {p}, mapper));