From 31216400c324b43c15b8a9eea6d89604247ebb14 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 03 Feb 2014 12:10:05 +0000
Subject: [PATCH] Removed now useless calls to String.valueOf() on arguments of ArgN.get(...).

---
 opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java |   40 ++++++++++------------------------------
 1 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
index 665452d..d6cb45d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
@@ -156,9 +156,7 @@
     {
       if (attrType.getEqualityMatchingRule() == null)
       {
-        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
-            String.valueOf(attrType), "equality");
-        throw new ConfigException(message);
+        throw new ConfigException(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "equality"));
       }
 
       Indexer equalityIndexer = new EqualityIndexer(attrType);
@@ -191,9 +189,7 @@
     {
       if (attrType.getSubstringMatchingRule() == null)
       {
-        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
-            String.valueOf(attrType), "substring");
-        throw new ConfigException(message);
+        throw new ConfigException(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "substring"));
       }
 
       Indexer substringIndexer = new SubstringIndexer(attrType,
@@ -213,9 +209,7 @@
     {
       if (attrType.getOrderingMatchingRule() == null)
       {
-        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
-            String.valueOf(attrType), "ordering");
-        throw new ConfigException(message);
+        throw new ConfigException(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "ordering"));
       }
 
       Indexer orderingIndexer = new OrderingIndexer(attrType);
@@ -233,9 +227,7 @@
     {
       if (attrType.getApproximateMatchingRule() == null)
       {
-        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
-            String.valueOf(attrType), "approximate");
-        throw new ConfigException(message);
+        throw new ConfigException(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "approximate"));
       }
 
       Indexer approximateIndexer = new ApproximateIndexer(attrType);
@@ -255,9 +247,7 @@
               indexConfig.getIndexExtensibleMatchingRule();
       if(extensibleRules == null || extensibleRules.isEmpty())
       {
-        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
-            String.valueOf(attrType), "extensible");
-        throw new ConfigException(message);
+        throw new ConfigException(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "extensible"));
       }
       extensibleIndexes = new ExtensibleMatchingRuleIndex();
       //Iterate through the Set and create the index only if necessary.
@@ -1750,9 +1740,7 @@
     {
       if (equalityIndex == null && attrType.getEqualityMatchingRule() == null)
       {
-        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
-                String.valueOf(String.valueOf(attrType)), "equality");
-        unacceptableReasons.add(message);
+        unacceptableReasons.add(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "equality"));
         return false;
       }
     }
@@ -1761,9 +1749,7 @@
     {
       if (substringIndex == null && attrType.getSubstringMatchingRule() == null)
       {
-        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
-                String.valueOf(attrType), "substring");
-        unacceptableReasons.add(message);
+        unacceptableReasons.add(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "substring"));
         return false;
       }
 
@@ -1773,9 +1759,7 @@
     {
       if (orderingIndex == null && attrType.getOrderingMatchingRule() == null)
       {
-        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
-                String.valueOf(attrType), "ordering");
-        unacceptableReasons.add(message);
+        unacceptableReasons.add(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "ordering"));
         return false;
       }
     }
@@ -1784,9 +1768,7 @@
       if (approximateIndex == null &&
           attrType.getApproximateMatchingRule() == null)
       {
-        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
-                String.valueOf(attrType), "approximate");
-        unacceptableReasons.add(message);
+        unacceptableReasons.add(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "approximate"));
         return false;
       }
     }
@@ -1796,9 +1778,7 @@
               cfg.getIndexExtensibleMatchingRule();
       if (newRules == null || newRules.isEmpty())
       {
-        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
-                String.valueOf(attrType), "extensible");
-        unacceptableReasons.add(message);
+        unacceptableReasons.add(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "extensible"));
         return false;
       }
     }

--
Gitblit v1.10.0