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/SubtreeSpecificationSyntax.java |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

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);

--
Gitblit v1.10.0