Introduce transaction working copy abstraction

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

diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/LdifHierarchyUnit.java b/org.argeo.util/src/org/argeo/osgi/useradmin/LdifHierarchyUnit.java
index b4813e685b5b457ab65bdf6ffc488187f999479a..a847e49ae7f3d66afd13644889dc859961abc248 100644 (file)
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/LdifHierarchyUnit.java
+++ b/org.argeo.util/src/org/argeo/osgi/useradmin/LdifHierarchyUnit.java
@@ -1,6 +1,5 @@
 package org.argeo.osgi.useradmin;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -19,8 +18,8 @@ class LdifHierarchyUnit implements HierarchyUnit {
        private final boolean functional;
        private final Attributes attributes;
 
-       HierarchyUnit parent;
-       List<HierarchyUnit> children = new ArrayList<>();
+//     HierarchyUnit parent;
+//     List<HierarchyUnit> children = new ArrayList<>();
 
        LdifHierarchyUnit(AbstractUserDirectory directory, LdapName dn, Attributes attributes) {
                Objects.requireNonNull(directory);
@@ -31,27 +30,27 @@ class LdifHierarchyUnit implements HierarchyUnit {
                this.attributes = attributes;
 
                Rdn rdn = LdapNameUtils.getLastRdn(dn);
-               functional = !(directory.getUserBaseRdn().equals(rdn) || directory.getGroupBaseRdn().equals(rdn));
+               functional = !(directory.getUserBaseRdn().equals(rdn) || directory.getGroupBaseRdn().equals(rdn)
+                               || directory.getSystemRoleBaseRdn().equals(rdn));
        }
 
        @Override
        public HierarchyUnit getParent() {
-               return parent;
+               return directory.doGetHierarchyUnit(LdapNameUtils.getParent(dn));
        }
 
        @Override
-       public Iterable<HierarchyUnit> getDirectHierachyUnits() {
-               return children;
-       }
-
-       @Override
-       public Iterable<HierarchyUnit> getFunctionalHierachyUnits() {
-               List<HierarchyUnit> res = new ArrayList<>();
-               for (HierarchyUnit hu : children) {
-                       if (hu.isFunctional())
-                               res.add(hu);
-               }
-               return res;
+       public Iterable<HierarchyUnit> getDirectHierachyUnits(boolean functionalOnly) {
+//             List<HierarchyUnit> res = new ArrayList<>();
+//             if (functionalOnly)
+//                     for (HierarchyUnit hu : children) {
+//                             if (hu.isFunctional())
+//                                     res.add(hu);
+//                     }
+//             else
+//                     res.addAll(children);
+//             return Collections.unmodifiableList(res);
+               return directory.doGetDirectHierarchyUnits(dn, functionalOnly);
        }
 
        @Override
@@ -71,7 +70,7 @@ class LdifHierarchyUnit implements HierarchyUnit {
        }
 
        @Override
-       public String getBasePath() {
+       public String getContext() {
                return dn.toString();
        }