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/util/LDIFReader.java | 104 ++++++++++++++++++++++++++--------------------------
1 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java b/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
index dbb0a79..c0c4fc3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
@@ -37,8 +37,8 @@
import java.util.*;
import java.util.concurrent.atomic.AtomicLong;
-import org.opends.messages.Message;
-import org.opends.messages.MessageBuilder;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.backends.jeb.EntryID;
import org.opends.server.backends.jeb.RootContainer;
@@ -278,7 +278,7 @@
"exclude branches.", entryDN);
}
entriesRead.incrementAndGet();
- Message message = ERR_LDIF_SKIP.get(String.valueOf(entryDN));
+ LocalizableMessage message = ERR_LDIF_SKIP.get(String.valueOf(entryDN));
logToSkipWriter(lines, message);
continue;
}
@@ -293,7 +293,7 @@
"check." ,entryDN);
}
entriesRead.incrementAndGet();
- Message message = ERR_LDIF_SKIP.get(String.valueOf(entryDN));
+ LocalizableMessage message = ERR_LDIF_SKIP.get(String.valueOf(entryDN));
logToSkipWriter(lines, message);
continue;
}
@@ -322,7 +322,7 @@
TRACER.debugInfo("Skipping entry %s because reading" +
"its attributes failed.", entryDN);
}
- Message message = ERR_LDIF_READ_ATTR_SKIP.get(String.valueOf(entryDN),
+ LocalizableMessage message = ERR_LDIF_READ_ATTR_SKIP.get(String.valueOf(entryDN),
e.getMessage());
logToSkipWriter(lines, message);
suffix.removePending(entryDN);
@@ -349,7 +349,7 @@
"that should be included based on the include and exclude " +
"filters.", entryDN);
}
- Message message = ERR_LDIF_SKIP.get(String.valueOf(entryDN));
+ LocalizableMessage message = ERR_LDIF_SKIP.get(String.valueOf(entryDN));
logToSkipWriter(lines, message);
suffix.removePending(entryDN);
continue;
@@ -362,7 +362,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
suffix.removePending(entryDN);
- Message message = ERR_LDIF_COULD_NOT_EVALUATE_FILTERS_FOR_IMPORT.
+ LocalizableMessage message = ERR_LDIF_COULD_NOT_EVALUATE_FILTERS_FOR_IMPORT.
get(String.valueOf(entry.getName()), lastEntryLineNumber,
String.valueOf(e));
logToSkipWriter(lines, message);
@@ -378,8 +378,8 @@
pluginConfigManager.invokeLDIFImportPlugins(importConfig, entry);
if (! pluginResult.continueProcessing())
{
- Message m;
- Message rejectMessage = pluginResult.getErrorMessage();
+ LocalizableMessage m;
+ LocalizableMessage rejectMessage = pluginResult.getErrorMessage();
if (rejectMessage == null)
{
m = ERR_LDIF_REJECTED_BY_PLUGIN_NOMESSAGE.get(
@@ -408,10 +408,10 @@
//Add any superior objectclass(s) missing in the objectclass map.
addSuperiorObjectClasses(objectClasses);
- MessageBuilder invalidReason = new MessageBuilder();
+ LocalizableMessageBuilder invalidReason = new LocalizableMessageBuilder();
if (! entry.conformsToSchema(null, false, true, false, invalidReason))
{
- Message message = ERR_LDIF_SCHEMA_VIOLATION.get(
+ LocalizableMessage message = ERR_LDIF_SCHEMA_VIOLATION.get(
String.valueOf(entryDN),
lastEntryLineNumber,
invalidReason.toString());
@@ -506,7 +506,7 @@
entryDN);
}
entriesRead.incrementAndGet();
- Message message = ERR_LDIF_SKIP.get(String.valueOf(entryDN));
+ LocalizableMessage message = ERR_LDIF_SKIP.get(String.valueOf(entryDN));
logToSkipWriter(lines, message);
continue;
}
@@ -548,7 +548,7 @@
"that should be included based on the include and exclude " +
"filters.", entryDN);
}
- Message message = ERR_LDIF_SKIP.get(String.valueOf(entryDN));
+ LocalizableMessage message = ERR_LDIF_SKIP.get(String.valueOf(entryDN));
logToSkipWriter(lines, message);
continue;
}
@@ -560,7 +560,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_LDIF_COULD_NOT_EVALUATE_FILTERS_FOR_IMPORT.
+ LocalizableMessage message = ERR_LDIF_COULD_NOT_EVALUATE_FILTERS_FOR_IMPORT.
get(String.valueOf(entry.getName()), lastEntryLineNumber,
String.valueOf(e));
throw new LDIFException(message, lastEntryLineNumber, true, e);
@@ -574,8 +574,8 @@
pluginConfigManager.invokeLDIFImportPlugins(importConfig, entry);
if (! pluginResult.continueProcessing())
{
- Message m;
- Message rejectMessage = pluginResult.getErrorMessage();
+ LocalizableMessage m;
+ LocalizableMessage rejectMessage = pluginResult.getErrorMessage();
if (rejectMessage == null)
{
m = ERR_LDIF_REJECTED_BY_PLUGIN_NOMESSAGE.get(
@@ -597,10 +597,10 @@
// appropriate to do so.
if (checkSchema)
{
- MessageBuilder invalidReason = new MessageBuilder();
+ LocalizableMessageBuilder invalidReason = new LocalizableMessageBuilder();
if (! entry.conformsToSchema(null, false, true, false, invalidReason))
{
- Message message = ERR_LDIF_SCHEMA_VIOLATION.get(
+ LocalizableMessage message = ERR_LDIF_SCHEMA_VIOLATION.get(
String.valueOf(entryDN),
lastEntryLineNumber,
invalidReason.toString());
@@ -678,7 +678,7 @@
entry = parseModifyDNChangeRecordEntry(entryDN, lines);
} else
{
- Message message = ERR_LDIF_INVALID_CHANGETYPE_ATTRIBUTE.get(
+ LocalizableMessage message = ERR_LDIF_INVALID_CHANGETYPE_ATTRIBUTE.get(
changeType, "add, delete, modify, moddn, modrdn");
throw new LDIFException(message, lastEntryLineNumber, false);
}
@@ -690,7 +690,7 @@
entry = parseAddChangeRecordEntry(entryDN, lines);
} else
{
- Message message = ERR_LDIF_INVALID_CHANGETYPE_ATTRIBUTE.get(
+ LocalizableMessage message = ERR_LDIF_INVALID_CHANGETYPE_ATTRIBUTE.get(
null, "add, delete, modify, moddn, modrdn");
throw new LDIFException(message, lastEntryLineNumber, false);
}
@@ -773,7 +773,7 @@
}
else
{
- Message message =
+ LocalizableMessage message =
ERR_LDIF_INVALID_LEADING_SPACE.get(lineNumber, line);
logToRejectWriter(lines, message);
throw new LDIFException(message, lineNumber, false);
@@ -833,7 +833,7 @@
int colonPos = line.indexOf(":");
if (colonPos <= 0)
{
- Message message =
+ LocalizableMessage message =
ERR_LDIF_NO_ATTR_NAME.get(lastEntryLineNumber, line.toString());
logToRejectWriter(lines, message);
@@ -848,7 +848,7 @@
}
else if (! attrName.equals("dn"))
{
- Message message =
+ LocalizableMessage message =
ERR_LDIF_NO_DN.get(lastEntryLineNumber, line.toString());
logToRejectWriter(lines, message);
@@ -910,7 +910,7 @@
encodedStr, stackTrace);
}
- Message message = ERR_LDIF_COULD_NOT_BASE64_DECODE_DN.get(
+ LocalizableMessage message = ERR_LDIF_COULD_NOT_BASE64_DECODE_DN.get(
lastEntryLineNumber, line, stackTrace);
logToRejectWriter(lines, message);
throw new LDIFException(message, lastEntryLineNumber, true, e);
@@ -931,7 +931,7 @@
TRACER.debugInfo("DN decode failed for: ", dnString);
}
- Message message = ERR_LDIF_INVALID_DN.get(
+ LocalizableMessage message = ERR_LDIF_INVALID_DN.get(
lastEntryLineNumber, line.toString(),
de.getMessageObject());
@@ -944,7 +944,7 @@
{
TRACER.debugInfo("DN decode failed for: ", dnString);
}
- Message message = ERR_LDIF_INVALID_DN.get(
+ LocalizableMessage message = ERR_LDIF_INVALID_DN.get(
lastEntryLineNumber, line.toString(),
String.valueOf(e));
@@ -979,7 +979,7 @@
int colonPos = line.indexOf(":");
if (colonPos <= 0)
{
- Message message = ERR_LDIF_NO_ATTR_NAME.get(
+ LocalizableMessage message = ERR_LDIF_NO_ATTR_NAME.get(
lastEntryLineNumber, line.toString());
logToRejectWriter(lines, message);
throw new LDIFException(message, lastEntryLineNumber, true);
@@ -1000,7 +1000,7 @@
int length = line.length();
if (colonPos == (length-1))
{
- Message message = ERR_LDIF_INVALID_CHANGETYPE_ATTRIBUTE.get(
+ LocalizableMessage message = ERR_LDIF_INVALID_CHANGETYPE_ATTRIBUTE.get(
null, "add, delete, modify, moddn, modrdn");
throw new LDIFException(message, lastEntryLineNumber, false );
}
@@ -1118,7 +1118,7 @@
{
if(attribute.hasOption("binary"))
{
- Message message = ERR_LDIF_INVALID_ATTR_OPTION.get(
+ LocalizableMessage message = ERR_LDIF_INVALID_ATTR_OPTION.get(
String.valueOf(entryDN),lastEntryLineNumber, attrName);
logToRejectWriter(lines, message);
throw new LDIFException(message, lastEntryLineNumber,true);
@@ -1128,10 +1128,10 @@
(DirectoryServer.getSyntaxEnforcementPolicy() !=
AcceptRejectWarn.ACCEPT))
{
- MessageBuilder invalidReason = new MessageBuilder();
+ LocalizableMessageBuilder invalidReason = new LocalizableMessageBuilder();
if (! attrType.getSyntax().valueIsAcceptable(value, invalidReason))
{
- Message message = WARN_LDIF_VALUE_VIOLATES_SYNTAX.get(
+ LocalizableMessage message = WARN_LDIF_VALUE_VIOLATES_SYNTAX.get(
String.valueOf(entryDN),
lastEntryLineNumber, value.toString(),
attrName, invalidReason.toString());
@@ -1177,7 +1177,7 @@
{
if (!a.add(attributeValue) && checkSchema)
{
- Message message = WARN_LDIF_DUPLICATE_ATTR.get(
+ LocalizableMessage message = WARN_LDIF_DUPLICATE_ATTR.get(
String.valueOf(entryDN),
lastEntryLineNumber, attrName,
value.toString());
@@ -1186,7 +1186,7 @@
}
if (attrType.isSingleValue() && (a.size() > 1) && checkSchema)
{
- Message message = ERR_LDIF_MULTIPLE_VALUES_FOR_SINGLE_VALUED_ATTR
+ LocalizableMessage message = ERR_LDIF_MULTIPLE_VALUES_FOR_SINGLE_VALUED_ATTR
.get(String.valueOf(entryDN),
lastEntryLineNumber, attrName);
logToRejectWriter(lines, message);
@@ -1240,7 +1240,7 @@
if (!attribute.equals(expectedAttr))
{
- Message message = ERR_LDIF_INVALID_CHANGERECORD_ATTRIBUTE.get(
+ LocalizableMessage message = ERR_LDIF_INVALID_CHANGERECORD_ATTRIBUTE.get(
attrDescr, attributeName);
throw new LDIFException(message, lastEntryLineNumber, false);
}
@@ -1281,7 +1281,7 @@
* @param message A human-readable message providing the reason that the
* last entry read was not acceptable.
*/
- public void rejectLastEntry(Message message)
+ public void rejectLastEntry(LocalizableMessage message)
{
entriesRejected.incrementAndGet();
@@ -1329,7 +1329,7 @@
* @param e The entry to log.
* @param message The message to log.
*/
- public synchronized void rejectEntry(Entry e, Message message) {
+ public synchronized void rejectEntry(Entry e, LocalizableMessage message) {
BufferedWriter rejectWriter = importConfig.getRejectWriter();
entriesRejected.incrementAndGet();
if (rejectWriter != null) {
@@ -1485,7 +1485,7 @@
if(lines.isEmpty())
{
- Message message = ERR_LDIF_NO_MOD_DN_ATTRIBUTES.get();
+ LocalizableMessage message = ERR_LDIF_NO_MOD_DN_ATTRIBUTES.get();
throw new LDIFException(message, lineNumber, true);
}
@@ -1501,7 +1501,7 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, de);
}
- Message message = ERR_LDIF_INVALID_DN.get(
+ LocalizableMessage message = ERR_LDIF_INVALID_DN.get(
lineNumber, line.toString(), de.getMessageObject());
throw new LDIFException(message, lineNumber, true);
} catch (Exception e)
@@ -1510,14 +1510,14 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message =
+ LocalizableMessage message =
ERR_LDIF_INVALID_DN.get(lineNumber, line.toString(), e.getMessage());
throw new LDIFException(message, lineNumber, true);
}
if(lines.isEmpty())
{
- Message message = ERR_LDIF_NO_DELETE_OLDRDN_ATTRIBUTE.get();
+ LocalizableMessage message = ERR_LDIF_NO_DELETE_OLDRDN_ATTRIBUTE.get();
throw new LDIFException(message, lineNumber, true);
}
lineNumber++;
@@ -1538,7 +1538,7 @@
deleteOldRDN = true;
} else
{
- Message message = ERR_LDIF_INVALID_DELETE_OLDRDN_ATTRIBUTE.get(delStr);
+ LocalizableMessage message = ERR_LDIF_INVALID_DELETE_OLDRDN_ATTRIBUTE.get(delStr);
throw new LDIFException(message, lineNumber, true);
}
@@ -1559,7 +1559,7 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, de);
}
- Message message = ERR_LDIF_INVALID_DN.get(
+ LocalizableMessage message = ERR_LDIF_INVALID_DN.get(
lineNumber, line.toString(), de.getMessageObject());
throw new LDIFException(message, lineNumber, true);
} catch (Exception e)
@@ -1568,7 +1568,7 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_LDIF_INVALID_DN.get(
+ LocalizableMessage message = ERR_LDIF_INVALID_DN.get(
lineNumber, line.toString(), e.getMessage());
throw new LDIFException(message, lineNumber, true);
}
@@ -1654,7 +1654,7 @@
else
{
// Invalid attribute name.
- Message message = ERR_LDIF_INVALID_MODIFY_ATTRIBUTE.get(name,
+ LocalizableMessage message = ERR_LDIF_INVALID_MODIFY_ATTRIBUTE.get(name,
"add, delete, replace, increment");
throw new LDIFException(message, lineNumber, true);
}
@@ -1699,7 +1699,7 @@
{
if (!lines.isEmpty())
{
- Message message = ERR_LDIF_INVALID_DELETE_ATTRIBUTES.get();
+ LocalizableMessage message = ERR_LDIF_INVALID_DELETE_ATTRIBUTES.get();
throw new LDIFException(message, lineNumber, true);
}
return new DeleteChangeRecordEntry(entryDN);
@@ -1766,7 +1766,7 @@
int colonPos = line.indexOf(":");
if (colonPos <= 0)
{
- Message message = ERR_LDIF_NO_ATTR_NAME.get(
+ LocalizableMessage message = ERR_LDIF_NO_ATTR_NAME.get(
lastEntryLineNumber, line.toString());
logToRejectWriter(lines, message);
throw new LDIFException(message, lastEntryLineNumber, true);
@@ -1831,7 +1831,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_LDIF_COULD_NOT_BASE64_DECODE_ATTR.get(
+ LocalizableMessage message = ERR_LDIF_COULD_NOT_BASE64_DECODE_ATTR.get(
String.valueOf(entryDN),
lastEntryLineNumber, line,
String.valueOf(e));
@@ -1858,7 +1858,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_LDIF_INVALID_URL.get(String.valueOf(entryDN),
+ LocalizableMessage message = ERR_LDIF_INVALID_URL.get(String.valueOf(entryDN),
lastEntryLineNumber,
String.valueOf(attrName),
String.valueOf(e));
@@ -1885,7 +1885,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_LDIF_URL_IO_ERROR.get(String.valueOf(entryDN),
+ LocalizableMessage message = ERR_LDIF_URL_IO_ERROR.get(String.valueOf(entryDN),
lastEntryLineNumber,
String.valueOf(attrName),
String.valueOf(contentURL),
@@ -1917,7 +1917,7 @@
* @param message
* The associated error message.
*/
- private void logToRejectWriter(List<StringBuilder> lines, Message message)
+ private void logToRejectWriter(List<StringBuilder> lines, LocalizableMessage message)
{
entriesRejected.incrementAndGet();
BufferedWriter rejectWriter = importConfig.getRejectWriter();
@@ -1935,7 +1935,7 @@
* @param message
* The associated error message.
*/
- private void logToSkipWriter(List<StringBuilder> lines, Message message)
+ private void logToSkipWriter(List<StringBuilder> lines, LocalizableMessage message)
{
entriesIgnored.incrementAndGet();
BufferedWriter skipWriter = importConfig.getSkipWriter();
@@ -1956,7 +1956,7 @@
* The associated error message.
*/
private void logToWriter(BufferedWriter writer, List<StringBuilder> lines,
- Message message)
+ LocalizableMessage message)
{
if (writer != null)
{
--
Gitblit v1.10.0