Introduce directory kinds.

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

diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/LdapUserAdmin.java b/org.argeo.util/src/org/argeo/osgi/useradmin/LdapUserAdmin.java
index af75bf03e524c7ed4b4f6d143fe74a4c6036ed1c..138eb39e9a49dc03ec7c02b7fbda001703c6e7a7 100644 (file)
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/LdapUserAdmin.java
+++ b/org.argeo.util/src/org/argeo/osgi/useradmin/LdapUserAdmin.java
@@ -79,11 +79,11 @@ public class LdapUserAdmin extends AbstractUserDirectory {
                        if (attrs.size() == 0)
                                return null;
                        int roleType = roleType(name);
-                       LdifUser res;
+                       DirectoryUser res;
                        if (roleType == Role.GROUP)
-                               res = new LdifGroup(this, name, attrs);
+                               res = newGroup( name, attrs);
                        else if (roleType == Role.USER)
-                               res = new LdifUser(this, name, attrs);
+                               res = newUser( name, attrs);
                        else
                                throw new UserDirectoryException("Unsupported LDAP type for " + name);
                        return res;
@@ -113,13 +113,13 @@ public class LdapUserAdmin extends AbstractUserDirectory {
                                Attributes attrs = searchResult.getAttributes();
                                Attribute objectClassAttr = attrs.get(objectClass.name());
                                LdapName dn = toDn(searchBase, searchResult);
-                               LdifUser role;
+                               DirectoryUser role;
                                if (objectClassAttr.contains(getGroupObjectClass())
                                                || objectClassAttr.contains(getGroupObjectClass().toLowerCase()))
-                                       role = new LdifGroup(this, dn, attrs);
+                                       role = newGroup( dn, attrs);
                                else if (objectClassAttr.contains(getUserObjectClass())
                                                || objectClassAttr.contains(getUserObjectClass().toLowerCase()))
-                                       role = new LdifUser(this, dn, attrs);
+                                       role = newUser( dn, attrs);
                                else {
 //                                     log.warn("Unsupported LDAP type for " + searchResult.getName());
                                        continue results;