X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.util%2Fsrc%2Forg%2Fargeo%2Futil%2Fnaming%2FLdapAttrs.java;h=2d35e6d94fdc7b3d6f9e6d3164971e00df7ccd35;hb=bbfad683e435f1989cb7ed4aa56a2fed52b64245;hp=43cfe03b4cc76d7bd1b6223f698a43f8eaaa4141;hpb=d14c6a5277377f7da8b667a82cbac2eec88a5b72;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.util/src/org/argeo/util/naming/LdapAttrs.java b/org.argeo.util/src/org/argeo/util/naming/LdapAttrs.java index 43cfe03b4..2d35e6d94 100644 --- a/org.argeo.util/src/org/argeo/util/naming/LdapAttrs.java +++ b/org.argeo.util/src/org/argeo/util/naming/LdapAttrs.java @@ -2,6 +2,10 @@ package org.argeo.util.naming; import java.util.function.Supplier; +import javax.xml.namespace.QName; + +import org.argeo.util.internal.DisplayQName; + /** * Standard LDAP attributes as per:
* - Standard LDAP
@@ -293,10 +297,16 @@ public enum LdapAttrs implements SpecifiedName, Supplier { // private final static String LDAP_ = "ldap:"; private final String oid, spec; + private final QName value; LdapAttrs(String oid, String spec) { this.oid = oid; this.spec = spec; + this.value = new DisplayQName(LdapObjs.LDAP_NAMESPACE_URI, name(), LdapObjs.LDAP_DEFAULT_PREFIX); + } + + public QName qName() { + return value; } @Override @@ -309,14 +319,6 @@ public enum LdapAttrs implements SpecifiedName, Supplier { return spec; } - public String getPrefix() { - return prefix(); - } - - public static String prefix() { - return "ldap"; - } - @Deprecated public String property() { return get(); @@ -327,17 +329,9 @@ public enum LdapAttrs implements SpecifiedName, Supplier { return get(); } + @Override public String get() { - String prefix = getPrefix(); - return prefix != null ? prefix + ":" + name() : name(); - } - - public String getNamespace() { - return namespace(); - } - - public static String namespace() { - return "http://www.argeo.org/ns/ldap"; + return LdapObjs.LDAP_DEFAULT_PREFIX + ":" + name(); } @Override