X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.util%2Fsrc%2Forg%2Fargeo%2Futil%2Fnaming%2FLdapAttrs.java;h=5253579e428313db8b1883c681e800fab6d5aec2;hb=336930c69f0cd3e1242e518479624c6366541275;hp=7dcba0992b85f15e37e4f2be0a054b0f6455ece9;hpb=b71546ddc74d6ca49d252806aafd491c75dfe1fb;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 7dcba0992..5253579e4 100644
--- a/org.argeo.util/src/org/argeo/util/naming/LdapAttrs.java
+++ b/org.argeo.util/src/org/argeo/util/naming/LdapAttrs.java
@@ -1,5 +1,7 @@
package org.argeo.util.naming;
+import java.util.function.Supplier;
+
/**
* Standard LDAP attributes as per:
* - Standard LDAP
@@ -7,7 +9,7 @@ package org.argeo.util.naming;
* "https://github.com/krb5/krb5/blob/master/src/plugins/kdb/ldap/libkdb_ldap/kerberos.schema">Kerberos
* LDAP (partial)
*/
-public enum LdapAttrs implements SpecifiedName {
+public enum LdapAttrs implements SpecifiedName, Supplier, QNamed {
/** */
uid("0.9.2342.19200300.100.1.1", "RFC 4519"),
/** */
@@ -307,29 +309,29 @@ public enum LdapAttrs implements SpecifiedName {
return spec;
}
- public String getPrefix() {
- return prefix();
- }
-
- public static String prefix() {
- return "ldap";
- }
-
+ @Deprecated
public String property() {
- return qualified();
+ return get();
}
+ @Deprecated
public String qualified() {
- String prefix = getPrefix();
+ return get();
+ }
+
+ public String get() {
+ String prefix = getDefaultPrefix();
return prefix != null ? prefix + ":" + name() : name();
}
- public String getNamespace() {
- return namespace();
+ @Override
+ public String getDefaultPrefix() {
+ return LdapObjs.LDAP_DEFAULT_PREFIX;
}
- public static String namespace() {
- return "http://www.argeo.org/ns/ldap";
+ @Override
+ public String getNamespace() {
+ return LdapObjs.LDAP_NAMESPACE_URI;
}
@Override