From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 2 Nov 2020 04:29:47 +0000 (+0100)
Subject: Move qualified name to JCR bundle
X-Git-Tag: argeo-commons-2.1.89~42
X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=acd95d23e5b4ec4ac6016c241477759600a0a71a

Move qualified name to JCR bundle
---

diff --git a/org.argeo.enterprise/src/org/argeo/naming/LdapAttrs.java b/org.argeo.enterprise/src/org/argeo/naming/LdapAttrs.java
index dc266998d..cfabeb7d6 100644
--- a/org.argeo.enterprise/src/org/argeo/naming/LdapAttrs.java
+++ b/org.argeo.enterprise/src/org/argeo/naming/LdapAttrs.java
@@ -7,7 +7,7 @@ package org.argeo.naming;
  * "https://github.com/krb5/krb5/blob/master/src/plugins/kdb/ldap/libkdb_ldap/kerberos.schema">Kerberos
  * LDAP (partial)</a>
  */
-public enum LdapAttrs implements SpecifiedName, QualifiedName {
+public enum LdapAttrs implements SpecifiedName {
 	/** */
 	uid("0.9.2342.19200300.100.1.1", "RFC 4519"),
 	/** */
@@ -307,7 +307,6 @@ public enum LdapAttrs implements SpecifiedName, QualifiedName {
 		return spec;
 	}
 
-	@Override
 	public String getPrefix() {
 		return prefix();
 	}
@@ -316,7 +315,15 @@ public enum LdapAttrs implements SpecifiedName, QualifiedName {
 		return "ldap";
 	}
 
-	@Override
+	public String property() {
+		return qualified();
+	}
+
+	public String qualified() {
+		String prefix = getPrefix();
+		return prefix != null ? prefix + ":" + name() : name();
+	}
+
 	public String getNamespace() {
 		return namespace();
 	}
diff --git a/org.argeo.enterprise/src/org/argeo/naming/QualifiedName.java b/org.argeo.enterprise/src/org/argeo/naming/QualifiedName.java
deleted file mode 100644
index a80e5b5f4..000000000
--- a/org.argeo.enterprise/src/org/argeo/naming/QualifiedName.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.argeo.naming;
-
-/** Can be applied to {@link Enum}s in order to generate prefixed names. */
-public interface QualifiedName {
-	String name();
-
-	default String getPrefix() {
-		return null;
-	}
-
-	default String getNamespace() {
-		return null;
-	}
-
-	default String property() {
-		return qualified();
-	}
-
-	default String qualified() {
-		String prefix = getPrefix();
-		return prefix != null ? prefix + ":" + name() : name();
-	}
-
-	default String withNamespace() {
-		String namespace = getNamespace();
-		if (namespace == null)
-			throw new UnsupportedOperationException("No namespace is specified for " + getClass());
-		return "{" + namespace + "}" + name();
-	}
-}
diff --git a/org.argeo.jcr/src/org/argeo/jcr/QualifiedName.java b/org.argeo.jcr/src/org/argeo/jcr/QualifiedName.java
new file mode 100644
index 000000000..419f74e1c
--- /dev/null
+++ b/org.argeo.jcr/src/org/argeo/jcr/QualifiedName.java
@@ -0,0 +1,26 @@
+package org.argeo.jcr;
+
+/** Can be applied to {@link Enum}s in order to generate prefixed names. */
+public interface QualifiedName {
+	String name();
+
+	default String getPrefix() {
+		return null;
+	}
+
+	default String getNamespace() {
+		return null;
+	}
+
+	default String qualified() {
+		String prefix = getPrefix();
+		return prefix != null ? prefix + ":" + name() : name();
+	}
+
+	default String withNamespace() {
+		String namespace = getNamespace();
+		if (namespace == null)
+			throw new UnsupportedOperationException("No namespace is specified for " + getClass());
+		return "{" + namespace + "}" + name();
+	}
+}