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/PresentationAddressSyntax.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

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,

--
Gitblit v1.10.0