From 19214be1e90677ffe8c036cec451dc64048a9291 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 07 Feb 2014 11:34:41 +0000
Subject: [PATCH] Replaced such calls: LocalizableMessage msg = ArgN.get(...); LocalizedLogger.*(msg); by this: LocalizedLogger.*(ArgN, ...);
---
opendj3-server-dev/replace.rb | 18 ++
opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java | 13 -
opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java | 10
opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java | 9
opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java | 7
opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java | 4
opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 8
opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java | 9
opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java | 267 +++++++++++++------------------------
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java | 10 -
opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java | 3
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java | 3
12 files changed, 133 insertions(+), 228 deletions(-)
diff --git a/opendj3-server-dev/replace.rb b/opendj3-server-dev/replace.rb
index 8400ae2..aca5973 100755
--- a/opendj3-server-dev/replace.rb
+++ b/opendj3-server-dev/replace.rb
@@ -261,8 +261,22 @@
:extensions => ["java"],
:replacements =>
[
- /(logger\.\s*(?:trace|debug|warn|info|error)\s*\()\s*([A-Z0-9_]+)\s*\.\s*get\s*\(([^;]+)\)([^;]+)/m,
+ /(logger\.\s*(?:trace|debug|warn|info|error)\s*\()\s*([A-Z0-9_]+)\s*\.\s*get\s*\(([^;]*)\)([^;]+)/m,
'\1\2, \3\4',
+ /(logger\.\s*(?:trace|debug|warn|info|error)\s*\()\s*([A-Z0-9_]+)\s*\.\s*get\s*\(([^;]*)\)([^;]+)/m,
+ '\1\2, \3\4',
+ ]
+ }
+
+ COLLAPSE_LOCALIZABLE_MESSAGE_TO_LOGGER_ONLY = {
+ :dirs => JAVA_DIRS,
+ :extensions => ["java"],
+ :replacements =>
+ [
+ /(?:final)?\s*LocalizableMessage\s*(\w+)\s*=\s*((?:[^;]|\r\n|\r|\n)+);\s*(logger\s*\.(?:trace|debug|warn|info|error)\s*\()\s*\1/m,
+ '\3\2',
+ /(?: |\t)+$/m,
+ '',
]
}
@@ -279,7 +293,7 @@
}
# List of replacements to run
- REPLACEMENTS = [ LOGGER_AND_ARGN_TO_LOGGER_ONLY ]
+ REPLACEMENTS = [ COLLAPSE_LOCALIZABLE_MESSAGE_TO_LOGGER_ONLY, LOGGER_AND_ARGN_TO_LOGGER_ONLY ]
################################### Processing methods ########################################
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
index 5680b19..ef80ca7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -982,9 +982,7 @@
rootContainer.close();
long finishTime = System.currentTimeMillis();
long closeTime = (finishTime - startTime) / 1000;
- LocalizableMessage msg =
- NOTE_JEB_IMPORT_LDIF_ROOTCONTAINER_CLOSE.get(closeTime);
- logger.info(msg);
+ logger.info(NOTE_JEB_IMPORT_LDIF_ROOTCONTAINER_CLOSE, closeTime);
rootContainer = null;
}
@@ -1478,10 +1476,9 @@
/** {@inheritDoc} */
@Override
public void diskSpaceRestored(DiskSpaceMonitor monitor) {
- LocalizableMessage msg = NOTE_JEB_DISK_SPACE_RESTORED.get(monitor.getFreeSpace(),
+ logger.error(NOTE_JEB_DISK_SPACE_RESTORED, monitor.getFreeSpace(),
monitor.getDirectory().getPath(), cfg.getBackendId(),
Math.max(monitor.getLowThreshold(), monitor.getFullThreshold()));
- logger.error(msg);
}
private void checkDiskSpace(Operation operation) throws DirectoryException
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
index b4aa35d..dd8f9b9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -2004,9 +2004,7 @@
}
if (!isCanceled)
{
- LocalizableMessage msg =
- NOTE_JEB_IMPORT_LDIF_DN_CLOSE.get(indexMgr.getDNCount());
- logger.error(msg);
+ logger.error(NOTE_JEB_IMPORT_LDIF_DN_CLOSE, indexMgr.getDNCount());
}
}
else
@@ -3975,10 +3973,8 @@
public void diskFullThresholdReached(DiskSpaceMonitor monitor)
{
isCanceled = true;
- LocalizableMessage msg =
- ERR_REBUILD_INDEX_LACK_DISK.get(monitor.getDirectory().getPath(),
+ logger.error(ERR_REBUILD_INDEX_LACK_DISK, monitor.getDirectory().getPath(),
monitor.getFreeSpace(), monitor.getLowThreshold());
- logger.error(msg);
}
@Override
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java
index b134463..af7ef74 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PluginConfigManager.java
@@ -938,9 +938,7 @@
// determination.
if (pluginArray.length == 0)
{
- LocalizableMessage message = WARN_CONFIG_PLUGIN_EMPTY_ELEMENT_IN_ORDER.get(
- pluginType.getName());
- logger.warn(message);
+ logger.warn(WARN_CONFIG_PLUGIN_EMPTY_ELEMENT_IN_ORDER, pluginType.getName());
}
}
else if (token.equals("*"))
@@ -952,9 +950,7 @@
// determination.
if (pluginArray.length == 0)
{
- LocalizableMessage message = WARN_CONFIG_PLUGIN_MULTIPLE_WILDCARDS_IN_ORDER.
- get(pluginType.getName());
- logger.warn(message);
+ logger.warn(WARN_CONFIG_PLUGIN_MULTIPLE_WILDCARDS_IN_ORDER, pluginType.getName());
}
}
else
@@ -975,9 +971,8 @@
// make the determination.
if (pluginArray.length == 0)
{
- LocalizableMessage message = WARN_CONFIG_PLUGIN_LISTED_MULTIPLE_TIMES.get(
+ logger.warn(WARN_CONFIG_PLUGIN_LISTED_MULTIPLE_TIMES,
pluginType.getName(), token);
- logger.warn(message);
}
}
@@ -992,9 +987,8 @@
// make the determination.
if (pluginArray.length == 0)
{
- LocalizableMessage message = WARN_CONFIG_PLUGIN_LISTED_MULTIPLE_TIMES.get(
+ logger.warn(WARN_CONFIG_PLUGIN_LISTED_MULTIPLE_TIMES,
pluginType.getName(), token);
- logger.warn(message);
}
}
@@ -1010,9 +1004,7 @@
// determination.
if (pluginArray.length == 0)
{
- LocalizableMessage message =
- WARN_CONFIG_PLUGIN_ORDER_NO_WILDCARD.get(pluginType.getName());
- logger.warn(message);
+ logger.warn(WARN_CONFIG_PLUGIN_ORDER_NO_WILDCARD, pluginType.getName());
}
}
@@ -1455,11 +1447,10 @@
}
else if (! result.continueProcessing())
{
- LocalizableMessage message = ERR_PLUGIN_STARTUP_PLUGIN_FAIL_ABORT.
- get(p.getPluginEntryDN(),
+ logger.error(ERR_PLUGIN_STARTUP_PLUGIN_FAIL_ABORT,
+ p.getPluginEntryDN(),
result.getErrorMessage(),
result.getErrorMessage().ordinal());
- logger.error(message);
return result;
}
}
@@ -1493,10 +1484,7 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_SHUTDOWN_PLUGIN_EXCEPTION.
- get(p.getPluginEntryDN(), stackTraceToSingleLineString(e));
- logger.error(message);
+ logger.error(ERR_PLUGIN_SHUTDOWN_PLUGIN_EXCEPTION, p.getPluginEntryDN(), stackTraceToSingleLineString(e));
}
}
}
@@ -1594,23 +1582,20 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage msg = ERR_PLUGIN_POST_DISCONNECT_PLUGIN_EXCEPTION.
- get(p.getPluginEntryDN(),
+ logger.error(ERR_PLUGIN_POST_DISCONNECT_PLUGIN_EXCEPTION,
+ p.getPluginEntryDN(),
clientConnection.getConnectionID(),
clientConnection.getClientAddress(),
stackTraceToSingleLineString(e));
- logger.error(msg);
}
if (result == null)
{
- LocalizableMessage msg = ERR_PLUGIN_POST_DISCONNECT_PLUGIN_RETURNED_NULL.
- get(p.getPluginEntryDN(),
+ logger.error(ERR_PLUGIN_POST_DISCONNECT_PLUGIN_RETURNED_NULL,
+ p.getPluginEntryDN(),
clientConnection.getConnectionID(),
clientConnection.getClientAddress());
- logger.error(msg);
}
else if (! result.continuePluginProcessing())
{
@@ -1655,9 +1640,8 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_PLUGIN_LDIF_IMPORT_PLUGIN_EXCEPTION.
-get(p.getPluginEntryDN(),
- entry.getName(), stackTraceToSingleLineString(e));
+ LocalizableMessage message = ERR_PLUGIN_LDIF_IMPORT_PLUGIN_EXCEPTION.get(
+ p.getPluginEntryDN(), entry.getName(), stackTraceToSingleLineString(e));
logger.error(message);
return PluginResult.ImportLDIF.stopEntryProcessing(message);
@@ -2963,24 +2947,21 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
- get(abandonOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION,
+ abandonOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
abandonOperation.getConnectionID(),
abandonOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
- get(abandonOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL,
+ abandonOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
abandonOperation.getConnectionID(),
abandonOperation.getOperationID());
- logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3048,22 +3029,19 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
- get(addOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION,
+ addOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
addOperation.getConnectionID(), addOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
- get(addOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL,
+ addOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
addOperation.getConnectionID(), addOperation.getOperationID());
- logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3131,23 +3109,20 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
- get(bindOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION,
+ bindOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
bindOperation.getConnectionID(), bindOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
- get(bindOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL,
+ bindOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
bindOperation.getConnectionID(),
bindOperation.getOperationID());
- logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3215,24 +3190,21 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
- get(compareOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION,
+ compareOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
compareOperation.getConnectionID(),
compareOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
- get(compareOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL,
+ compareOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
compareOperation.getConnectionID(),
compareOperation.getOperationID());
- logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3300,24 +3272,21 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
- get(deleteOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION,
+ deleteOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
deleteOperation.getConnectionID(),
deleteOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
- get(deleteOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL,
+ deleteOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
deleteOperation.getConnectionID(),
deleteOperation.getOperationID());
- logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3385,24 +3354,21 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
- get(extendedOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION,
+ extendedOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
extendedOperation.getConnectionID(),
extendedOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
- get(extendedOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL,
+ extendedOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
extendedOperation.getConnectionID(),
extendedOperation.getOperationID());
- logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3470,24 +3436,21 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
- get(modifyOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION,
+ modifyOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
modifyOperation.getConnectionID(),
modifyOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
- get(modifyOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL,
+ modifyOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
modifyOperation.getConnectionID(),
modifyOperation.getOperationID());
- logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3554,24 +3517,21 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
- get(modifyDNOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION,
+ modifyDNOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
modifyDNOperation.getConnectionID(),
modifyDNOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
- get(modifyDNOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL,
+ modifyDNOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
modifyDNOperation.getConnectionID(),
modifyDNOperation.getOperationID());
- logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3639,24 +3599,21 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
- get(searchOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION,
+ searchOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
searchOperation.getConnectionID(),
searchOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
- get(searchOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL,
+ searchOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
searchOperation.getConnectionID(),
searchOperation.getOperationID());
- logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3724,24 +3681,21 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
- get(unbindOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION,
+ unbindOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
unbindOperation.getConnectionID(),
unbindOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
- get(unbindOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL,
+ unbindOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
unbindOperation.getConnectionID(),
unbindOperation.getOperationID());
- logger.error(message);
}
else if (!result.continueProcessing())
{
@@ -3800,22 +3754,19 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
- get(addOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION,
+ addOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
addOperation.getConnectionID(), addOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL.
- get(addOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL,
+ addOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
addOperation.getConnectionID(), addOperation.getOperationID());
- logger.error(message);
}
else if (!result.continuePluginProcessing())
{
@@ -3864,23 +3815,20 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
- get(bindOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION,
+ bindOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
bindOperation.getConnectionID(), bindOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL.
- get(bindOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL,
+ bindOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
bindOperation.getConnectionID(),
bindOperation.getOperationID());
- logger.error(message);
}
else if (!result.continuePluginProcessing())
{
@@ -3929,24 +3877,21 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
- get(compareOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION,
+ compareOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
compareOperation.getConnectionID(),
compareOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL.
- get(compareOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL,
+ compareOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
compareOperation.getConnectionID(),
compareOperation.getOperationID());
- logger.error(message);
}
else if (!result.continuePluginProcessing())
{
@@ -3995,24 +3940,21 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
- get(deleteOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION,
+ deleteOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
deleteOperation.getConnectionID(),
deleteOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL.
- get(deleteOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL,
+ deleteOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
deleteOperation.getConnectionID(),
deleteOperation.getOperationID());
- logger.error(message);
}
else if (!result.continuePluginProcessing())
{
@@ -4060,24 +4002,21 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
- get(extendedOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION,
+ extendedOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
extendedOperation.getConnectionID(),
extendedOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL.
- get(extendedOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL,
+ extendedOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
extendedOperation.getConnectionID(),
extendedOperation.getOperationID());
- logger.error(message);
}
else if (!result.continuePluginProcessing())
{
@@ -4126,24 +4065,21 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
- get(modifyOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION,
+ modifyOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
modifyOperation.getConnectionID(),
modifyOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL.
- get(modifyOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL,
+ modifyOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
modifyOperation.getConnectionID(),
modifyOperation.getOperationID());
- logger.error(message);
}
else if (!result.continuePluginProcessing())
{
@@ -4192,24 +4128,21 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
- get(modifyDNOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION,
+ modifyDNOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
modifyDNOperation.getConnectionID(),
modifyDNOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL.
- get(modifyDNOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL,
+ modifyDNOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
modifyDNOperation.getConnectionID(),
modifyDNOperation.getOperationID());
- logger.error(message);
}
else if (!result.continuePluginProcessing())
{
@@ -4258,24 +4191,21 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
- get(searchOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION,
+ searchOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
searchOperation.getConnectionID(),
searchOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
if (result == null)
{
- LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL.
- get(searchOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL,
+ searchOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
searchOperation.getConnectionID(),
searchOperation.getOperationID());
- logger.error(message);
}
else if (!result.continuePluginProcessing())
{
@@ -4314,13 +4244,11 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_SYNCHRONIZATION_PLUGIN_EXCEPTION.
- get(addOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_SYNCHRONIZATION_PLUGIN_EXCEPTION,
+ addOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
addOperation.getConnectionID(), addOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
}
}
@@ -4346,14 +4274,12 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_SYNCHRONIZATION_PLUGIN_EXCEPTION.
- get(deleteOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_SYNCHRONIZATION_PLUGIN_EXCEPTION,
+ deleteOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
deleteOperation.getConnectionID(),
deleteOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
}
}
@@ -4379,14 +4305,12 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_SYNCHRONIZATION_PLUGIN_EXCEPTION.
- get(modifyOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_SYNCHRONIZATION_PLUGIN_EXCEPTION,
+ modifyOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
modifyOperation.getConnectionID(),
modifyOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
}
}
@@ -4412,14 +4336,12 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage message = ERR_PLUGIN_POST_SYNCHRONIZATION_PLUGIN_EXCEPTION.
- get(modifyDNOperation.getOperationType().getOperationName(),
+ logger.error(ERR_PLUGIN_POST_SYNCHRONIZATION_PLUGIN_EXCEPTION,
+ modifyDNOperation.getOperationType().getOperationName(),
p.getPluginEntryDN(),
modifyDNOperation.getConnectionID(),
modifyDNOperation.getOperationID(),
stackTraceToSingleLineString(e));
- logger.error(message);
}
}
}
@@ -5063,4 +4985,3 @@
skippedPreOperationPlugins.put(operation, existingList);
}
}
-
diff --git a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java
index 35729ce..fae7157 100644
--- a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java
+++ b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java
@@ -495,9 +495,8 @@
}
catch (CryptoManagerException e)
{
- LocalizableMessage message = LocalizableMessage.raw("Failed to import key entry: %s",
- e.getMessage());
- logger.error(message);
+ logger.error(LocalizableMessage.raw(
+ "Failed to import key entry: %s", e.getMessage()));
}
}
}
@@ -571,9 +570,8 @@
}
catch (CryptoManagerException e)
{
- LocalizableMessage message = LocalizableMessage.raw("Failed to import modified key entry: %s",
- e.getMessage());
- logger.error(message);
+ logger.error(LocalizableMessage.raw(
+ "Failed to import modified key entry: %s", e.getMessage()));
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
index a73730d..419d164 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
@@ -130,8 +130,7 @@
DirectoryServer.registerSASLMechanismHandler(SASL_MECHANISM_GSSAPI, this);
configuration.addGSSAPIChangeListener(this);
this.configuration = configuration;
- LocalizableMessage msg = INFO_GSSAPI_STARTED.get();
- logger.error(msg);
+ logger.error(INFO_GSSAPI_STARTED);
}
catch (UnknownHostException unhe)
{
@@ -348,8 +347,7 @@
}
DirectoryServer.deregisterSASLMechanismHandler(SASL_MECHANISM_GSSAPI);
clearProperties();
- LocalizableMessage msg = INFO_GSSAPI_STOPPED.get();
- logger.error(msg);
+ logger.error(INFO_GSSAPI_STOPPED.get());
}
@@ -575,8 +573,7 @@
DN identityMapperDN = config.getIdentityMapperDN();
identityMapper = DirectoryServer.getIdentityMapper(identityMapperDN);
serverFQDN = getFQDN(config);
- LocalizableMessage msg = INFO_GSSAPI_SERVER_FQDN.get(serverFQDN);
- logger.error(msg);
+ logger.error(INFO_GSSAPI_SERVER_FQDN, serverFQDN);
saslProps = new HashMap<String, String>();
saslProps.put(Sasl.QOP, getQOP(config));
saslProps.put(Sasl.REUSE, "false");
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java
index 0e986fe..2f122c8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAlertHandler.java
@@ -170,10 +170,8 @@
catch (Exception e)
{
logger.traceException(e);
-
- LocalizableMessage msg = WARN_SMTPALERTHANDLER_ERROR_SENDING_MESSAGE.get(
+ logger.error(WARN_SMTPALERTHANDLER_ERROR_SENDING_MESSAGE,
alertType, alertMessage, e.getLocalizedMessage());
- logger.error(msg);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
index 3d0e867..814f98c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -190,11 +190,10 @@
void runListen()
{
- LocalizableMessage listenMsg = NOTE_REPLICATION_SERVER_LISTENING.get(
+ logger.info(NOTE_REPLICATION_SERVER_LISTENING,
getServerId(),
listenSocket.getInetAddress().getHostAddress(),
listenSocket.getLocalPort());
- logger.info(listenMsg);
while (!shutdown && !stopListen)
{
@@ -432,11 +431,8 @@
} catch (DirectoryException e)
{
//FIXME:DirectoryException is raised by initializeECL => fix err msg
- LocalizableMessage message =
- LocalizableMessage
- .raw("Directory Exception raised by ECL initialization: "
- + e.getMessage());
- logger.error(message);
+ logger.error(LocalizableMessage.raw(
+ "Directory Exception raised by ECL initialization: %s", e.getMessage()));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java
index 5fc6647..827bf93 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java
@@ -2368,12 +2368,9 @@
}
finally
{
- LocalizableMessage msg = NOTE_FULL_UPDATE_ENGAGED_FROM_REMOTE_END.get(
- getBaseDNString(), initTargetMsgReceived.getSenderID(),
- getServerId(),
- (ieCtx.getException() == null ? ""
- : ieCtx.getException().getLocalizedMessage()));
- logger.error(msg);
+ logger.error(NOTE_FULL_UPDATE_ENGAGED_FROM_REMOTE_END,
+ getBaseDNString(), initTargetMsgReceived.getSenderID(), getServerId(),
+ (ieCtx.getException() != null ? ieCtx.getException().getLocalizedMessage() : ""));
releaseIEContext();
} // finally
} // finally
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java b/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
index e63d260..3c0a210 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
@@ -252,10 +252,7 @@
String languageTag = mapper.getLanguageTag();
if (nOID == null || languageTag == null)
{
- LocalizableMessage msg =
- WARN_ATTR_INVALID_COLLATION_MATCHING_RULE_FORMAT
- .get(collation);
- logger.error(msg);
+ logger.error(WARN_ATTR_INVALID_COLLATION_MATCHING_RULE_FORMAT, collation);
continue;
}
@@ -272,12 +269,8 @@
else
{
// This locale is not supported by JVM.
- LocalizableMessage msg =
- WARN_ATTR_INVALID_COLLATION_MATCHING_RULE_LOCALE.get(
- collation, configuration.dn().toNormalizedString(),
- languageTag);
-
- logger.error(msg);
+ logger.error(WARN_ATTR_INVALID_COLLATION_MATCHING_RULE_LOCALE,
+ collation, configuration.dn().toNormalizedString(), languageTag);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java b/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
index f083040..da226b4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
@@ -1388,9 +1388,8 @@
}
catch(Exception e)
{
- LocalizableMessage msg = ERR_LDIFIMPORT_CANNOT_PARSE_THREAD_COUNT.get(
+ logger.error(ERR_LDIFIMPORT_CANNOT_PARSE_THREAD_COUNT,
threadCount.getValue(), e.getMessage());
- logger.error(msg);
return 1;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
index bdb7973..c48a71e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
@@ -670,8 +670,7 @@
}
else
{
- final LocalizableMessage msg = INFO_UPGRADE_REBUILD_INDEX_NO_BACKEND_FOUND.get();
- logger.debug(msg);
+ logger.debug(INFO_UPGRADE_REBUILD_INDEX_NO_BACKEND_FOUND);
logger.debug(INFO_UPGRADE_REBUILD_INDEX_DECLINED, indexesListToRebuild);
context.notifyProgress(pnc.setProgress(100));
}
--
Gitblit v1.10.0