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 dc266998db5cb9d3612f9ae44b53d6a1e87cf0c5..cfabeb7d6e9a4905af87c32f230534b819656caa 100644 (file)
--- 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 (file)
index a80e5b5..0000000
--- 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 (file)
index 0000000..419f74e
--- /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();
+       }
+}