From 9defd2349274d077ad120d780a6fac5f6d594c7f Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 22 May 2015 15:58:46 +0000
Subject: [PATCH] OPENDJ-1631 CR-6864 Migrate server to SDK syntaxes
---
opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java | 142 +++--------------------------------------------
1 files changed, 9 insertions(+), 133 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java
index f79500e..8d15d34 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanSyntax.java
@@ -26,20 +26,15 @@
*/
package org.opends.server.schema;
-import org.forgerock.i18n.LocalizableMessageBuilder;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.forgerock.opendj.config.server.ConfigException;
-import org.forgerock.opendj.ldap.ByteSequence;
-import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.admin.std.server.AttributeSyntaxCfg;
-import org.forgerock.opendj.ldap.schema.MatchingRule;
-import org.opends.server.api.AttributeSyntax;
-import org.opends.server.core.DirectoryServer;
-import org.opends.server.util.ServerConstants;
-
-import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.schema.Schema;
+import org.forgerock.opendj.ldap.schema.Syntax;
+import org.opends.server.admin.std.server.AttributeSyntaxCfg;
+import org.opends.server.api.AttributeSyntax;
+import org.opends.server.util.ServerConstants;
+
/**
* This class defines the Boolean attribute syntax, which only allows values of
* "TRUE" or "FALSE" (although this implementation is more flexible and will
@@ -51,11 +46,6 @@
extends AttributeSyntax<AttributeSyntaxCfg>
{
- private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
- /** The default equality matching rule for this syntax. */
- private MatchingRule defaultEqualityMatchingRule;
-
/**
* Creates a new instance of this syntax. Note that the only thing that
* should be done here is to invoke the default constructor for the
@@ -69,15 +59,9 @@
/** {@inheritDoc} */
@Override
- public void initializeSyntax(AttributeSyntaxCfg configuration)
- throws ConfigException
+ public Syntax getSDKSyntax(Schema schema)
{
- defaultEqualityMatchingRule =
- DirectoryServer.getMatchingRule(EMR_BOOLEAN_OID);
- if (defaultEqualityMatchingRule == null)
- {
- logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_BOOLEAN_OID, SYNTAX_BOOLEAN_NAME);
- }
+ return schema.getSyntax(SchemaConstants.SYNTAX_BOOLEAN_OID);
}
/**
@@ -114,100 +98,6 @@
}
/**
- * Retrieves the default equality matching rule that will be used for
- * attributes with this syntax.
- *
- * @return The default equality matching rule that will be used for
- * attributes with this syntax, or <CODE>null</CODE> if equality
- * matches will not be allowed for this type by default.
- */
- @Override
- public MatchingRule getEqualityMatchingRule()
- {
- return defaultEqualityMatchingRule;
- }
-
- /**
- * Retrieves the default ordering matching rule that will be used for
- * attributes with this syntax.
- *
- * @return The default ordering matching rule that will be used for
- * attributes with this syntax, or <CODE>null</CODE> if ordering
- * matches will not be allowed for this type by default.
- */
- @Override
- public MatchingRule getOrderingMatchingRule()
- {
- // Ordering matches are not allowed by default.
- return null;
- }
-
- /**
- * Retrieves the default substring matching rule that will be used for
- * attributes with this syntax.
- *
- * @return The default substring matching rule that will be used for
- * attributes with this syntax, or <CODE>null</CODE> if substring
- * matches will not be allowed for this type by default.
- */
- @Override
- public MatchingRule getSubstringMatchingRule()
- {
- // Substring matches are not allowed by default.
- return null;
- }
-
- /**
- * Retrieves the default approximate matching rule that will be used for
- * attributes with this syntax.
- *
- * @return The default approximate matching rule that will be used for
- * attributes with this syntax, or <CODE>null</CODE> if approximate
- * matches will not be allowed for this type by default.
- */
- @Override
- public MatchingRule getApproximateMatchingRule()
- {
- // Approximate matches are not allowed by default.
- return null;
- }
-
- /**
- * Indicates whether the provided value is acceptable for use in an attribute
- * with this syntax. If it is not, then the reason may be appended to the
- * provided buffer.
- *
- * @param value The value for which to make the determination.
- * @param invalidReason The buffer to which the invalid reason should be
- * appended.
- *
- * @return <CODE>true</CODE> if the provided value is acceptable for use with
- * this syntax, or <CODE>false</CODE> if not.
- */
- @Override
- public boolean valueIsAcceptable(ByteSequence value,
- LocalizableMessageBuilder invalidReason)
- {
- String valueString = value.toString().toUpperCase();
-
- boolean returnValue = (valueString.equals("TRUE") ||
- valueString.equals("YES") ||
- valueString.equals("ON") ||
- valueString.equals("1") ||
- valueString.equals("FALSE") ||
- valueString.equals("NO") ||
- valueString.equals("OFF") ||
- valueString.equals("0"));
-
- if (! returnValue)
- {
- invalidReason.append(WARN_ATTR_SYNTAX_ILLEGAL_BOOLEAN.get(value));
- }
-
- return returnValue;
- }
-
- /**
* Retrieves an attribute value containing a representation of the provided
* boolean value.
*
@@ -219,19 +109,5 @@
{
return b ? ServerConstants.TRUE_VALUE : ServerConstants.FALSE_VALUE;
}
-
- /** {@inheritDoc} */
- @Override
- public boolean isBEREncodingRequired()
- {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override
- public boolean isHumanReadable()
- {
- return true;
- }
}
--
Gitblit v1.10.0