From 81d36161ce5367fa7aa9a5d99dc8b80eacfa7cdf Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 24 Jan 2014 14:43:46 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 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 6bc582e..affebc6 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
@@ -26,7 +26,7 @@
* Portions Copyright 2014 Manuel Gaupp
*/
package org.opends.server.backends.jeb;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import java.util.*;
@@ -162,7 +162,7 @@
{
if (attrType.getEqualityMatchingRule() == null)
{
- Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
String.valueOf(attrType), "equality");
throw new ConfigException(message);
}
@@ -197,7 +197,7 @@
{
if (attrType.getSubstringMatchingRule() == null)
{
- Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
String.valueOf(attrType), "substring");
throw new ConfigException(message);
}
@@ -219,7 +219,7 @@
{
if (attrType.getOrderingMatchingRule() == null)
{
- Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
String.valueOf(attrType), "ordering");
throw new ConfigException(message);
}
@@ -239,7 +239,7 @@
{
if (attrType.getApproximateMatchingRule() == null)
{
- Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
String.valueOf(attrType), "approximate");
throw new ConfigException(message);
}
@@ -261,7 +261,7 @@
indexConfig.getIndexExtensibleMatchingRule();
if(extensibleRules == null || extensibleRules.isEmpty())
{
- Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
String.valueOf(attrType), "extensible");
throw new ConfigException(message);
}
@@ -278,7 +278,7 @@
toLowerCase(ruleName));
if(rule == null)
{
- Message message =
+ LocalizableMessage message =
ERR_CONFIG_INDEX_TYPE_NEEDS_VALID_MATCHING_RULE.get(
String.valueOf(attrType),ruleName);
logError(message);
@@ -1769,7 +1769,7 @@
*/
public synchronized boolean isConfigurationChangeAcceptable(
LocalDBIndexCfg cfg,
- List<Message> unacceptableReasons)
+ List<LocalizableMessage> unacceptableReasons)
{
AttributeType attrType = cfg.getAttribute();
@@ -1777,7 +1777,7 @@
{
if (equalityIndex == null && attrType.getEqualityMatchingRule() == null)
{
- Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
String.valueOf(String.valueOf(attrType)), "equality");
unacceptableReasons.add(message);
return false;
@@ -1788,7 +1788,7 @@
{
if (substringIndex == null && attrType.getSubstringMatchingRule() == null)
{
- Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
String.valueOf(attrType), "substring");
unacceptableReasons.add(message);
return false;
@@ -1800,7 +1800,7 @@
{
if (orderingIndex == null && attrType.getOrderingMatchingRule() == null)
{
- Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
String.valueOf(attrType), "ordering");
unacceptableReasons.add(message);
return false;
@@ -1811,7 +1811,7 @@
if (approximateIndex == null &&
attrType.getApproximateMatchingRule() == null)
{
- Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
String.valueOf(attrType), "approximate");
unacceptableReasons.add(message);
return false;
@@ -1823,7 +1823,7 @@
cfg.getIndexExtensibleMatchingRule();
if (newRules == null || newRules.isEmpty())
{
- Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
String.valueOf(attrType), "extensible");
unacceptableReasons.add(message);
return false;
@@ -1841,7 +1841,7 @@
{
ConfigChangeResult ccr;
boolean adminActionRequired = false;
- ArrayList<Message> messages = new ArrayList<Message>();
+ ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
try
{
AttributeType attrType = cfg.getAttribute();
@@ -1880,7 +1880,7 @@
{
adminActionRequired = true;
- Message message =
+ LocalizableMessage message =
NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD.get(
equalityIndex.getName());
messages.add(message);
@@ -1900,7 +1900,7 @@
}
catch(DatabaseException de)
{
- messages.add(Message.raw(
+ messages.add(LocalizableMessage.raw(
StaticUtils.stackTraceToSingleLineString(de)));
ccr = new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(), false, messages);
@@ -1942,7 +1942,7 @@
{
adminActionRequired = true;
- Message message =
+ LocalizableMessage message =
NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD.get(
presenceIndex.getName());
messages.add(message);
@@ -1961,7 +1961,7 @@
}
catch(DatabaseException de)
{
- messages.add(Message.raw(
+ messages.add(LocalizableMessage.raw(
StaticUtils.stackTraceToSingleLineString(de)));
ccr = new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(), false, messages);
@@ -2003,7 +2003,7 @@
if(this.substringIndex.setIndexEntryLimit(indexEntryLimit))
{
adminActionRequired = true;
- Message message =
+ LocalizableMessage message =
NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD.get(
substringIndex.getName());
messages.add(message);
@@ -2030,7 +2030,7 @@
}
catch(DatabaseException de)
{
- messages.add(Message.raw(
+ messages.add(LocalizableMessage.raw(
StaticUtils.stackTraceToSingleLineString(de)));
ccr = new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(), false, messages);
@@ -2072,7 +2072,7 @@
{
adminActionRequired = true;
- Message message =
+ LocalizableMessage message =
NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD.get(
orderingIndex.getName());
messages.add(message);
@@ -2091,7 +2091,7 @@
}
catch(DatabaseException de)
{
- messages.add(Message.raw(
+ messages.add(LocalizableMessage.raw(
StaticUtils.stackTraceToSingleLineString(de)));
ccr = new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(), false, messages);
@@ -2134,7 +2134,7 @@
{
adminActionRequired = true;
- Message message =
+ LocalizableMessage message =
NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD.get(
approximateIndex.getName());
messages.add(message);
@@ -2154,7 +2154,7 @@
catch(DatabaseException de)
{
messages.add(
- Message.raw(StaticUtils.stackTraceToSingleLineString(de)));
+ LocalizableMessage.raw(StaticUtils.stackTraceToSingleLineString(de)));
ccr = new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(), false, messages);
return ccr;
@@ -2185,7 +2185,7 @@
toLowerCase(ruleName));
if(rule == null)
{
- Message message =
+ LocalizableMessage message =
ERR_CONFIG_INDEX_TYPE_NEEDS_VALID_MATCHING_RULE.get(
String.valueOf(attrType),ruleName);
logError(message);
@@ -2232,7 +2232,7 @@
if(extensibleIndex.setIndexEntryLimit(indexEntryLimit))
{
adminActionRequired = true;
- Message message =
+ LocalizableMessage message =
NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD.get(
extensibleIndex.getName());
messages.add(message);
@@ -2313,7 +2313,7 @@
catch(DatabaseException de)
{
messages.add(
- Message.raw(StaticUtils.stackTraceToSingleLineString(de)));
+ LocalizableMessage.raw(StaticUtils.stackTraceToSingleLineString(de)));
ccr = new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(), false, messages);
return ccr;
@@ -2341,7 +2341,7 @@
catch(DatabaseException de)
{
messages.add(
- Message.raw(StaticUtils.stackTraceToSingleLineString(de)));
+ LocalizableMessage.raw(StaticUtils.stackTraceToSingleLineString(de)));
ccr = new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(), false, messages);
return ccr;
@@ -2360,7 +2360,7 @@
}
catch(Exception e)
{
- messages.add(Message.raw(StaticUtils.stackTraceToSingleLineString(e)));
+ messages.add(LocalizableMessage.raw(StaticUtils.stackTraceToSingleLineString(e)));
ccr = new ConfigChangeResult(DirectoryServer.getServerErrorResultCode(),
adminActionRequired,
messages);
@@ -2751,8 +2751,8 @@
ByteString assertionValue =
extensibleFilter.getAssertionValue().getValue();
IndexQuery expression = rule.createIndexQuery(assertionValue, factory);
- List<Message> debugMessages =
- monitor.isFilterUseEnabled() ? new ArrayList<Message>() : null;
+ List<LocalizableMessage> debugMessages =
+ monitor.isFilterUseEnabled() ? new ArrayList<LocalizableMessage>() : null;
EntryIDSet idSet = expression.evaluate(debugMessages);
if(monitor.isFilterUseEnabled())
{
@@ -2768,7 +2768,7 @@
}
else
{
- monitor.updateStats(extensibleFilter, Message.EMPTY);
+ monitor.updateStats(extensibleFilter, LocalizableMessage.EMPTY);
}
}
}
--
Gitblit v1.10.0