[infinispan-commits] Infinispan SVN: r1367 - in trunk/core/src/main/java/org/infinispan/util: logging and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-01-13 17:45:47 -0500 (Wed, 13 Jan 2010)
New Revision: 1367

Modified:
   trunk/core/src/main/java/org/infinispan/util/Util.java
   trunk/core/src/main/java/org/infinispan/util/logging/AbstractLogImpl.java
Log:
String formatting to be a general purpose tool

Modified: trunk/core/src/main/java/org/infinispan/util/Util.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/Util.java	2010-01-12 20:09:31 UTC (rev 1366)
+++ trunk/core/src/main/java/org/infinispan/util/Util.java	2010-01-13 22:45:47 UTC (rev 1367)
@@ -235,4 +235,18 @@
 
       }
    }
+
+   public static String formatString(Object message, Object... params) {
+      if (params.length == 0) return message == null ? "null" : message.toString();
+
+      StringBuilder value = new StringBuilder(String.valueOf(message));
+      for (int i = 0; i < params.length; i++) {
+         String placeholder = "{" + i + "}";
+         int phIndex;
+         if ((phIndex = value.indexOf(placeholder)) > -1) {
+            value = value.replace(phIndex, phIndex + placeholder.length(), String.valueOf(params[i]));
+         }
+      }
+      return value.toString();
+   }    
 }

Modified: trunk/core/src/main/java/org/infinispan/util/logging/AbstractLogImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/logging/AbstractLogImpl.java	2010-01-12 20:09:31 UTC (rev 1366)
+++ trunk/core/src/main/java/org/infinispan/util/logging/AbstractLogImpl.java	2010-01-13 22:45:47 UTC (rev 1367)
@@ -1,5 +1,7 @@
 package org.infinispan.util.logging;
 
+import static org.infinispan.util.Util.formatString;
+
 /**
  * Abstract log implementation that handles message interpolation
  *
@@ -7,64 +9,50 @@
  */
 public abstract class AbstractLogImpl implements Log {
    public void trace(Object message, Object... params) {
-      if (isTraceEnabled()) trace(substitute(message, params));
+      if (isTraceEnabled()) trace(formatString(message, params));
    }
 
    public void debug(Object message, Object... params) {
-      if (isDebugEnabled()) debug(substitute(message, params));
+      if (isDebugEnabled()) debug(formatString(message, params));
    }
 
    public void info(Object message, Object... params) {
-      if (isInfoEnabled()) info(substitute(message, params));
+      if (isInfoEnabled()) info(formatString(message, params));
    }
 
    public void warn(Object message, Object... params) {
-      if (isWarnEnabled()) warn(substitute(message, params));
+      if (isWarnEnabled()) warn(formatString(message, params));
    }
 
    public void error(Object message, Object... params) {
-      if (isErrorEnabled()) error(substitute(message, params));
+      if (isErrorEnabled()) error(formatString(message, params));
    }
 
    public void fatal(Object message, Object... params) {
-      if (isFatalEnabled()) fatal(substitute(message, params));
+      if (isFatalEnabled()) fatal(formatString(message, params));
    }
 
    public void trace(Object message, Throwable t, Object... params) {
-      if (isTraceEnabled()) trace(substitute(message, params), t);
+      if (isTraceEnabled()) trace(formatString(message, params), t);
    }
 
    public void debug(Object message, Throwable t, Object... params) {
-      if (isDebugEnabled()) debug(substitute(message, params), t);
+      if (isDebugEnabled()) debug(formatString(message, params), t);
    }
 
    public void info(Object message, Throwable t, Object... params) {
-      if (isInfoEnabled()) info(substitute(message, params), t);
+      if (isInfoEnabled()) info(formatString(message, params), t);
    }
 
    public void warn(Object message, Throwable t, Object... params) {
-      if (isWarnEnabled()) warn(substitute(message, params), t);
+      if (isWarnEnabled()) warn(formatString(message, params), t);
    }
 
    public void error(Object message, Throwable t, Object... params) {
-      if (isErrorEnabled()) error(substitute(message, params), t);
+      if (isErrorEnabled()) error(formatString(message, params), t);
    }
 
    public void fatal(Object message, Throwable t, Object... params) {
-      if (isFatalEnabled()) fatal(substitute(message, params), t);
+      if (isFatalEnabled()) fatal(formatString(message, params), t);
    }
-
-   private Object substitute(Object message, Object... params) {
-      if (params.length == 0) return message;
-
-      StringBuilder value = new StringBuilder(String.valueOf(message));
-      for (int i = 0; i < params.length; i++) {
-         String placeholder = "{" + i + "}";
-         int phIndex;
-         if ((phIndex = value.indexOf(placeholder)) > -1) {
-            value = value.replace(phIndex, phIndex + placeholder.length(), String.valueOf(params[i]));
-         }
-      }
-      return value.toString();
-   }
 }