From d14c6a5277377f7da8b667a82cbac2eec88a5b72 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 17 Feb 2022 08:39:26 +0100 Subject: [PATCH] Make LdapAttr a String supplier --- .../src/org/argeo/util/naming/LdapAttrs.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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..43cfe03b4 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 { /** */ uid("0.9.2342.19200300.100.1.1", "RFC 4519"), /** */ @@ -315,11 +317,17 @@ public enum LdapAttrs implements SpecifiedName { return "ldap"; } + @Deprecated public String property() { - return qualified(); + return get(); } + @Deprecated public String qualified() { + return get(); + } + + public String get() { String prefix = getPrefix(); return prefix != null ? prefix + ":" + name() : name(); } -- 2.30.2