From acd95d23e5b4ec4ac6016c241477759600a0a71a Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 2 Nov 2020 05:29:47 +0100
Subject: [PATCH] Move qualified name to JCR bundle

---
 .../src/org/argeo/naming/LdapAttrs.java             | 13 ++++++++++---
 .../src/org/argeo/jcr}/QualifiedName.java           |  6 +-----
 2 files changed, 11 insertions(+), 8 deletions(-)
 rename {org.argeo.enterprise/src/org/argeo/naming => org.argeo.jcr/src/org/argeo/jcr}/QualifiedName.java (87%)

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.jcr/src/org/argeo/jcr/QualifiedName.java
similarity index 87%
rename from org.argeo.enterprise/src/org/argeo/naming/QualifiedName.java
rename to org.argeo.jcr/src/org/argeo/jcr/QualifiedName.java
index a80e5b5f4..419f74e1c 100644
--- a/org.argeo.enterprise/src/org/argeo/naming/QualifiedName.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/QualifiedName.java
@@ -1,4 +1,4 @@
-package org.argeo.naming;
+package org.argeo.jcr;
 
 /** Can be applied to {@link Enum}s in order to generate prefixed names. */
 public interface QualifiedName {
@@ -12,10 +12,6 @@ public interface QualifiedName {
 		return null;
 	}
 
-	default String property() {
-		return qualified();
-	}
-
 	default String qualified() {
 		String prefix = getPrefix();
 		return prefix != null ? prefix + ":" + name() : name();
-- 
2.30.2