From 49f6afbeca398fb7a68d3a21c7910f61f4ed21b8 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 07 Nov 2014 15:28:51 +0000
Subject: [PATCH] OPENDJ-1591 CR-5092 Remove getXXMatchingRule(String) methods in DirectoryServer
---
opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortRequestControl.java | 5
opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/types/DirectoryConfig.java | 8
opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java | 8
opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java | 8
opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java | 8
opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java | 9 -
opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java | 8
opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java | 8
opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java | 22 +--
opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java | 59 ---------
opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java | 6
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java | 3
opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java | 8
opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java | 6
opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java | 8
51 files changed, 145 insertions(+), 211 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortRequestControl.java b/opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortRequestControl.java
index 2972592..25af705 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortRequestControl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/controls/ServerSideSortRequestControl.java
@@ -129,7 +129,7 @@
String orderingRuleID =
toLowerCase(reader.readOctetStringAsString());
orderingRule =
- DirectoryServer.getOrderingMatchingRule(orderingRuleID);
+ DirectoryServer.getMatchingRule(orderingRuleID);
if (orderingRule == null)
{
LocalizableMessage message =
@@ -459,8 +459,7 @@
if(decodedKey[1] != null)
{
orderingRule =
- DirectoryServer.getOrderingMatchingRule(
- decodedKey[1].toLowerCase());
+ DirectoryServer.getMatchingRule(decodedKey[1].toLowerCase());
if (orderingRule == null)
{
LocalizableMessage message =
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
index 0dd4eec..575cdde 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
@@ -2715,8 +2715,6 @@
overwriteExisting);
}
-
-
/**
* Deregisters the provided matching rule with the Directory Server.
*
@@ -2728,63 +2726,6 @@
}
/**
- * Retrieves the approximate matching rule with the specified name or OID.
- *
- * @param lowerName The lowercase name or OID for the approximate matching
- * rule to retrieve.
- *
- * @return The requested approximate matching rule, or <CODE>null</CODE> if
- * no such matching rule has been defined in the server.
- */
- public static MatchingRule
- getApproximateMatchingRule(String lowerName)
- {
- return directoryServer.schema.getMatchingRule(lowerName);
- }
-
- /**
- * Retrieves the equality matching rule with the specified name or OID.
- *
- * @param lowerName The lowercase name or OID for the equality matching rule
- * to retrieve.
- *
- * @return The requested equality matching rule, or <CODE>null</CODE> if no
- * such matching rule has been defined in the server.
- */
- public static MatchingRule getEqualityMatchingRule(String lowerName)
- {
- return getMatchingRule(lowerName);
- }
-
- /**
- * Retrieves the ordering matching rule with the specified name or OID.
- *
- * @param lowerName The lowercase name or OID for the ordering matching rule
- * to retrieve.
- *
- * @return The requested ordering matching rule, or <CODE>null</CODE> if no
- * such matching rule has been defined in the server.
- */
- public static MatchingRule getOrderingMatchingRule(String lowerName)
- {
- return getMatchingRule(lowerName);
- }
-
- /**
- * Retrieves the substring matching rule with the specified name or OID.
- *
- * @param lowerName The lowercase name or OID for the substring matching
- * rule to retrieve.
- *
- * @return The requested substring matching rule, or <CODE>null</CODE> if no
- * such matching rule has been defined in the server.
- */
- public static MatchingRule getSubstringMatchingRule(String lowerName)
- {
- return getMatchingRule(lowerName);
- }
-
- /**
* Retrieves the set of objectclasses defined in the Directory Server.
*
* @return The set of objectclasses defined in the Directory Server.
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java
index f8fd85c..34ffd4f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java
@@ -89,7 +89,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_IA5_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_IA5_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_IGNORE_IA5_OID, SYNTAX_ACI_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java
index 2c71416..b8f0dcc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java
@@ -106,7 +106,7 @@
throws ConfigException, InitializationException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
@@ -115,7 +115,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
@@ -124,7 +124,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java
index 872e737..c9e12c6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java
@@ -83,7 +83,7 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_AUTH_PASSWORD_EXACT_OID);
+ DirectoryServer.getMatchingRule(EMR_AUTH_PASSWORD_EXACT_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java
index 6692ab8..b97e8ef 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java
@@ -80,21 +80,21 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_OCTET_STRING_OID, SYNTAX_BINARY_NAME);
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_OCTET_STRING_OID, SYNTAX_BINARY_NAME);
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_OCTET_STRING_OID, SYNTAX_BINARY_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java
index 1f45d0c..342997d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java
@@ -79,7 +79,7 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_BIT_STRING_OID);
+ DirectoryServer.getMatchingRule(EMR_BIT_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_BIT_STRING_OID, SYNTAX_BIT_STRING_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java
index cf83cfe..a42341a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java
@@ -79,7 +79,7 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_BOOLEAN_OID);
+ DirectoryServer.getMatchingRule(EMR_BOOLEAN_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_BOOLEAN_OID, SYNTAX_BOOLEAN_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java
index e9fc754..fda59b0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java
@@ -84,7 +84,7 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -92,7 +92,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
@@ -100,7 +100,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java
index 0bcef24..ad2d47c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java
@@ -85,21 +85,21 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_OCTET_STRING_OID, SYNTAX_CERTLIST_NAME);
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_OCTET_STRING_OID, SYNTAX_CERTLIST_NAME);
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_OCTET_STRING_OID, SYNTAX_CERTLIST_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java
index 6f3bb83..a47961f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java
@@ -85,21 +85,21 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_OCTET_STRING_OID, SYNTAX_CERTPAIR_NAME);
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_OCTET_STRING_OID, SYNTAX_CERTPAIR_NAME);
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_OCTET_STRING_OID, SYNTAX_CERTPAIR_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java
index c27a039..55eec38 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java
@@ -99,7 +99,7 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CERTIFICATE_EXACT_OID);
+ DirectoryServer.getMatchingRule(EMR_CERTIFICATE_EXACT_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -107,7 +107,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
@@ -115,7 +115,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java
index aaea35f..20f9471 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java
@@ -99,7 +99,7 @@
throws ConfigException
{
defaultApproximateMatchingRule =
- DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
+ DirectoryServer.getMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE,
@@ -107,7 +107,7 @@
}
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -115,7 +115,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
@@ -123,7 +123,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java
index 5632b90..91fe73f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java
@@ -93,7 +93,7 @@
throws ConfigException, InitializationException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
@@ -102,7 +102,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
@@ -111,7 +111,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
index dfe86b5..501b87b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
@@ -95,7 +95,7 @@
throws ConfigException, InitializationException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
@@ -104,7 +104,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
@@ -113,7 +113,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
index 1aee0c9..31494d6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
@@ -134,7 +134,7 @@
}
defaultApproximateMatchingRule =
- DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
+ DirectoryServer.getMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE,
@@ -142,7 +142,7 @@
}
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -150,7 +150,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
@@ -158,7 +158,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java
index 75af9ec..e590c49 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java
@@ -97,7 +97,7 @@
throws ConfigException
{
defaultApproximateMatchingRule =
- DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
+ DirectoryServer.getMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE,
@@ -105,7 +105,7 @@
}
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -113,7 +113,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
@@ -121,7 +121,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
index e8ddfa3..d833190 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
@@ -84,14 +84,14 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_DN_OID);
+ DirectoryServer.getMatchingRule(EMR_DN_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_DN_OID, SYNTAX_DN_NAME);
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_IGNORE_OID, SYNTAX_DN_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
index de1e751..b9b4d2b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
@@ -85,7 +85,7 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -93,7 +93,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
@@ -101,7 +101,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java
index b81ad95..054c8f6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java
@@ -118,21 +118,21 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_CASE_IGNORE_OID, SYNTAX_FAXNUMBER_NAME);
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_CASE_IGNORE_OID, SYNTAX_FAXNUMBER_NAME);
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_IGNORE_OID, SYNTAX_FAXNUMBER_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java
index dd00542..bd2faa1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java
@@ -84,21 +84,21 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_OCTET_STRING_OID, SYNTAX_FAX_NAME);
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_OCTET_STRING_OID, SYNTAX_FAX_NAME);
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_OCTET_STRING_OID, SYNTAX_FAX_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
index 45712d7..9fbc675 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
@@ -102,7 +102,7 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_GENERALIZED_TIME_OID);
+ DirectoryServer.getMatchingRule(EMR_GENERALIZED_TIME_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -110,7 +110,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_GENERALIZED_TIME_OID);
+ DirectoryServer.getMatchingRule(OMR_GENERALIZED_TIME_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
@@ -118,7 +118,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java
index 025ad6c..b4ef13a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java
@@ -85,21 +85,21 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_OCTET_STRING_OID, SYNTAX_GUIDE_NAME);
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_OCTET_STRING_OID, SYNTAX_GUIDE_NAME);
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_OCTET_STRING_OID, SYNTAX_GUIDE_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java
index 1f80382..bc6e432 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java
@@ -85,7 +85,7 @@
throws ConfigException
{
defaultApproximateMatchingRule =
- DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
+ DirectoryServer.getMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE,
@@ -93,7 +93,7 @@
}
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_IA5_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_IA5_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -101,7 +101,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
@@ -109,7 +109,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_IA5_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_IA5_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java
index e163e56..e8a10ac 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java
@@ -81,21 +81,21 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_INTEGER_OID);
+ DirectoryServer.getMatchingRule(EMR_INTEGER_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_INTEGER_OID, SYNTAX_INTEGER_NAME);
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_INTEGER_OID);
+ DirectoryServer.getMatchingRule(OMR_INTEGER_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_INTEGER_OID, SYNTAX_INTEGER_NAME);
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_EXACT_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_EXACT_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_EXACT_OID, SYNTAX_INTEGER_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java
index ac62b4f..169a7f8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java
@@ -97,21 +97,21 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_OCTET_STRING_OID, SYNTAX_JPEG_NAME);
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_OCTET_STRING_OID, SYNTAX_JPEG_NAME);
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_OCTET_STRING_OID, SYNTAX_JPEG_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
index c892cfd..f94e553 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
@@ -98,21 +98,21 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_CASE_IGNORE_OID, SYNTAX_LDAP_SYNTAX_NAME);
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_CASE_IGNORE_OID, SYNTAX_LDAP_SYNTAX_NAME);
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_IGNORE_OID, SYNTAX_LDAP_SYNTAX_NAME);
@@ -1206,7 +1206,7 @@
{
//This has already been verified.
equalityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
}
return equalityMatchingRule;
}
@@ -1227,7 +1227,7 @@
if(orderingMatchingRule == null)
{
orderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
}
return orderingMatchingRule;
}
@@ -1248,7 +1248,7 @@
if(substringMatchingRule == null)
{
substringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
}
return substringMatchingRule;
}
@@ -1269,8 +1269,7 @@
if(approximateMatchingRule == null)
{
approximateMatchingRule =
- DirectoryServer.getApproximateMatchingRule(
- AMR_DOUBLE_METAPHONE_OID);
+ DirectoryServer.getMatchingRule(AMR_DOUBLE_METAPHONE_OID);
}
return approximateMatchingRule;
}
@@ -1415,7 +1414,7 @@
{
//This has already been verified.
equalityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
}
return equalityMatchingRule;
}
@@ -1478,7 +1477,7 @@
if(substringMatchingRule == null)
{
substringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
}
return substringMatchingRule;
}
@@ -1499,8 +1498,7 @@
if(approximateMatchingRule == null)
{
approximateMatchingRule =
- DirectoryServer.getApproximateMatchingRule(
- AMR_DOUBLE_METAPHONE_OID);
+ DirectoryServer.getMatchingRule(AMR_DOUBLE_METAPHONE_OID);
}
return approximateMatchingRule;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
index 02e489c..ec761ac 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
@@ -96,21 +96,21 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_NAME);
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_NAME);
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
index e71d209..16d62c1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
@@ -95,7 +95,7 @@
throws ConfigException, InitializationException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
@@ -104,7 +104,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
@@ -113,7 +113,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
index f1af3bc..e6a2444 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
@@ -85,7 +85,7 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_UNIQUE_MEMBER_OID);
+ DirectoryServer.getMatchingRule(EMR_UNIQUE_MEMBER_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -93,7 +93,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java
index 499e760..7df9880 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java
@@ -92,7 +92,7 @@
throws ConfigException, InitializationException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
@@ -101,7 +101,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
@@ -110,7 +110,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java
index ec96714..92e540b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java
@@ -85,7 +85,7 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_NUMERIC_STRING_OID);
+ DirectoryServer.getMatchingRule(EMR_NUMERIC_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -93,7 +93,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_NUMERIC_STRING_OID);
+ DirectoryServer.getMatchingRule(OMR_NUMERIC_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
@@ -101,7 +101,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_EXACT_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_EXACT_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java
index 9e26844..c617975 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java
@@ -81,14 +81,14 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_OID_OID);
+ DirectoryServer.getMatchingRule(EMR_OID_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_OID_OID, SYNTAX_OID_NAME);
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_IGNORE_OID, SYNTAX_OID_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java
index 3f83114..89dd1de 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java
@@ -97,7 +97,7 @@
throws ConfigException, InitializationException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
@@ -106,7 +106,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
@@ -115,7 +115,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
LocalizableMessage message = ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java
index a23413d..5f36e48 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java
@@ -84,21 +84,21 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_OCTET_STRING_OID, SYNTAX_OCTET_STRING_NAME);
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_OCTET_STRING_OID, SYNTAX_OCTET_STRING_NAME);
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_OCTET_STRING_OID, SYNTAX_OCTET_STRING_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java
index d073dfa..bf48654 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java
@@ -82,7 +82,7 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_LIST_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_LIST_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -90,7 +90,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_LIST_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_LIST_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java
index f582085..4ea2591 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java
@@ -83,7 +83,7 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -91,7 +91,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java
index 802a9ba..3c881e4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java
@@ -87,7 +87,7 @@
throws ConfigException
{
defaultApproximateMatchingRule =
- DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
+ DirectoryServer.getMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE,
@@ -95,7 +95,7 @@
}
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -103,7 +103,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
@@ -111,7 +111,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java
index 1e02d2a..86578b5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java
@@ -89,7 +89,7 @@
throws ConfigException
{
defaultApproximateMatchingRule =
- DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
+ DirectoryServer.getMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE,
@@ -97,7 +97,7 @@
}
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -105,7 +105,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
@@ -113,7 +113,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
index 4588106..5d894fe 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
@@ -87,7 +87,7 @@
throws ConfigException
{
defaultApproximateMatchingRule =
- DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
+ DirectoryServer.getMatchingRule(AMR_DOUBLE_METAPHONE_OID);
if (defaultApproximateMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE,
@@ -95,7 +95,7 @@
}
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -103,7 +103,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
@@ -111,7 +111,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
index e3b43f1..809d472 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
@@ -85,7 +85,7 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -93,7 +93,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
@@ -101,7 +101,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java
index 3749a6d..a423ec9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java
@@ -77,22 +77,19 @@
public void initializeSyntax(AttributeSyntaxCfg configuration)
throws ConfigException {
- defaultEqualityMatchingRule = DirectoryServer
- .getEqualityMatchingRule(EMR_OCTET_STRING_OID);
+ defaultEqualityMatchingRule = DirectoryServer.getMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null) {
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
EMR_OCTET_STRING_OID, SYNTAX_SUBTREE_SPECIFICATION_NAME);
}
- defaultOrderingMatchingRule = DirectoryServer
- .getOrderingMatchingRule(OMR_OCTET_STRING_OID);
+ defaultOrderingMatchingRule = DirectoryServer.getMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null) {
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
OMR_OCTET_STRING_OID, SYNTAX_SUBTREE_SPECIFICATION_NAME);
}
- defaultSubstringMatchingRule = DirectoryServer
- .getSubstringMatchingRule(SMR_OCTET_STRING_OID);
+ defaultSubstringMatchingRule = DirectoryServer.getMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null) {
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
SMR_OCTET_STRING_OID, SYNTAX_SUBTREE_SPECIFICATION_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
index 1bac245..4388597 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
@@ -85,7 +85,7 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(EMR_OCTET_STRING_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -93,7 +93,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(OMR_OCTET_STRING_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
@@ -101,7 +101,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
+ DirectoryServer.getMatchingRule(SMR_OCTET_STRING_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
index ba70bd9..73cdc7c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
@@ -101,14 +101,14 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_TELEPHONE_OID);
+ 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.getSubstringMatchingRule(SMR_TELEPHONE_OID);
+ DirectoryServer.getMatchingRule(SMR_TELEPHONE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_TELEPHONE_OID, SYNTAX_TELEPHONE_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
index a76cc48..f746dc4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
@@ -116,7 +116,7 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
@@ -124,7 +124,7 @@
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
@@ -132,7 +132,7 @@
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java
index 07081d0..c291dc3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java
@@ -85,21 +85,21 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_CASE_IGNORE_OID, SYNTAX_TELEX_NAME);
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_CASE_IGNORE_OID, SYNTAX_TELEX_NAME);
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_IGNORE_OID, SYNTAX_TELEX_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java
index 9e59d6b..c8791a0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java
@@ -142,21 +142,21 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_GENERALIZED_TIME_OID);
+ DirectoryServer.getMatchingRule(EMR_GENERALIZED_TIME_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_GENERALIZED_TIME_OID, SYNTAX_UTC_TIME_NAME);
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_GENERALIZED_TIME_OID);
+ DirectoryServer.getMatchingRule(OMR_GENERALIZED_TIME_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_GENERALIZED_TIME_OID, SYNTAX_UTC_TIME_NAME);
}
defaultSubstringMatchingRule =
- DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
+ DirectoryServer.getMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_IGNORE_OID, SYNTAX_UTC_TIME_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java
index bc33e56..91e34e5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java
@@ -80,14 +80,14 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_UUID_OID);
+ DirectoryServer.getMatchingRule(EMR_UUID_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_UUID_OID, SYNTAX_UUID_NAME);
}
defaultOrderingMatchingRule =
- DirectoryServer.getOrderingMatchingRule(OMR_UUID_OID);
+ DirectoryServer.getMatchingRule(OMR_UUID_OID);
if (defaultOrderingMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_UUID_OID, SYNTAX_UUID_NAME);
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java
index 1fbdafc..e95a13d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java
@@ -91,7 +91,7 @@
throws ConfigException
{
defaultEqualityMatchingRule =
- DirectoryServer.getEqualityMatchingRule(EMR_USER_PASSWORD_EXACT_OID);
+ DirectoryServer.getMatchingRule(EMR_USER_PASSWORD_EXACT_OID);
if (defaultEqualityMatchingRule == null)
{
logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/DirectoryConfig.java b/opendj3-server-dev/src/server/org/opends/server/types/DirectoryConfig.java
index af07a3e..f664742 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/DirectoryConfig.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/DirectoryConfig.java
@@ -225,7 +225,7 @@
public static MatchingRule
getApproximateMatchingRule(String lowerName)
{
- return DirectoryServer.getApproximateMatchingRule(lowerName);
+ return DirectoryServer.getMatchingRule(lowerName);
}
@@ -244,7 +244,7 @@
public static MatchingRule
getEqualityMatchingRule(String lowerName)
{
- return DirectoryServer.getEqualityMatchingRule(lowerName);
+ return DirectoryServer.getMatchingRule(lowerName);
}
@@ -263,7 +263,7 @@
public static MatchingRule
getOrderingMatchingRule(String lowerName)
{
- return DirectoryServer.getOrderingMatchingRule(lowerName);
+ return DirectoryServer.getMatchingRule(lowerName);
}
@@ -282,7 +282,7 @@
public static MatchingRule
getSubstringMatchingRule(String lowerName)
{
- return DirectoryServer.getSubstringMatchingRule(lowerName);
+ return DirectoryServer.getMatchingRule(lowerName);
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java
index 5f7f527..2f64c6c 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java
@@ -265,8 +265,7 @@
public void testRelativeTimeMatchingRuleAssertionSyntax(String assertion,boolean isValid)
{
MatchingRule relativeTimeLTRule =
- DirectoryServer.getOrderingMatchingRule(
- EXT_OMR_RELATIVE_TIME_LT_ALT_NAME.toLowerCase());
+ DirectoryServer.getMatchingRule(EXT_OMR_RELATIVE_TIME_LT_ALT_NAME.toLowerCase());
try
{
relativeTimeLTRule.getAssertion(ByteString.valueOf(assertion));
--
Gitblit v1.10.0