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/TelephoneNumberSyntax.java | 251 ++++++++------------------------------------------
1 files changed, 40 insertions(+), 211 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSyntax.java
index 578c617..b693c57 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSyntax.java
@@ -26,25 +26,21 @@
*/
package org.opends.server.schema;
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
+import static org.opends.server.schema.SchemaConstants.*;
import java.util.List;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.ldap.Option;
+import org.forgerock.opendj.ldap.schema.Schema;
+import org.forgerock.opendj.ldap.schema.SchemaOptions;
+import org.forgerock.opendj.ldap.schema.Syntax;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.TelephoneNumberAttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
-import org.opends.server.core.DirectoryServer;
-import org.forgerock.i18n.LocalizableMessageBuilder;
-import org.forgerock.opendj.config.server.ConfigChangeResult;
-import org.forgerock.opendj.config.server.ConfigException;
-import org.forgerock.opendj.ldap.ByteSequence;
-import org.forgerock.opendj.ldap.schema.MatchingRule;
-
-import static org.opends.messages.SchemaMessages.*;
-
-import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.StaticUtils.*;
+import org.opends.server.core.ServerContext;
/**
* This class implements the telephone number attribute syntax, which is defined
@@ -59,20 +55,14 @@
implements ConfigurationChangeListener<TelephoneNumberAttributeSyntaxCfg>
{
- private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
/** Indicates whether this matching rule should operate in strict mode. */
private boolean strictMode;
- /** The default equality matching rule for this syntax. */
- private MatchingRule defaultEqualityMatchingRule;
-
- /** The default substring matching rule for this syntax. */
- private MatchingRule defaultSubstringMatchingRule;
-
/** The current configuration for this telephone number syntax. */
private TelephoneNumberAttributeSyntaxCfg currentConfig;
+ private ServerContext serverContext;
+
/**
* 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
@@ -85,23 +75,11 @@
}
/** {@inheritDoc} */
- public void initializeSyntax(TelephoneNumberAttributeSyntaxCfg configuration)
+ @Override
+ public void initializeSyntax(TelephoneNumberAttributeSyntaxCfg configuration, ServerContext serverContext)
throws ConfigException
{
- defaultEqualityMatchingRule =
- DirectoryServer.getMatchingRule(EMR_TELEPHONE_OID);
- if (defaultEqualityMatchingRule == null)
- {
- logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_TELEPHONE_OID, SYNTAX_TELEPHONE_NAME);
- }
-
- defaultSubstringMatchingRule =
- DirectoryServer.getMatchingRule(SMR_TELEPHONE_OID);
- if (defaultSubstringMatchingRule == null)
- {
- logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_TELEPHONE_OID, SYNTAX_TELEPHONE_NAME);
- }
-
+ this.serverContext = serverContext;
// We may or may not have access to the config entry. If we do, then see if
// we should use the strict compliance mode. If not, just assume that we
@@ -112,12 +90,32 @@
currentConfig = configuration;
currentConfig.addTelephoneNumberChangeListener(this);
strictMode = currentConfig.isStrictFormat();
+ updateNewSchema();
}
}
+ /** Update the option in new schema if it changes from current value. */
+ private void updateNewSchema()
+ {
+ Option<Boolean> option = SchemaOptions.ALLOW_NON_STANDARD_TELEPHONE_NUMBERS;
+ if (strictMode == serverContext.getSchemaNG().getOption(option))
+ {
+ SchemaUpdater schemaUpdater = serverContext.getSchemaUpdater();
+ schemaUpdater.updateSchema(schemaUpdater.getSchemaBuilder().setOption(option, !strictMode).toSchema());
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public Syntax getSDKSyntax(Schema schema)
+ {
+ return schema.getSyntax(SchemaConstants.SYNTAX_TELEPHONE_OID);
+ }
+
/**
* Performs any finalization that may be necessary for this attribute syntax.
*/
+ @Override
public void finalizeSyntax()
{
currentConfig.removeTelephoneNumberChangeListener(this);
@@ -128,6 +126,7 @@
*
* @return The common name for this attribute syntax.
*/
+ @Override
public String getName()
{
return SYNTAX_TELEPHONE_NAME;
@@ -138,6 +137,7 @@
*
* @return The OID for this attribute syntax.
*/
+ @Override
public String getOID()
{
return SYNTAX_TELEPHONE_OID;
@@ -148,175 +148,14 @@
*
* @return A description for this attribute syntax.
*/
+ @Override
public String getDescription()
{
return SYNTAX_TELEPHONE_DESCRIPTION;
}
- /**
- * 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.
- */
- 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.
- */
- public MatchingRule getOrderingMatchingRule()
- {
- // There is no ordering matching rule 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.
- */
- public MatchingRule getSubstringMatchingRule()
- {
- return defaultSubstringMatchingRule;
- }
-
- /**
- * 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.
- */
- public MatchingRule getApproximateMatchingRule()
- {
- // There is no approximate matching rule 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.
- */
- public boolean valueIsAcceptable(ByteSequence value,
- LocalizableMessageBuilder invalidReason)
- {
- // No matter what, the value can't be empty or null.
- String valueStr;
- if ((value == null) ||
- ((valueStr = value.toString().trim()).length() == 0))
- {
- invalidReason.append(ERR_ATTR_SYNTAX_TELEPHONE_EMPTY.get());
- return false;
- }
-
- int length = valueStr.length();
-
-
- if (strictMode)
- {
- // If the value does not start with a plus sign, then that's not
- // acceptable.
- if (valueStr.charAt(0) != '+')
- {
- LocalizableMessage message = ERR_ATTR_SYNTAX_TELEPHONE_NO_PLUS.get(valueStr);
- invalidReason.append(message);
- return false;
- }
-
-
- // Iterate through the remaining characters in the value. There must be
- // at least one digit, and it must contain only valid digits and separator
- // characters.
- boolean digitSeen = false;
- for (int i=1; i < length; i++)
- {
- char c = valueStr.charAt(i);
- if (isDigit(c))
- {
- digitSeen = true;
- }
- else if (! isSeparator(c))
- {
- LocalizableMessage message = ERR_ATTR_SYNTAX_TELEPHONE_ILLEGAL_CHAR.get(valueStr, c, i);
- invalidReason.append(message);
- return false;
- }
- }
-
- if (! digitSeen)
- {
- LocalizableMessage message = ERR_ATTR_SYNTAX_TELEPHONE_NO_DIGITS.get(valueStr);
- invalidReason.append(message);
- return false;
- }
-
-
- // If we've gotten here, then we'll consider it acceptable.
- return true;
- }
- else
- {
- // If we are not in strict mode, then all non-empty values containing at
- // least one digit will be acceptable.
- for (int i=0; i < length; i++)
- {
- if (isDigit(valueStr.charAt(i)))
- {
- return true;
- }
- }
-
- // If we made it here, then we didn't find any digits.
- LocalizableMessage message = ERR_ATTR_SYNTAX_TELEPHONE_NO_DIGITS.get(valueStr);
- invalidReason.append(message);
- return false;
- }
- }
-
- /**
- * Indicates whether the provided character is a valid separator for telephone
- * number components when operating in strict mode.
- *
- * @param c The character for which to make the determination.
- *
- * @return <CODE>true</CODE> if the provided character is a valid separator,
- * or <CODE>false</CODE> if it is not.
- */
- private boolean isSeparator(char c)
- {
- switch (c)
- {
- case ' ':
- case '-':
- return true;
- default:
- return false;
- }
- }
-
/** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
TelephoneNumberAttributeSyntaxCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -326,25 +165,15 @@
}
/** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
TelephoneNumberAttributeSyntaxCfg configuration)
{
currentConfig = configuration;
strictMode = configuration.isStrictFormat();
+ updateNewSchema();
return new ConfigChangeResult();
}
-
- /** {@inheritDoc} */
- public boolean isBEREncodingRequired()
- {
- return false;
- }
-
- /** {@inheritDoc} */
- public boolean isHumanReadable()
- {
- return true;
- }
}
--
Gitblit v1.10.0