From 31216400c324b43c15b8a9eea6d89604247ebb14 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 03 Feb 2014 12:10:05 +0000
Subject: [PATCH] Removed now useless calls to String.valueOf() on arguments of ArgN.get(...).
---
opendj3-server-dev/replace.rb | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/replace.rb b/opendj3-server-dev/replace.rb
index a2116cf..a60b3e7 100755
--- a/opendj3-server-dev/replace.rb
+++ b/opendj3-server-dev/replace.rb
@@ -201,8 +201,41 @@
]
}
+ MSG_ARGN_TOSTRING = {
+ :dirs => JAVA_DIRS,
+ :extensions => ["java"],
+ :replacements =>
+ [
+ /([A-Z0-9_]+\s*\.\s*get\s*\([^;]*)\.toString\(\)/m,
+ '\1',
+ ]
+ }
+
+ MSG_ARGN_STRING_VALUEOF = {
+ :dirs => JAVA_DIRS,
+ :extensions => ["java"],
+ :replacements =>
+ [
+ # Need to fix removing the last parentheses
+ /([A-Z0-9_]+\s*\.\s*get\s*\([^;]*)\s*String\s*\.\s*valueOf\s*\(/m,
+ '\1',
+ ]
+ }
+
+ LOG_ISTRACEENABLED_TRACEEXCEPTION = {
+ :dirs => JAVA_DIRS,
+ :extensions => ["java"],
+ :replacements =>
+ [
+ /if\s*\(\s*logger\s*\.\s*isTraceEnabled\s*\(\s*\)\s*\)\s*(logger\s*\.\s*trace(Exception)?\s*\(\s*\w+\s*\)\s*;)/,
+ '\1',
+ /if\s*\(\s*logger\s*\.\s*isTraceEnabled\s*\(\s*\)\s*\)\s*\{\s*(logger\s*\.\s*trace(Exception)?\s*\(\s*\w+\s*\)\s*;)\s*\}/,
+ '\1',
+ ]
+ }
+
# List of replacements to run
- REPLACEMENTS = [ LOGGERS ]
+ REPLACEMENTS = [ MSG_ARGN_STRING_VALUEOF ]
#REPLACEMENTS = [ MESSAGES, TYPES, DN_TYPES, EXCEPTIONS, LOGGERS, I18N_LOGGERS ]
@@ -244,8 +277,11 @@
(0..replacements.size-1).step(2).each { |index|
pattern, replace = replacements[index], replacements[index+1]
replace = replace.gsub('{CLASSNAME}', classname(file))
- is_replaced = contents.gsub!(pattern, replace)
- if is_replaced then count += 1 end
+ is_replaced = true
+ while is_replaced
+ is_replaced = contents.gsub!(pattern, replace)
+ if is_replaced then count += 1 end
+ end
}
File.open(file + ".copy", "w+") { |f| f.write(contents) }
}
@@ -386,5 +422,5 @@
# Launch all replacements defined in the REPLACEMENTS constant
#Replace.new.messages("src/messages/messages/admin.properties")
-Replace.new.run_messages
-#Replace.new.run
+#Replace.new.run_messages
+Replace.new.run
--
Gitblit v1.10.0