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 2016/05/24 08:10:54 UTC
svn commit: r1745318 - in
/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx:
Delegatee.java SyncMBeanImpl.java SynchronizationMBean.java
Author: angela
Date: Tue May 24 08:10:53 2016
New Revision: 1745318
URL: http://svn.apache.org/viewvc?rev=1745318&view=rev
Log:
OAK-4154 : SynchronizationMBean should offer methods to synchronize without forcing group sync. (reverting changes made without test cases)
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImpl.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynchronizationMBean.java
Modified: jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.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/jmx/Delegatee.java?rev=1745318&r1=1745317&r2=1745318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java (original)
+++ jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java Tue May 24 08:10:53 2016
@@ -121,12 +121,12 @@ final class Delegatee {
}
/**
- * @see SynchronizationMBean#syncUsers(String[], boolean, boolean)
+ * @see SynchronizationMBean#syncUsers(String[], boolean)
*/
@Nonnull
- String[] syncUsers(@Nonnull String[] userIds, boolean purge, boolean forceGroupSync) {
+ String[] syncUsers(@Nonnull String[] userIds, boolean purge) {
context.setKeepMissing(!purge)
- .setForceGroupSync(forceGroupSync)
+ .setForceGroupSync(true)
.setForceUserSync(true);
List<String> list = new ArrayList<String>();
for (String userId : userIds) {
@@ -141,14 +141,14 @@ final class Delegatee {
}
/**
- * @see SynchronizationMBean#syncAllUsers(boolean, boolean)
+ * @see SynchronizationMBean#syncAllUsers(boolean)
*/
@Nonnull
- String[] syncAllUsers(boolean purge, boolean forceGroupSync) {
+ String[] syncAllUsers(boolean purge) {
try {
List<String> list = new ArrayList<String>();
context.setKeepMissing(!purge)
- .setForceGroupSync(forceGroupSync)
+ .setForceGroupSync(true)
.setForceUserSync(true);
Iterator<SyncedIdentity> iter = handler.listIdentities(userMgr);
while (iter.hasNext()) {
@@ -169,12 +169,12 @@ final class Delegatee {
}
/**
- * @see SynchronizationMBean#syncExternalUsers(String[], boolean)
+ * @see SynchronizationMBean#syncExternalUsers(String[])
*/
@Nonnull
- String[] syncExternalUsers(@Nonnull String[] externalIds, boolean forceGroupSync) {
+ String[] syncExternalUsers(@Nonnull String[] externalIds) {
List<String> list = new ArrayList<String>();
- context.setForceGroupSync(forceGroupSync).setForceUserSync(true);
+ context.setForceGroupSync(true).setForceUserSync(true);
for (String externalId : externalIds) {
ExternalIdentityRef ref = ExternalIdentityRef.fromString(externalId);
if (!idp.getName().equals(ref.getProviderName())) {
@@ -205,12 +205,12 @@ final class Delegatee {
}
/**
- * @see SynchronizationMBean#syncAllExternalUsers(boolean)
+ * @see SynchronizationMBean#syncAllExternalUsers()
*/
@Nonnull
- String[] syncAllExternalUsers(boolean forceGroupSync) {
+ String[] syncAllExternalUsers() {
List<String> list = new ArrayList<String>();
- context.setForceGroupSync(forceGroupSync).setForceUserSync(true);
+ context.setForceGroupSync(true).setForceUserSync(true);
try {
Iterator<ExternalUser> iter = idp.listUsers();
while (iter.hasNext()) {
Modified: jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImpl.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/jmx/SyncMBeanImpl.java?rev=1745318&r1=1745317&r2=1745318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImpl.java (original)
+++ jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImpl.java Tue May 24 08:10:53 2016
@@ -83,15 +83,9 @@ public class SyncMBeanImpl implements Sy
@Nonnull
@Override
public String[] syncUsers(@Nonnull String[] userIds, boolean purge) {
- return syncUsers(userIds, purge, true);
- }
-
- @Nonnull
- @Override
- public String[] syncUsers(@Nonnull String[] userIds, boolean purge, boolean forceGroupSync) {
Delegatee delegatee = getDelegatee();
try {
- return delegatee.syncUsers(userIds, purge, forceGroupSync);
+ return delegatee.syncUsers(userIds, purge);
} finally {
delegatee.close();
}
@@ -100,15 +94,9 @@ public class SyncMBeanImpl implements Sy
@Nonnull
@Override
public String[] syncAllUsers(boolean purge) {
- return syncAllUsers(purge, true);
- }
-
- @Nonnull
- @Override
- public String[] syncAllUsers(boolean purge, boolean forceGroupSync) {
Delegatee delegatee = getDelegatee();
try {
- return delegatee.syncAllUsers(purge, forceGroupSync);
+ return delegatee.syncAllUsers(purge);
} finally {
delegatee.close();
}
@@ -117,15 +105,9 @@ public class SyncMBeanImpl implements Sy
@Nonnull
@Override
public String[] syncExternalUsers(@Nonnull String[] externalIds) {
- return syncExternalUsers(externalIds, true);
- }
-
- @Nonnull
- @Override
- public String[] syncExternalUsers(@Nonnull String[] externalIds, boolean forceGroupSync) {
Delegatee delegatee = getDelegatee();
try {
- return delegatee.syncExternalUsers(externalIds, forceGroupSync);
+ return delegatee.syncExternalUsers(externalIds);
} finally {
delegatee.close();
}
@@ -134,15 +116,9 @@ public class SyncMBeanImpl implements Sy
@Nonnull
@Override
public String[] syncAllExternalUsers() {
- return syncAllExternalUsers(true);
- }
-
- @Nonnull
- @Override
- public String[] syncAllExternalUsers(boolean forceGroupSync) {
Delegatee delegatee = getDelegatee();
try {
- return delegatee.syncAllExternalUsers(forceGroupSync);
+ return delegatee.syncAllExternalUsers();
} finally {
delegatee.close();
}
Modified: jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynchronizationMBean.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/jmx/SynchronizationMBean.java?rev=1745318&r1=1745317&r2=1745318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynchronizationMBean.java (original)
+++ jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynchronizationMBean.java Tue May 24 08:10:53 2016
@@ -74,16 +74,6 @@ public interface SynchronizationMBean {
String[] syncUsers(@Nonnull String[] userIds, boolean purge);
/**
- * Synchronizes the local users with the given user ids.
- * @param userIds the user ids
- * @param purge if {@code true} users that don't exist in the IDP are deleted.
- * @param forceGroupSync if synchronization of containing groups shall be forced
- * @return result messages.
- */
- @Nonnull
- String[] syncUsers(@Nonnull String[] userIds, boolean purge, boolean forceGroupSync);
-
- /**
* Synchronizes all local users with the given user ids. Note that this can be an expensive operation since all
* potential users need to be examined.
*
@@ -94,17 +84,6 @@ public interface SynchronizationMBean {
String[] syncAllUsers(boolean purge);
/**
- * Synchronizes all local users with the given user ids. Note that this can be an expensive operation since all
- * potential users need to be examined.
- *
- * @param purge if {@code true} users that don't exist in the IDP are deleted.
- * @param forceGroupSync if synchronization of containing groups shall be forced
- * @return result messages.
- */
- @Nonnull
- String[] syncAllUsers(boolean purge, boolean forceGroupSync);
-
- /**
* Synchronizes the external users with the given external ids.
* @param externalIds the external id
* @return result messages.
@@ -113,15 +92,6 @@ public interface SynchronizationMBean {
String[] syncExternalUsers(@Nonnull String[] externalIds);
/**
- * Synchronizes the external users with the given external ids.
- * @param externalIds the external id
- * @param forceGroupSync if synchronization of containing groups shall be forced
- * @return result messages.
- */
- @Nonnull
- String[] syncExternalUsers(@Nonnull String[] externalIds, boolean forceGroupSync);
-
- /**
* Synchronizes all the external users, i.e. basically imports the entire IDP. Note that this can be an expensive
* operation.
*
@@ -131,16 +101,6 @@ public interface SynchronizationMBean {
String[] syncAllExternalUsers();
/**
- * Synchronizes all the external users, i.e. basically imports the entire IDP. Note that this can be an expensive
- * operation.
- *
- * @param forceGroupSync if synchronization of containing groups shall be forced
- * @return result messages.
- */
- @Nonnull
- String[] syncAllExternalUsers(boolean forceGroupSync);
-
- /**
* Returns a list of orphaned users, i.e. users that don't exist anymore on the IDP. Note that this can be an
* expensive operation since all potential users need to be examined.
* @return a list of the user ids of orphaned users.