(PR-201) Removed all matching rule factories when matching rules are part o...

Jean-Noël Rouvignac

22.42.2015 c2eaf97f09d246d92b8259687472304c5bab695c

(PR-201) Removed all matching rule factories when matching rules are part of the core schema Only left CollationMatchingRuleFactory in order to fix OPENDJ-2638

CollationMatchingRuleFactory.java: Code cleanup

 opendj-server-legacy/resource/config/config.ldif

@@ -21,7 +21,7 @@
#
#      Copyright 2006-2010 Sun Microsystems, Inc.
#      Portions Copyright 2012-2014 Manuel Gaupp
#      Portions Copyright 2010-2015 ForgeRock AS.
#      Portions Copyright 2010-2016 ForgeRock AS.
#      Portions copyright 2015 Edan Idzerda
#
#
@@ -772,134 +772,6 @@
ds-cfg-java-class: org.opends.server.schema.AuthPasswordEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Auth Password Exact Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Auth Password Exact Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.AuthPasswordExactEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Bit String Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Bit String Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.BitStringEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Boolean Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Boolean Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.BooleanEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Case Exact Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Case Exact Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.CaseExactEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Case Exact Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-ordering-matching-rule
cn: Case Exact Ordering Matching Rule
ds-cfg-java-class: org.opends.server.schema.CaseExactOrderingMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Case Exact Substring Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
cn: Case Exact Substring Matching Rule
ds-cfg-java-class: org.opends.server.schema.CaseExactSubstringMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Case Exact IA5 Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Case Exact IA5 Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.CaseExactIA5EqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Case Exact IA5 Substring Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
cn: Case Exact IA5 Substring Matching Rule
ds-cfg-java-class: org.opends.server.schema.CaseExactIA5SubstringMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Case Ignore Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Case Ignore Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.CaseIgnoreEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Case Ignore Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-ordering-matching-rule
cn: Case Ignore Ordering Matching Rule
ds-cfg-java-class: org.opends.server.schema.CaseIgnoreOrderingMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Case Ignore Substring Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
cn: Case Ignore Substring Matching Rule
ds-cfg-java-class: org.opends.server.schema.CaseIgnoreSubstringMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Case Ignore IA5 Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Case Ignore IA5 Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.CaseIgnoreIA5EqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Case Ignore IA5 Substring Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
cn: Case Ignore IA5 Substring Matching Rule
ds-cfg-java-class: org.opends.server.schema.CaseIgnoreIA5SubstringMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Case Ignore List Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Case Ignore List Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.CaseIgnoreListEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Case Ignore List Substring Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
cn: Case Ignore List Substring Matching Rule
ds-cfg-java-class: org.opends.server.schema.CaseIgnoreListSubstringMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Certificate Exact Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Certificate Exact Matching Rule
ds-cfg-java-class: org.opends.server.schema.CertificateExactMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Collation Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
@@ -1073,46 +945,6 @@
#ds-cfg-collation: zh-SG:1.3.6.1.4.1.42.2.27.9.4.147.1
ds-cfg-collation: zh-TW:1.3.6.1.4.1.42.2.27.9.4.148.1

dn: cn=Directory String First Component Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Directory String First Component Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.DirectoryStringFirstComponentEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Distinguished Name Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Distinguished Name Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.DistinguishedNameEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Double Metaphone Approximate Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-approximate-matching-rule
cn: Double Metaphone Approximate Matching Rule
ds-cfg-java-class: org.opends.server.schema.DoubleMetaphoneApproximateMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Generalized Time Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Generalized Time Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.GeneralizedTimeEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Generalized Time Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-ordering-matching-rule
cn: Generalized Time Ordering Matching Rule
ds-cfg-java-class: org.opends.server.schema.GeneralizedTimeOrderingMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Historical CSN Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-ordering-matching-rule
objectClass: top
@@ -1121,150 +953,6 @@
ds-cfg-enabled: true
cn: Historical CSN Ordering Matching Rule

dn: cn=Integer Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Integer Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.IntegerEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Integer Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-ordering-matching-rule
cn: Integer Ordering Matching Rule
ds-cfg-java-class: org.opends.server.schema.IntegerOrderingMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Integer First Component Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Integer First Component Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.IntegerFirstComponentEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Keyword Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Keyword Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.KeywordEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Numeric String Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Numeric String Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.NumericStringEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Numeric String Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-ordering-matching-rule
cn: Numeric String Ordering Matching Rule
ds-cfg-java-class: org.opends.server.schema.NumericStringOrderingMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Numeric String Substring Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
cn: Numeric String Substring Matching Rule
ds-cfg-java-class: org.opends.server.schema.NumericStringSubstringMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Object Identifier Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Object Identifier Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.ObjectIdentifierEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Object Identifier First Component Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Object Identifier First Component Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.ObjectIdentifierFirstComponentEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Octet String Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Octet String Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.OctetStringEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Octet String Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-ordering-matching-rule
cn: Octet String Ordering Matching Rule
ds-cfg-java-class: org.opends.server.schema.OctetStringOrderingMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Octet String Substring Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
cn: Octet String Substring Matching Rule
ds-cfg-java-class: org.opends.server.schema.OctetStringSubstringMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Presentation Address Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Presentation Address Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.PresentationAddressEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Protocol Information Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Protocol Information Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.ProtocolInformationEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Telephone Number Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Telephone Number Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.TelephoneNumberEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Telephone Number Substring Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
cn: Telephone Number Substring Matching Rule
ds-cfg-java-class: org.opends.server.schema.TelephoneNumberSubstringMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Time Based Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-extensible-matching-rule
cn: Time Based Matching Rule
ds-cfg-java-class: org.opends.server.schema.TimeBasedMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Unique Member Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Unique Member Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.UniqueMemberEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=User Password Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
@@ -1273,38 +961,6 @@
ds-cfg-java-class: org.opends.server.schema.UserPasswordEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=User Password Exact Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: User Password Exact Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.UserPasswordExactEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=UUID Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: UUID Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.UUIDEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=UUID Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-ordering-matching-rule
cn: UUID Ordering Matching Rule
ds-cfg-java-class: org.opends.server.schema.UUIDOrderingMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Word Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Word Equality Matching Rule
ds-cfg-java-class: org.opends.server.schema.WordEqualityMatchingRuleFactory
ds-cfg-enabled: true

dn: cn=Monitor Providers,cn=config
objectClass: top
objectClass: ds-cfg-branch

 opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java

@@ -50,12 +50,10 @@
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.schema.CollationMatchingRuleFactory;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
import org.opends.server.types.MatchingRuleUse;
import org.opends.server.types.Schema;

/**
 * This class defines a utility that will be used to manage the set of matching
@@ -137,13 +135,8 @@
          {
            for(MatchingRule matchingRule: factory.getMatchingRules())
            {
              Schema schema = serverContext.getSchema();
              // skip the matching rule registration if already defined in the (core) schema
              if (!schema.hasMatchingRule(matchingRule.getNameOrOID()))
              {
                DirectoryServer.registerMatchingRule(matchingRule, false);
              }
            }
            matchingRuleFactories.put(mrConfiguration.dn(), factory);
          }
          catch (DirectoryException de)
@@ -500,13 +493,6 @@
           propertyDefinition.loadClass(className,
                                        MatchingRuleFactory.class);
      factory = matchingRuleFactoryClass.newInstance();
      // specific behavior for collation
      // in order to avoid useless injection of context server for all factories
      if (factory instanceof CollationMatchingRuleFactory)
      {
        CollationMatchingRuleFactory collationFactory = (CollationMatchingRuleFactory) factory;
        collationFactory.setServerContext(serverContext);
      }

      if (initialize)
      {

 opendj-server-legacy/src/main/java/org/opends/server/schema/AuthPasswordExactEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/BitStringEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/BooleanEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactOrderingMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseExactSubstringMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreListSubstringMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/CertificateExactMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/CollationMatchingRuleFactory.java

@@ -26,6 +26,9 @@
 */
package org.opends.server.schema;

import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.SchemaMessages.*;

import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -45,14 +48,10 @@
import org.opends.server.admin.std.server.CollationMatchingRuleCfg;
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
import org.opends.server.util.CollectionUtils;

import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.SchemaMessages.*;

/**
 * This class is a factory class for Collation matching rules. It
 * creates different matching rules based on the configuration entries.
@@ -71,29 +70,14 @@
  /** Map of OID and the Matching Rule. */
  private final Map<String, MatchingRule> matchingRules = new HashMap<>();

  private ServerContext serverContext;


  /** Creates a new instance of CollationMatchingRuleFactory. */
  public CollationMatchingRuleFactory()
  {
    super();
  }

  /**
   * Sets the server context.
   *
   * @param serverContext
   *            The server context.
   */
  public void setServerContext(ServerContext serverContext)
  {
    this.serverContext = serverContext;
  }

  /** {@inheritDoc} */
  @Override
  public final Collection<org.forgerock.opendj.ldap.schema.MatchingRule> getMatchingRules()
  public final Collection<MatchingRule> getMatchingRules()
  {
    return Collections.unmodifiableCollection(matchingRules.values());
  }
@@ -111,15 +95,6 @@
    matchingRules.put(oid, matchingRule);
  }

  /**
   * Clears the Map containing matching Rules.
   */
  private void resetRules()
  {
    matchingRules.clear();
  }

  /** {@inheritDoc} */
  @Override
  public void initializeMatchingRule(CollationMatchingRuleCfg configuration)
      throws ConfigException, InitializationException
@@ -172,7 +147,6 @@
    currentConfig.addCollationChangeListener(this);
  }

  /** {@inheritDoc} */
  @Override
  public void finalizeMatchingRule()
  {
@@ -180,7 +154,6 @@
    currentConfig.removeCollationChangeListener(this);
  }

  /** {@inheritDoc} */
  @Override
  public ConfigChangeResult applyConfigurationChange(
      CollationMatchingRuleCfg configuration)
@@ -199,18 +172,16 @@
    }

    // Since we have come here it means that this Factory is enabled and
    // there is a change in the CollationMatchingRuleFactory's
    // configuration.
    // there is a change in the CollationMatchingRuleFactory's configuration.
    // Deregister all the Matching Rule corresponding to this factory.
    for (MatchingRule rule : getMatchingRules())
    {
      DirectoryServer.deregisterMatchingRule(rule);
    }

    // Clear the associated matching rules.
    resetRules();
    matchingRules.clear();

    final Schema schema = serverContext.getSchemaNG();
    final Schema schema = DirectoryServer.getSchema().getSchemaNG();
    for (String collation : configuration.getCollation())
    {
      // validation has already been performed in isConfigurationChangeAcceptable()
@@ -237,7 +208,6 @@
    return ccr;
  }

  /** {@inheritDoc} */
  @Override
  public boolean isConfigurationChangeAcceptable(
      CollationMatchingRuleCfg configuration,
@@ -245,15 +215,14 @@
  {
    boolean configAcceptable = true;

    // If the new configuration disables this factory, don't do
    // anything.
    // If the new configuration disables this factory, don't do anything.
    if (!configuration.isEnabled())
    {
      return configAcceptable;
    }

    // If it comes here we don't need to verify MatchingRuleType; it
    // should be okay as its syntax is verified by the admin framework.
    // If it comes here we don't need to verify MatchingRuleType;
    // it should be okay as its syntax is verified by the admin framework.
    // Iterate over the collations and verify if the format is okay.
    // Also, verify if the locale is allowed by the JVM.
    for (String collation : configuration.getCollation())
@@ -283,7 +252,6 @@
    return configAcceptable;
  }


  /**
   * Verifies if the locale is supported by the JVM.
   *
@@ -329,10 +297,7 @@
    return locale;
  }

  /**
   * A utility class for extracting the OID and Language Tag from the
   * configuration entry.
   */
  /** A utility class for extracting the OID and Language Tag from the configuration entry. */
  private final class CollationMapper
  {
    /** OID of the collation rule. */

 opendj-server-legacy/src/main/java/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/IntegerOrderingMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/KeywordEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringOrderingMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSubstringMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringOrderingMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/OctetStringSubstringMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/PresentationAddressEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/TelephoneNumberSubstringMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/TimeBasedMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/UUIDOrderingMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/UniqueMemberEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/UserPasswordExactEqualityMatchingRuleFactory.java

File was deleted

 opendj-server-legacy/src/main/java/org/opends/server/schema/WordEqualityMatchingRuleFactory.java

File was deleted