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/CountryStringSyntax.java | 212 ++++++++++------------------------------------------
1 files changed, 42 insertions(+), 170 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CountryStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CountryStringSyntax.java
index dd9bd9d..f2d1ada 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CountryStringSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CountryStringSyntax.java
@@ -28,22 +28,21 @@
package org.opends.server.schema;
-import java.util.List;
-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.CountryStringAttributeSyntaxCfg;
-import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.opends.server.api.AttributeSyntax;
-import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.core.DirectoryServer;
-import org.forgerock.opendj.ldap.ByteSequence;
-import org.forgerock.opendj.config.server.ConfigChangeResult;
-import static org.opends.messages.SchemaMessages.*;
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.LocalizableMessageBuilder;
-import static org.opends.server.schema.PrintableString.*;
-import static org.opends.server.schema.SchemaConstants.*;
+import org.opends.server.core.ServerContext;
/**
* This class defines the country string attribute syntax, which should be a
@@ -56,23 +55,11 @@
implements ConfigurationChangeListener<CountryStringAttributeSyntaxCfg>
{
- private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
- /** The default approximate matching rule for this syntax. */
- private MatchingRule defaultApproximateMatchingRule;
-
- /** The default equality matching rule for this syntax. */
- private MatchingRule defaultEqualityMatchingRule;
-
- /** The default ordering matching rule for this syntax. */
- private MatchingRule defaultOrderingMatchingRule;
-
- /** The default substring matching rule for this syntax. */
- private MatchingRule defaultSubstringMatchingRule;
-
/** The current configuration. */
private volatile CountryStringAttributeSyntaxCfg config;
+ 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,46 +72,37 @@
}
/** {@inheritDoc} */
- public void initializeSyntax(CountryStringAttributeSyntaxCfg configuration)
+ @Override
+ public void initializeSyntax(CountryStringAttributeSyntaxCfg configuration, ServerContext serverContext)
throws ConfigException
{
- defaultApproximateMatchingRule =
- DirectoryServer.getMatchingRule(AMR_DOUBLE_METAPHONE_OID);
- if (defaultApproximateMatchingRule == null)
- {
- logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE,
- AMR_DOUBLE_METAPHONE_OID, SYNTAX_COUNTRY_STRING_NAME);
- }
-
- defaultEqualityMatchingRule =
- DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
- if (defaultEqualityMatchingRule == null)
- {
- logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
- EMR_CASE_IGNORE_OID, SYNTAX_COUNTRY_STRING_NAME);
- }
-
- defaultOrderingMatchingRule =
- DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
- if (defaultOrderingMatchingRule == null)
- {
- logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
- OMR_CASE_IGNORE_OID, SYNTAX_COUNTRY_STRING_NAME);
- }
-
- defaultSubstringMatchingRule =
- DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
- if (defaultSubstringMatchingRule == null)
- {
- logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
- SMR_CASE_IGNORE_OID, SYNTAX_COUNTRY_STRING_NAME);
- }
-
this.config = configuration;
+ this.serverContext = serverContext;
+ updateNewSchema();
config.addCountryStringChangeListener(this);
}
+ /** Update the option in new schema if it changes from current value. */
+ private void updateNewSchema()
+ {
+ Option<Boolean> option = SchemaOptions.STRICT_FORMAT_FOR_COUNTRY_STRINGS;
+ if (config.isStrictFormat() != serverContext.getSchemaNG().getOption(option))
+ {
+ SchemaUpdater schemaUpdater = serverContext.getSchemaUpdater();
+ schemaUpdater.updateSchema(
+ schemaUpdater.getSchemaBuilder().setOption(option, config.isStrictFormat()).toSchema());
+ }
+ }
+
/** {@inheritDoc} */
+ @Override
+ public Syntax getSDKSyntax(Schema schema)
+ {
+ return schema.getSyntax(SchemaConstants.SYNTAX_COUNTRY_STRING_OID);
+ }
+
+ /** {@inheritDoc} */
+ @Override
public boolean isConfigurationChangeAcceptable(
CountryStringAttributeSyntaxCfg configuration,
List<LocalizableMessage> unacceptableReasons)
@@ -134,10 +112,12 @@
}
/** {@inheritDoc} */
+ @Override
public ConfigChangeResult applyConfigurationChange(
CountryStringAttributeSyntaxCfg configuration)
{
this.config = configuration;
+ updateNewSchema();
return new ConfigChangeResult();
}
@@ -149,6 +129,7 @@
*
* @return The common name for this attribute syntax.
*/
+ @Override
public String getName()
{
return SYNTAX_COUNTRY_STRING_NAME;
@@ -159,6 +140,7 @@
*
* @return The OID for this attribute syntax.
*/
+ @Override
public String getOID()
{
return SYNTAX_COUNTRY_STRING_OID;
@@ -169,120 +151,10 @@
*
* @return A description for this attribute syntax.
*/
+ @Override
public String getDescription()
{
return SYNTAX_COUNTRY_STRING_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()
- {
- return defaultOrderingMatchingRule;
- }
-
- /**
- * 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()
- {
- return defaultApproximateMatchingRule;
- }
-
- /**
- * 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)
- {
- String stringValue = value.toString();
- if (stringValue.length() != 2)
- {
- invalidReason.append(
- ERR_ATTR_SYNTAX_COUNTRY_STRING_INVALID_LENGTH.get(stringValue));
- return false;
- }
-
- if (config.isStrictFormat())
- {
- // Check for a string containing [A-Z][A-Z]
- if (stringValue.charAt(0) < 'A' || stringValue.charAt(0) > 'Z' ||
- stringValue.charAt(1) < 'A' || stringValue.charAt(1) > 'Z')
- {
- invalidReason.append(ERR_ATTR_SYNTAX_COUNTRY_NO_VALID_ISO_CODE.get(value));
- return false;
- }
- }
- else
- {
- // Just validate as string containing 2 printable characters
- if ((! isPrintableCharacter(stringValue.charAt(0))) ||
- (! isPrintableCharacter(stringValue.charAt(1))))
- {
- invalidReason.append(
- ERR_ATTR_SYNTAX_COUNTRY_STRING_NOT_PRINTABLE.get(stringValue));
- return false;
- }
- }
- return true;
- }
-
- /** {@inheritDoc} */
- public boolean isBEREncodingRequired()
- {
- return false;
- }
-
- /** {@inheritDoc} */
- public boolean isHumanReadable()
- {
- return true;
- }
}
--
Gitblit v1.10.0