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 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 ########################################
--
Gitblit v1.10.0