From dd9c5d6a0520fec68fa12485a4da033f84840930 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 14 Feb 2014 09:30:43 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java | 48 +++++++++++++++---------------------------------
1 files changed, 15 insertions(+), 33 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
index ac542d2..51bdc54 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
@@ -32,6 +32,8 @@
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.schema.Schema;
+import org.forgerock.opendj.ldap.schema.Syntax;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DirectoryException;
@@ -54,22 +56,6 @@
* {@inheritDoc}
*/
@Override
- public abstract Collection<String> getNames();
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- public abstract String getOID();
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override
public ByteString normalizeAssertionValue(ByteSequence value)
throws DirectoryException
{
@@ -93,27 +79,23 @@
return getOID();
}
-
-
/**
- * {@inheritDoc}
+ * Retrieves the OID of the syntax with which this matching rule is
+ * associated.
+ *
+ * @return The OID of the syntax with which this matching rule is
+ * associated.
*/
- @Override
- public abstract String getDescription();
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override
public abstract String getSyntaxOID();
+ /** {@inheritDoc} */
+ @Override
+ public Syntax getSyntax()
+ {
+ return Schema.getCoreSchema().getSyntax(getSyntaxOID());
+ }
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isObsolete()
{
@@ -262,7 +244,7 @@
buffer.append(" SYNTAX ");
}
- buffer.append(getSyntaxOID());
+ buffer.append(getSyntax().getOID());
buffer.append(" )");
}
}
--
Gitblit v1.10.0