From 1d5d1a6a4a0a58d6bb4803527dacb6641c027816 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 28 Jan 2014 13:34:12 +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/VLVIndex.java | 56 ++++++++++++++++++++++++++------------------------------
1 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java
index 8a305ed..217fe12 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VLVIndex.java
@@ -28,7 +28,7 @@
import org.forgerock.i18n.LocalizableMessage;
import com.sleepycat.je.*;
-import org.opends.server.loggers.debug.DebugTracer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
@@ -47,7 +47,6 @@
ERR_JEB_CONFIG_VLV_INDEX_BAD_FILTER;
-import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.util.StaticUtils;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
import org.opends.server.api.OrderingMatchingRule;
@@ -73,10 +72,7 @@
public class VLVIndex extends DatabaseContainer
implements ConfigurationChangeListener<LocalDBVLVIndexCfg>
{
- /**
- * The tracer object for the debug logger.
- */
- private static final DebugTracer TRACER = getTracer();
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/**
* The comparator for vlvIndex keys.
@@ -672,22 +668,22 @@
if(status != OperationStatus.SUCCESS)
{
// There are no records in the database
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
- TRACER.debugVerbose("No sort values set exist in VLV vlvIndex %s. " +
+ logger.trace("No sort values set exist in VLV vlvIndex %s. " +
"Creating unbound set.", config.getName());
}
sortValuesSet = new SortValuesSet(this);
}
else
{
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
StringBuilder searchKeyHex = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(searchKeyHex, key.getData(), 4);
StringBuilder foundKeyHex = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(foundKeyHex, key.getData(), 4);
- TRACER.debugVerbose("Retrieved a sort values set in VLV vlvIndex " +
+ logger.trace("Retrieved a sort values set in VLV vlvIndex " +
"%s\nSearch Key:%s\nFound Key:%s\n",
config.getName(),
searchKeyHex,
@@ -759,9 +755,9 @@
if(status != OperationStatus.SUCCESS)
{
// There are no records in the database
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
- TRACER.debugVerbose("No sort values set exist in VLV vlvIndex %s. " +
+ logger.trace("No sort values set exist in VLV vlvIndex %s. " +
"Creating unbound set.", config.getName());
}
sortValuesSet = new SortValuesSet(this);
@@ -769,13 +765,13 @@
}
else
{
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
StringBuilder searchKeyHex = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(searchKeyHex, key.getData(), 4);
StringBuilder foundKeyHex = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(foundKeyHex, key.getData(), 4);
- TRACER.debugVerbose("Retrieved a sort values set in VLV vlvIndex " +
+ logger.trace("Retrieved a sort values set in VLV vlvIndex " +
"%s\nSearch Key:%s\nFound Key:%s\n",
config.getName(),
searchKeyHex,
@@ -803,9 +799,9 @@
data.setData(after);
put(txn, key, data);
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
- TRACER.debugInfo("SortValuesSet with key %s has reached" +
+ logger.trace("SortValuesSet with key %s has reached" +
" the entry size of %d. Spliting into two sets with " +
" keys %s and %s.", splitSortValuesSet.getKeySortValues(),
newSize, sortValuesSet.getKeySortValues(),
@@ -852,13 +848,13 @@
if(status == OperationStatus.SUCCESS)
{
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
StringBuilder searchKeyHex = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(searchKeyHex, key.getData(), 4);
StringBuilder foundKeyHex = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(foundKeyHex, key.getData(), 4);
- TRACER.debugVerbose("Retrieved a sort values set in VLV vlvIndex " +
+ logger.trace("Retrieved a sort values set in VLV vlvIndex " +
"%s\nSearch Key:%s\nFound Key:%s\n",
config.getName(),
searchKeyHex,
@@ -980,9 +976,9 @@
if(status != OperationStatus.SUCCESS)
{
// There are no records in the database
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
- TRACER.debugVerbose("No sort values set exist in VLV vlvIndex %s. " +
+ logger.trace("No sort values set exist in VLV vlvIndex %s. " +
"Creating unbound set.", config.getName());
}
sortValuesSet = new SortValuesSet(this);
@@ -990,13 +986,13 @@
}
else
{
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
StringBuilder searchKeyHex = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(searchKeyHex, key.getData(), 4);
StringBuilder foundKeyHex = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(foundKeyHex, key.getData(), 4);
- TRACER.debugVerbose("Retrieved a sort values set in VLV vlvIndex " +
+ logger.trace("Retrieved a sort values set in VLV vlvIndex " +
"%s\nSearch Key:%s\nFound Key:%s\n",
config.getName(),
searchKeyHex,
@@ -1084,9 +1080,9 @@
data.setData(after);
put(txn, key, data);
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
- TRACER.debugInfo("SortValuesSet with key %s has reached" +
+ logger.trace("SortValuesSet with key %s has reached" +
" the entry size of %d. Spliting into two sets with " +
" keys %s and %s.", splitSortValuesSet.getKeySortValues(),
newSize, sortValuesSet.getKeySortValues(),
@@ -1232,7 +1228,7 @@
status = cursor.getFirst(key, data,lockMode);
while(status == OperationStatus.SUCCESS)
{
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
StringBuilder searchKeyHex = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(searchKeyHex, key.getData(),
@@ -1240,7 +1236,7 @@
StringBuilder foundKeyHex = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(foundKeyHex, key.getData(),
4);
- TRACER.debugVerbose("Retrieved a sort values set in VLV " +
+ logger.trace("Retrieved a sort values set in VLV " +
"vlvIndex %s\nSearch Key:%s\nFound Key:%s\n",
config.getName(),
searchKeyHex,
@@ -1307,7 +1303,7 @@
status = cursor.getSearchKeyRange(key, data, lockMode);
if(status == OperationStatus.SUCCESS)
{
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
StringBuilder searchKeyHex = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(searchKeyHex, key.getData(),
@@ -1315,7 +1311,7 @@
StringBuilder foundKeyHex = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(foundKeyHex, key.getData(),
4);
- TRACER.debugVerbose("Retrieved a sort values set in VLV " +
+ logger.trace("Retrieved a sort values set in VLV " +
"vlvIndex %s\nSearch Key:%s\nFound Key:%s\n",
config.getName(),
searchKeyHex,
@@ -1451,13 +1447,13 @@
status = cursor.getFirst(key, data, lockMode);
while(status == OperationStatus.SUCCESS)
{
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
StringBuilder searchKeyHex = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(searchKeyHex, key.getData(), 4);
StringBuilder foundKeyHex = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(foundKeyHex, key.getData(), 4);
- TRACER.debugVerbose("Retrieved a sort values set in VLV vlvIndex " +
+ logger.trace("Retrieved a sort values set in VLV vlvIndex " +
"%s\nSearch Key:%s\nFound Key:%s\n",
config.getName(),
searchKeyHex,
--
Gitblit v1.10.0