Make writing of member and uniqueMember nicer in LDIF writer.

[lgpl/argeo-commons.git] / org.argeo.enterprise / src / org / argeo / naming / LdifWriter.java

diff --git a/org.argeo.enterprise/src/org/argeo/naming/LdifWriter.java b/org.argeo.enterprise/src/org/argeo/naming/LdifWriter.java
index 3a297e5db0c1a34e688dc0e69fafc1a3042f744f..98d2df055719a3f04e443183f00f26211be07c5d 100644 (file)
--- a/org.argeo.enterprise/src/org/argeo/naming/LdifWriter.java
+++ b/org.argeo.enterprise/src/org/argeo/naming/LdifWriter.java
@@ -1,11 +1,20 @@
 package org.argeo.naming;
 
+import static org.argeo.naming.LdapAttrs.DN;
+import static org.argeo.naming.LdapAttrs.member;
+import static org.argeo.naming.LdapAttrs.objectClass;
+import static org.argeo.naming.LdapAttrs.uniqueMember;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.Map;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
@@ -18,6 +27,7 @@ import org.argeo.osgi.useradmin.UserDirectoryException;
 
 /** Basic LDIF writer */
 public class LdifWriter {
+       private final static Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
        private final Writer writer;
 
        /** Writer must be closed by caller */
@@ -27,7 +37,7 @@ public class LdifWriter {
 
        /** Stream must be closed by caller */
        public LdifWriter(OutputStream out) {
-               this(new OutputStreamWriter(out));
+               this(new OutputStreamWriter(out, DEFAULT_CHARSET));
        }
 
        public void writeEntry(LdapName name, Attributes attributes) throws IOException {
@@ -39,16 +49,24 @@ public class LdifWriter {
                                throw new UserDirectoryException(
                                                "Attribute " + nameAttr.getID() + "=" + nameAttr.get() + " not consistent with DN " + name);
 
-                       writer.append(LdapAttrs.DN + ":").append(name.toString()).append('\n');
-                       Attribute objectClassAttr = attributes.get("objectClass");
+                       writer.append(DN + ": ").append(name.toString()).append('\n');
+                       Attribute objectClassAttr = attributes.get(objectClass.name());
                        if (objectClassAttr != null)
                                writeAttribute(objectClassAttr);
-                       for (NamingEnumeration<? extends Attribute> attrs = attributes.getAll(); attrs.hasMore();) {
+                       attributes: for (NamingEnumeration<? extends Attribute> attrs = attributes.getAll(); attrs.hasMore();) {
                                Attribute attribute = attrs.next();
-                               if (attribute.getID().equals(LdapAttrs.DN) || attribute.getID().equals("objectClass"))
-                                       continue;// skip DN attribute
+                               if (attribute.getID().equals(DN) || attribute.getID().equals(objectClass.name()))
+                                       continue attributes;// skip DN attribute
+                               if (attribute.getID().equals(member.name()) || attribute.getID().equals(uniqueMember.name()))
+                                       continue attributes;// skip member and uniqueMember attributes, so that they are always written last
                                writeAttribute(attribute);
                        }
+                       // write member and uniqueMember attributes last
+                       for (NamingEnumeration<? extends Attribute> attrs = attributes.getAll(); attrs.hasMore();) {
+                               Attribute attribute = attrs.next();
+                               if (attribute.getID().equals(member.name()) || attribute.getID().equals(uniqueMember.name()))
+                                       writeMemberAttribute(attribute);
+                       }
                        writer.append('\n');
                        writer.flush();
                } catch (NamingException e) {
@@ -66,10 +84,23 @@ public class LdifWriter {
                        Object value = attrValues.next();
                        if (value instanceof byte[]) {
                                String encoded = Base64.getEncoder().encodeToString((byte[]) value);
-                               writer.append(attribute.getID()).append("::").append(encoded).append('\n');
+                               writer.append(attribute.getID()).append(":: ").append(encoded).append('\n');
                        } else {
-                               writer.append(attribute.getID()).append(':').append(value.toString()).append('\n');
+                               writer.append(attribute.getID()).append(": ").append(value.toString()).append('\n');
                        }
                }
        }
+
+       protected void writeMemberAttribute(Attribute attribute) throws NamingException, IOException {
+               // Note: duplicate entries will be swallowed
+               SortedSet<String> values = new TreeSet<>();
+               for (NamingEnumeration<?> attrValues = attribute.getAll(); attrValues.hasMore();) {
+                       String value = attrValues.next().toString();
+                       values.add(value);
+               }
+
+               for (String value : values) {
+                       writer.append(attribute.getID()).append(": ").append(value).append('\n');
+               }
+       }
 }