Rename transaction package

[lgpl/argeo-commons.git] / org.argeo.util / src / org / argeo / osgi / useradmin / AggregatingUserAdmin.java

diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java b/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java
index ad6a83fb5d437d5b519c662b15623dc3523abe3e..ac641de97cf6a128b5c2781f9c053cba8e98a7d7 100644 (file)
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java
+++ b/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java
@@ -43,7 +43,7 @@ public class AggregatingUserAdmin implements UserAdmin {
                        else
                                this.tokensBaseDn = null;
                } catch (InvalidNameException e) {
-                       throw new UserDirectoryException("Cannot initialize " + AggregatingUserAdmin.class, e);
+                       throw new IllegalStateException("Cannot initialize " + AggregatingUserAdmin.class, e);
                }
        }
 
@@ -160,7 +160,7 @@ public class AggregatingUserAdmin implements UserAdmin {
                if (!(ud instanceof AbstractUserDirectory))
                        throw new IllegalArgumentException("Only " + AbstractUserDirectory.class.getName() + " is supported");
                AbstractUserDirectory userDirectory = (AbstractUserDirectory) ud;
-               String basePath = userDirectory.getBasePath();
+               String basePath = userDirectory.getContext();
                if (isSystemRolesBaseDn(basePath)) {
                        this.systemRoles = userDirectory;
                        systemRoles.setExternalRoles(this);
@@ -170,7 +170,7 @@ public class AggregatingUserAdmin implements UserAdmin {
                } else {
                        LdapName baseDn = toLdapName(basePath);
                        if (businessRoles.containsKey(baseDn))
-                               throw new UserDirectoryException("There is already a user admin for " + baseDn);
+                               throw new IllegalStateException("There is already a user admin for " + baseDn);
                        businessRoles.put(baseDn, userDirectory);
                }
                userDirectory.init();
@@ -185,7 +185,7 @@ public class AggregatingUserAdmin implements UserAdmin {
                try {
                        return findUserAdmin(new LdapName(name));
                } catch (InvalidNameException e) {
-                       throw new UserDirectoryException("Badly formatted name " + name, e);
+                       throw new IllegalArgumentException("Badly formatted name " + name, e);
                }
        }
 
@@ -213,9 +213,9 @@ public class AggregatingUserAdmin implements UserAdmin {
                        }
                }
                if (res.size() == 0)
-                       throw new UserDirectoryException("Cannot find user admin for " + name);
+                       throw new IllegalStateException("Cannot find user admin for " + name);
                if (res.size() > 1)
-                       throw new UserDirectoryException("Multiple user admin found for " + name);
+                       throw new IllegalStateException("Multiple user admin found for " + name);
                return res.get(0);
        }
 
@@ -256,10 +256,10 @@ public class AggregatingUserAdmin implements UserAdmin {
 
        protected void removeUserDirectory(String basePath) {
                if (isSystemRolesBaseDn(basePath))
-                       throw new UserDirectoryException("System roles cannot be removed ");
+                       throw new IllegalArgumentException("System roles cannot be removed ");
                LdapName baseDn = toLdapName(basePath);
                if (!businessRoles.containsKey(baseDn))
-                       throw new UserDirectoryException("No user directory registered for " + baseDn);
+                       throw new IllegalStateException("No user directory registered for " + baseDn);
                AbstractUserDirectory userDirectory = businessRoles.remove(baseDn);
                destroy(userDirectory);
        }
@@ -272,7 +272,7 @@ public class AggregatingUserAdmin implements UserAdmin {
        }
 
        public Set<UserDirectory> getUserDirectories() {
-               TreeSet<UserDirectory> res = new TreeSet<>((o1, o2) -> o1.getBasePath().compareTo(o2.getBasePath()));
+               TreeSet<UserDirectory> res = new TreeSet<>((o1, o2) -> o1.getContext().compareTo(o2.getContext()));
                res.addAll(businessRoles.values());
                return res;
        }