Author: reschke
Date: Thu Jan 30 15:41:52 2020
New Revision: 1873369
URL: http://svn.apache.org/viewvc?rev=1873369&view=rev
Log:
OAK-7358: Remove all usage of java.security.acl.Group for Java 14
Removed:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/AclGroupDeprecation.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipalWrapper.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipalWrapperTest.java
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalTest.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipalTest.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EveryonePrincipal.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipals.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/package-info.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EveryonePrincipalTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipalsTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProviderTest.java
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java?rev=1873369&r1=1873368&r2=1873369&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
Thu Jan 30 15:41:52 2020
@@ -63,7 +63,6 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncConfig;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalIdentityConstants;
-import org.apache.jackrabbit.oak.spi.security.principal.AclGroupDeprecation;
import org.apache.jackrabbit.oak.spi.security.principal.GroupPrincipals;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalProvider;
@@ -299,7 +298,7 @@ class ExternalGroupPrincipalProvider imp
* identities that are <strong>not</strong> represented as authorizable
group
* in the repository's user management.
*/
- private final class ExternalGroupPrincipal extends PrincipalImpl
implements GroupPrincipal, java.security.acl.Group {
+ private final class ExternalGroupPrincipal extends PrincipalImpl
implements GroupPrincipal {
private ExternalGroupPrincipal(String principalName) {
super(principalName);
@@ -307,26 +306,6 @@ class ExternalGroupPrincipalProvider imp
}
@Override
- public boolean addMember(Principal user) {
- AclGroupDeprecation.handleCall();
- if (isMember(user)) {
- return false;
- } else {
- throw new UnsupportedOperationException("Adding members to
external group principals is not supported.");
- }
- }
-
- @Override
- public boolean removeMember(Principal user) {
- AclGroupDeprecation.handleCall();
- if (!isMember(user)) {
- return false;
- } else {
- throw new UnsupportedOperationException("Removing members from
external group principals is not supported.");
- }
- }
-
- @Override
public boolean isMember(@NotNull Principal member) {
if (GroupPrincipals.isGroup(member)) {
return false;
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalTest.java?rev=1873369&r1=1873368&r2=1873369&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalTest.java
Thu Jan 30 15:41:52 2020
@@ -161,30 +161,4 @@ public class ExternalGroupPrincipalTest
assertTrue(gp instanceof GroupPrincipal);
assertFalse(((GroupPrincipal)gp).members().hasMoreElements());
}
-
- @Test(expected = UnsupportedOperationException.class)
- public void testAddNewMember() throws Exception {
- java.security.acl.Group principal = (java.security.acl.Group)
getGroupPrincipal();
- principal.addMember(new PrincipalImpl("newMember"));
- }
-
- @Test
- public void testAddExistingMember() throws Exception {
- java.security.acl.Group principal = (java.security.acl.Group)
getGroupPrincipal();
- Principal existingMember =
getUserManager(root).getAuthorizable(USER_ID).getPrincipal();
- assertFalse(principal.addMember(existingMember));
- }
-
- @Test
- public void testRemoveeNewMember() throws Exception {
- java.security.acl.Group principal = (java.security.acl.Group)
getGroupPrincipal();
- assertFalse(principal.removeMember(new PrincipalImpl("newMember")));
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void testRemoveExistingMember() throws Exception {
- java.security.acl.Group principal = (java.security.acl.Group)
getGroupPrincipal();
- Principal existingMember =
getUserManager(root).getAuthorizable(USER_ID).getPrincipal();
- principal.removeMember(existingMember);
- }
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java?rev=1873369&r1=1873368&r2=1873369&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java
Thu Jan 30 15:41:52 2020
@@ -30,7 +30,6 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
-import org.apache.jackrabbit.oak.spi.security.principal.AclGroupDeprecation;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
@@ -39,7 +38,7 @@ import org.slf4j.LoggerFactory;
/**
* Base class for {@code Group} principals.
*/
-abstract class AbstractGroupPrincipal extends TreeBasedPrincipal implements
GroupPrincipal, java.security.acl.Group {
+abstract class AbstractGroupPrincipal extends TreeBasedPrincipal implements
GroupPrincipal {
private static final Logger log =
LoggerFactory.getLogger(AbstractGroupPrincipal.class);
@@ -113,16 +112,4 @@ abstract class AbstractGroupPrincipal ex
});
return Iterators.asEnumeration(Iterators.filter(principals,
Predicates.<Object>notNull()));
}
-
- @Override
- public boolean addMember(Principal principal) {
- AclGroupDeprecation.handleCall();
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean removeMember(Principal principal) {
- AclGroupDeprecation.handleCall();
- throw new UnsupportedOperationException();
- }
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipalTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipalTest.java?rev=1873369&r1=1873368&r2=1873369&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipalTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipalTest.java
Thu Jan 30 15:41:52 2020
@@ -180,16 +180,6 @@ public class AbstractGroupPrincipalTest
assertFalse(everyoneAgp.isMember(member));
}
- @Test(expected = UnsupportedOperationException.class)
- public void testAddMember() throws Exception {
- new AGP().addMember(new PrincipalImpl("p"));
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void testRemoveMember() throws Exception {
- new AGP().removeMember(new PrincipalImpl("p"));
- }
-
private class AGP extends AbstractGroupPrincipal {
private Authorizable member;
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java?rev=1873369&r1=1873368&r2=1873369&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java
Thu Jan 30 15:41:52 2020
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.spi.security.principal;
import java.security.Principal;
-import java.security.acl.Group;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
@@ -89,13 +88,6 @@ public class CompositePrincipalProvider
}
@NotNull
- @Override
- public Set<Group> getGroupMembership(@NotNull Principal principal) {
- AclGroupDeprecation.handleCall();
- return Collections.emptySet();
- }
-
- @NotNull
@Override
public Set<Principal> getMembershipPrincipals(@NotNull Principal
principal) {
Set<Principal> groups = new HashSet<>();
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java?rev=1873369&r1=1873368&r2=1873369&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java
Thu Jan 30 15:41:52 2020
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.spi.security.principal;
import java.security.Principal;
-import java.security.acl.Group;
import java.util.Collections;
import java.util.Iterator;
import java.util.Set;
@@ -41,13 +40,6 @@ public final class EmptyPrincipalProvide
}
@NotNull
- @Override
- public Set<Group> getGroupMembership(@NotNull Principal principal) {
- AclGroupDeprecation.handleCall();
- return Collections.emptySet();
- }
-
- @NotNull
@Override
public Set<Principal> getMembershipPrincipals(@NotNull Principal
principal) {
return Collections.emptySet();
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EveryonePrincipal.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EveryonePrincipal.java?rev=1873369&r1=1873368&r2=1873369&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EveryonePrincipal.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EveryonePrincipal.java
Thu Jan 30 15:41:52 2020
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.spi.security.principal;
import java.security.Principal;
-import java.security.acl.Group;
import java.util.Enumeration;
import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
@@ -27,7 +26,7 @@ import org.jetbrains.annotations.NotNull
/**
* Built-in principal group that has every other principal as member.
*/
-public final class EveryonePrincipal implements JackrabbitPrincipal, Group,
GroupPrincipal {
+public final class EveryonePrincipal implements JackrabbitPrincipal,
GroupPrincipal {
public static final String NAME = "everyone";
@@ -45,19 +44,6 @@ public final class EveryonePrincipal imp
return NAME;
}
- //--------------------------------------------------------------< Group
>---
- @Override
- public boolean addMember(Principal user) {
- AclGroupDeprecation.handleCall();
- return false;
- }
-
- @Override
- public boolean removeMember(Principal user) {
- AclGroupDeprecation.handleCall();
- throw new UnsupportedOperationException("Cannot remove a member from
the everyone group.");
- }
-
//------------------------------------------------------< GroupPrincipal
>---
@Override
public boolean isMember(@NotNull Principal member) {
@@ -92,4 +78,4 @@ public final class EveryonePrincipal imp
public String toString() {
return NAME + " principal";
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipals.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipals.java?rev=1873369&r1=1873368&r2=1873369&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipals.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipals.java
Thu Jan 30 15:41:52 2020
@@ -17,27 +17,18 @@
package org.apache.jackrabbit.oak.spi.security.principal;
import java.security.Principal;
-import java.security.acl.Group;
import java.util.Collections;
import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Set;
import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
import org.jetbrains.annotations.NotNull;
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterators;
-
/**
* Helper class to deal with the migration between the 2 types of groups
*
*/
public final class GroupPrincipals {
- private static final GroupTransformer TRANSFORMER = new GroupTransformer();
-
private GroupPrincipals() {
}
@@ -50,7 +41,7 @@ public final class GroupPrincipals {
* @return true if the principal is of type group.
*/
public static boolean isGroup(@NotNull Principal principal) {
- return principal instanceof Group || principal instanceof
GroupPrincipal;
+ return principal instanceof GroupPrincipal;
}
/**
@@ -60,9 +51,6 @@ public final class GroupPrincipals {
*/
@NotNull
public static Enumeration<? extends Principal> members(@NotNull Principal
principal) {
- if (principal instanceof Group) {
- return ((Group) principal).members();
- }
if (principal instanceof GroupPrincipal) {
return ((GroupPrincipal) principal).members();
}
@@ -76,39 +64,9 @@ public final class GroupPrincipals {
* @return true if the principal is a member of this group, false
otherwise.
*/
public static boolean isMember(@NotNull Principal principal, @NotNull
Principal member) {
- if (principal instanceof Group) {
- return ((Group) principal).isMember(member);
- }
if (principal instanceof GroupPrincipal) {
return ((GroupPrincipal) principal).isMember(member);
}
return false;
}
-
- @NotNull
- public static Set<Principal> transform(@NotNull Set<Group> groups) {
- ImmutableSet.Builder<Principal> g2 = ImmutableSet.builder();
- for (Group g : groups) {
- g2.add(new GroupPrincipalWrapper(g));
- }
- return g2.build();
- }
-
- @NotNull
- public static Enumeration<? extends Principal> transform(@NotNull
Enumeration<? extends Principal> members) {
- Iterator<Principal> m2 =
Iterators.transform(Iterators.forEnumeration(members), TRANSFORMER);
- return Iterators.asEnumeration(m2);
- }
-
- private static class GroupTransformer implements Function<Principal,
Principal> {
-
- @Override
- public Principal apply(Principal input) {
- if (input instanceof Group) {
- return new GroupPrincipalWrapper((Group) input);
- } else {
- return input;
- }
- }
- }
}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java?rev=1873369&r1=1873368&r2=1873369&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProvider.java
Thu Jan 30 15:41:52 2020
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.spi.security.principal;
import java.security.Principal;
-import java.security.acl.Group;
import java.util.Collections;
import java.util.Iterator;
import java.util.Set;
@@ -70,27 +69,6 @@ public interface PrincipalProvider {
}
/**
- * Returns an iterator over all group principals for which the given
- * principal is either direct or indirect member of. Thus for any principal
- * returned in the iterator {@link
java.security.acl.Group#isMember(Principal)}
- * must return {@code true}.
- * <p>
- * Example:<br>
- * If Principal is member of Group A, and Group A is member of
- * Group B, this method will return Group A and Group B.
- *
- * @deprecated use {@link #getMembershipPrincipals(Principal)}
- * @param principal the principal to return it's membership from.
- * @return an iterator returning all groups the given principal is member
of.
- * @see java.security.acl.Group#isMember(java.security.Principal)
- */
- @NotNull
- default Set<Group> getGroupMembership(@NotNull Principal principal) {
- AclGroupDeprecation.handleCall();
- return Collections.emptySet();
- }
-
- /**
* Returns an iterator over all group principals for which the given
* principal is either direct or indirect member of. Thus for any principal
* returned in the iterator {@link
org.apache.jackrabbit.api.security.principal.GroupPrincipal#isMember(Principal)}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/package-info.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/package-info.java?rev=1873369&r1=1873368&r2=1873369&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/package-info.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/package-info.java
Thu Jan 30 15:41:52 2020
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.8.0")
+@Version("2.0.0")
package org.apache.jackrabbit.oak.spi.security.principal;
import org.osgi.annotation.versioning.Version;
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java?rev=1873369&r1=1873368&r2=1873369&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProviderTest.java
Thu Jan 30 15:41:52 2020
@@ -112,13 +112,6 @@ public class CompositePrincipalProviderT
}
@Test
- public void testGetGroupMembership() {
- for (Principal principal : testPrincipals()) {
- assertTrue(cpp.getGroupMembership(principal).isEmpty());
- }
- }
-
- @Test
public void testGetMembershipPrincipals() {
for (Principal principal : testPrincipals()) {
boolean atleastEveryone =
cpp.getMembershipPrincipals(principal).contains(EveryonePrincipal.getInstance());
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProviderTest.java?rev=1873369&r1=1873368&r2=1873369&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProviderTest.java
Thu Jan 30 15:41:52 2020
@@ -16,17 +16,14 @@
*/
package org.apache.jackrabbit.oak.spi.security.principal;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import java.security.Principal;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
-import org.apache.jackrabbit.oak.commons.junit.LogCustomizer;
import org.junit.Test;
-import org.slf4j.event.Level;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
public class EmptyPrincipalProviderTest {
@@ -41,66 +38,6 @@ public class EmptyPrincipalProviderTest
}
@Test
- public void testGetGroupMembershipOnDebug() {
- String prev = AclGroupDeprecation.setLogLevel("debug");
- LogCustomizer customLogs =
LogCustomizer.forLogger(AclGroupDeprecation.class.getName()).enable(Level.DEBUG).create();
- try {
- customLogs.starting();
- testGetGroupMembership();
- assertTrue(customLogs.getLogs().size() == 1);
- } finally {
- customLogs.finished();
- AclGroupDeprecation.setLogLevel(prev);
- }
- }
-
- @Test
- public void testGetGroupMembershipOnInfo() {
- String prev = AclGroupDeprecation.setLogLevel("info");
- LogCustomizer customLogs =
LogCustomizer.forLogger(AclGroupDeprecation.class.getName()).enable(Level.INFO).create();
- try {
- customLogs.starting();
- testGetGroupMembership();
- assertTrue(customLogs.getLogs().size() == 1);
- } finally {
- customLogs.finished();
- AclGroupDeprecation.setLogLevel(prev);
- }
- }
-
- @Test
- public void testGetGroupMembershipOnWarn() {
- String prev = AclGroupDeprecation.setLogLevel("warn");
- LogCustomizer customLogs =
LogCustomizer.forLogger(AclGroupDeprecation.class.getName()).enable(Level.WARN).create();
- try {
- customLogs.starting();
- testGetGroupMembership();
- assertTrue(customLogs.getLogs().size() == 1);
- } finally {
- customLogs.finished();
- AclGroupDeprecation.setLogLevel(prev);
- }
- }
-
- @Test
- public void testGetGroupMembershipOnError() {
- String prev = AclGroupDeprecation.setLogLevel("error");
- LogCustomizer customLogs =
LogCustomizer.forLogger(AclGroupDeprecation.class.getName()).enable(Level.ERROR).create();
- try {
- customLogs.starting();
- testGetGroupMembership();
- assertTrue(customLogs.getLogs().size() == 1);
- } finally {
- customLogs.finished();
- AclGroupDeprecation.setLogLevel(prev);
- }
- }
-
- private void testGetGroupMembership() {
-
assertTrue(principalProvider.getGroupMembership(mock(Principal.class)).isEmpty());
- }
-
- @Test
public void testGetMembershipPrincipals() {
assertTrue(principalProvider.getMembershipPrincipals(EveryonePrincipal.getInstance()).isEmpty());
assertTrue(principalProvider.getMembershipPrincipals(new
PrincipalImpl(EveryonePrincipal.NAME)).isEmpty());
@@ -126,4 +63,4 @@ public class EmptyPrincipalProviderTest
assertFalse(principalProvider.findPrincipals(PrincipalManager.SEARCH_TYPE_NOT_GROUP).hasNext());
assertFalse(principalProvider.findPrincipals(PrincipalManager.SEARCH_TYPE_GROUP).hasNext());
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EveryonePrincipalTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EveryonePrincipalTest.java?rev=1873369&r1=1873368&r2=1873369&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EveryonePrincipalTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EveryonePrincipalTest.java
Thu Jan 30 15:41:52 2020
@@ -30,7 +30,6 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
public class EveryonePrincipalTest {
@@ -42,16 +41,6 @@ public class EveryonePrincipalTest {
}
@Test
- public void testAddMember() {
- assertFalse(everyone.addMember(mock(Principal.class)));
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void testRemoveMember() {
- everyone.removeMember(mock(Principal.class));
- }
-
- @Test
public void testIsMember() {
assertTrue(everyone.isMember(new PrincipalImpl("test")));
}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipalsTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipalsTest.java?rev=1873369&r1=1873368&r2=1873369&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipalsTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/GroupPrincipalsTest.java
Thu Jan 30 15:41:52 2020
@@ -16,25 +16,19 @@
*/
package org.apache.jackrabbit.oak.spi.security.principal;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.Sets;
-import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
-import org.junit.Test;
-
-import java.security.Principal;
-import java.security.acl.Group;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Set;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+
+import java.security.Principal;
+import java.util.Collections;
+import java.util.Enumeration;
+
+import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
+import org.junit.Test;
public class GroupPrincipalsTest {
@@ -43,7 +37,7 @@ public class GroupPrincipalsTest {
Principal p0 = new PrincipalImpl("test");
assertFalse(GroupPrincipals.isGroup(p0));
- Group g = new Group() {
+ GroupPrincipal g = new GroupPrincipal() {
@Override
public String getName() {
@@ -51,11 +45,6 @@ public class GroupPrincipalsTest {
}
@Override
- public boolean removeMember(Principal user) {
- return false;
- }
-
- @Override
public Enumeration<? extends Principal> members() {
throw new UnsupportedOperationException();
}
@@ -64,72 +53,9 @@ public class GroupPrincipalsTest {
public boolean isMember(Principal member) {
return false;
}
-
- @Override
- public boolean addMember(Principal user) {
- return false;
- }
};
assertTrue(GroupPrincipals.isGroup(g));
- assertTrue(GroupPrincipals.isGroup(new GroupPrincipalWrapper(g)));
- }
-
- @Test
- public void testTransformGroupSet() {
- Group g = new Group() {
-
- @Override
- public String getName() {
- return "testG";
- }
-
- @Override
- public boolean removeMember(Principal user) {
- return false;
- }
-
- @Override
- public Enumeration<? extends Principal> members() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean isMember(Principal member) {
- return false;
- }
-
- @Override
- public boolean addMember(Principal user) {
- return false;
- }
- };
-
- Set<Principal> t = GroupPrincipals.transform(ImmutableSet.of(g));
- assertEquals(1, t.size());
- Principal p = t.iterator().next();
- assertEquals(p.getName(), g.getName());
- }
-
- @Test
- public void testTransformEnumeration() {
- Group g = when(mock(Group.class).getName()).thenReturn("g").getMock();
- Set<Principal> set = ImmutableSet.of(g, mock(Principal.class),
mock(GroupPrincipal.class));
- Enumeration<? extends Principal> e =
GroupPrincipals.transform(Collections.enumeration(set));
-
- Set<Principal> t = Sets.newHashSet(Iterators.forEnumeration(e));
- assertEquals(set.size(), t.size());
- for (Principal p : t) {
- assertFalse(p instanceof Group);
- }
- }
-
- @Test
- public void testTransformEmptyEnumeration() {
- Enumeration members = Collections.emptyEnumeration();
-
- Enumeration<Principal> t = GroupPrincipals.transform(members);
- assertFalse(t.hasMoreElements());
}
@Test
@@ -146,14 +72,6 @@ public class GroupPrincipalsTest {
}
@Test
- public void testMembersOfGroup() {
- Group g = mock(Group.class);
-
- GroupPrincipals.members(g);
- verify(g, times(1)).members();
- }
-
- @Test
public void testIsMemberOfNonGroup() {
assertFalse(GroupPrincipals.isMember(mock(Principal.class),
mock(Principal.class)));
}
@@ -166,13 +84,4 @@ public class GroupPrincipalsTest {
GroupPrincipals.isMember(gp, p);
verify(gp, times(1)).isMember(p);
}
-
- @Test
- public void testIsMemberOfGroup() {
- Group g = mock(Group.class);
- Principal p = mock(Principal.class);
-
- GroupPrincipals.isMember(g, p);
- verify(g, times(1)).isMember(p);
- }
}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProviderTest.java?rev=1873369&r1=1873368&r2=1873369&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalProviderTest.java
Thu Jan 30 15:41:52 2020
@@ -59,12 +59,6 @@ public class PrincipalProviderTest {
}
@Test
- public void testGetGroupMembership() {
- Principal p = mock(Principal.class);
- assertTrue(pp.getGroupMembership(p).isEmpty());
- }
-
- @Test
public void testGetMembershipPrincipals() {
assertTrue(pp.getMembershipPrincipals(mock(Principal.class)).isEmpty());
}
@@ -73,4 +67,4 @@ public class PrincipalProviderTest {
public void testNegativeOffset() {
pp.findPrincipals("hint", true, PrincipalManager.SEARCH_TYPE_GROUP,
-1, 12);
}
-}
\ No newline at end of file
+}
