From f621f2931b8a47a666e180093fbc11416078f191 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 03 Feb 2014 13:32:14 +0000
Subject: [PATCH] Removed now useless calls to String.valueOf() on arguments of Logger.*(...).

---
 opendj3-server-dev/replace.rb |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/opendj3-server-dev/replace.rb b/opendj3-server-dev/replace.rb
index a60b3e7..8b4d2ec 100755
--- a/opendj3-server-dev/replace.rb
+++ b/opendj3-server-dev/replace.rb
@@ -222,7 +222,30 @@
       ]
   }
 
-  LOG_ISTRACEENABLED_TRACEEXCEPTION = {
+  LOGGER_TOSTRING = {
+    :dirs => JAVA_DIRS,
+    :extensions => ["java"],
+    :replacements =>
+      [
+        # Need to fix removing the last parentheses
+        /(logger\.\s*(trace|debug|warn|info|error)\s*\([^;]*)\s*String\s*\.\s*valueOf\s*\(/m,
+        /([A-Z0-9_]+\s*\.\s*get\s*\([^;]*)\.toString\(\)/m,
+        '\1',
+      ]
+  }
+
+  LOGGER_STRING_VALUEOF = {
+    :dirs => JAVA_DIRS,
+    :extensions => ["java"],
+    :replacements =>
+      [
+        # Need to fix removing the last parentheses
+        /(logger\.\s*(trace|debug|warn|info|error)\s*\([^;]*)\s*String\s*\.\s*valueOf\s*\(/m,
+        '\1',
+      ]
+  }
+
+  LOGGER_ISTRACEENABLED_TRACEEXCEPTION = {
     :dirs => JAVA_DIRS,
     :extensions => ["java"],
     :replacements =>
@@ -235,7 +258,7 @@
   }
 
   # List of replacements to run
-  REPLACEMENTS = [ MSG_ARGN_STRING_VALUEOF ]
+  REPLACEMENTS = [ LOGGER_STRING_VALUEOF ]
   #REPLACEMENTS = [ MESSAGES, TYPES, DN_TYPES, EXCEPTIONS, LOGGERS, I18N_LOGGERS ]
 
 

--
Gitblit v1.10.0