Author: simonetripodi
Date: Thu Jun 23 22:19:54 2011
New Revision: 1139092
URL: http://svn.apache.org/viewvc?rev=1139092&view=rev
Log:
debugging messages made easier to read and maintain
Modified:
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectParamRule.java
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/PathCallParamRule.java
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java
Modified:
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java?rev=1139092&r1=1139091&r2=1139092&view=diff
==============================================================================
---
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java
(original)
+++
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java
Thu Jun 23 22:19:54 2011
@@ -19,6 +19,8 @@ package org.apache.commons.digester3;
* under the License.
*/
+import static java.lang.String.format;
+
import java.beans.PropertyDescriptor;
import org.apache.commons.beanutils.BeanUtils;
@@ -115,8 +117,9 @@ public class BeanPropertySetterRule
// log some debugging information
if ( getDigester().getLogger().isDebugEnabled() )
{
- getDigester().getLogger().debug( "[BeanPropertySetterRule]{" +
getDigester().getMatch()
- + "} Called with text '" +
text + "'" );
+ getDigester().getLogger().debug( format(
"[BeanPropertySetterRule]{%s} Called with text '%s'",
+ getDigester().getMatch(),
+ text ) );
}
bodyText = text.trim();
@@ -144,9 +147,11 @@ public class BeanPropertySetterRule
// log some debugging information
if ( getDigester().getLogger().isDebugEnabled() )
{
- getDigester().getLogger().debug( "[BeanPropertySetterRule]{" +
getDigester().getMatch() + "} Set "
- + top.getClass().getName() +
" property " + property + " with text "
- + bodyText );
+ getDigester().getLogger().debug( format(
"[BeanPropertySetterRule]{%s} Set %s property %s with text %s",
+ getDigester().getMatch(),
+ top.getClass().getName(),
+ property,
+ bodyText ) );
}
// Force an exception if the property does not exist
@@ -189,11 +194,7 @@ public class BeanPropertySetterRule
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder( "BeanPropertySetterRule[" );
- sb.append( "propertyName=" );
- sb.append( propertyName );
- sb.append( "]" );
- return ( sb.toString() );
+ return format( "BeanPropertySetterRule[propertyName=%s]", propertyName
);
}
}
Modified:
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java?rev=1139092&r1=1139091&r2=1139092&view=diff
==============================================================================
---
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java
(original)
+++
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java
Thu Jun 23 22:19:54 2011
@@ -19,6 +19,10 @@ package org.apache.commons.digester3;
* under the License.
*/
+import static java.lang.String.format;
+
+import java.util.Formatter;
+
import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.beanutils.MethodUtils;
import org.xml.sax.Attributes;
@@ -339,7 +343,8 @@ public class CallMethodRule
catch ( ClassNotFoundException e )
{
// use the digester log
- digester.getLogger().error( "(CallMethodRule) Cannot load
class " + this.paramClassNames[i], e );
+ digester.getLogger().error( format( "[CallMethodRule]
Cannot load class %s",
+
this.paramClassNames[i] ), e );
this.paramTypes[i] = null; // Will cause NPE later
}
}
@@ -395,7 +400,10 @@ public class CallMethodRule
{
for ( int i = 0, size = parameters.length; i < size; i++ )
{
- getDigester().getLogger().trace( "[CallMethodRule](" + i +
")" + parameters[i] );
+ getDigester().getLogger().trace( format(
"[CallMethodRule]{%s} parameters[%s]=%s",
+
getDigester().getMatch(),
+ i,
+ parameters[i] ) );
}
}
@@ -476,54 +484,24 @@ public class CallMethodRule
if ( target == null )
{
- StringBuilder sb = new StringBuilder();
- sb.append( "[CallMethodRule]{" );
- sb.append( getDigester().getMatch() );
- sb.append( "} Call target is null (" );
- sb.append( "targetOffset=" );
- sb.append( targetOffset );
- sb.append( ",stackdepth=" );
- sb.append( getDigester().getCount() );
- sb.append( ")" );
- throw new SAXException( sb.toString() );
+ throw new SAXException( format( "[CallMethodRule]{%s} Call target
is null (targetOffset=%s, stackdepth=%s)",
+ getDigester().getMatch(),
targetOffset, getDigester().getCount() ) );
}
// Invoke the required method on the top object
if ( getDigester().getLogger().isDebugEnabled() )
{
- StringBuilder sb = new StringBuilder( "[CallMethodRule]{" );
- sb.append( getDigester().getMatch() );
- sb.append( "} Call " );
- sb.append( target.getClass().getName() );
- sb.append( "." );
- sb.append( methodName );
- sb.append( "(" );
+ Formatter formatter =
+ new Formatter().format( "[CallMethodRule]{%s} Call %s.%s(",
+ getDigester().getMatch(),
+ target.getClass().getName(),
+ methodName );
for ( int i = 0; i < paramValues.length; i++ )
{
- if ( i > 0 )
- {
- sb.append( "," );
- }
- if ( paramValues[i] == null )
- {
- sb.append( "null" );
- }
- else
- {
- sb.append( paramValues[i].toString() );
- }
- sb.append( "/" );
- if ( paramTypes[i] == null )
- {
- sb.append( "null" );
- }
- else
- {
- sb.append( paramTypes[i].getName() );
- }
+ formatter.format( "%s%s/%s", ( i > 0 ? ", " : "" ),
paramValues[i], paramTypes[i].getName() );
}
- sb.append( ")" );
- getDigester().getLogger().debug( sb.toString() );
+ formatter.format( ")" );
+ getDigester().getLogger().debug( formatter.toString() );
}
Object result = null;
@@ -568,26 +546,19 @@ public class CallMethodRule
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder( "CallMethodRule[" );
- sb.append( "methodName=" );
- sb.append( methodName );
- sb.append( ", paramCount=" );
- sb.append( paramCount );
- sb.append( ", paramTypes={" );
+ Formatter formatter = new Formatter().format(
"CallMethodRule[methodName=%s, paramCount=%s, paramTypes={",
+ methodName, paramCount );
if ( paramTypes != null )
{
for ( int i = 0; i < paramTypes.length; i++ )
{
- if ( i > 0 )
- {
- sb.append( ", " );
- }
- sb.append( paramTypes[i].getName() );
+ formatter.format( "%s%s",
+ ( i > 0 ? ", " : "" ),
+ ( paramTypes[i] != null ?
paramTypes[i].getName() : "null" ) );
}
}
- sb.append( "}" );
- sb.append( "]" );
- return ( sb.toString() );
+ formatter.format( "}]" );
+ return ( formatter.toString() );
}
}
Modified:
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java?rev=1139092&r1=1139091&r2=1139092&view=diff
==============================================================================
---
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java
(original)
+++
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java
Thu Jun 23 22:19:54 2011
@@ -19,6 +19,7 @@ package org.apache.commons.digester3;
* under the License.
*/
+import static java.lang.String.format;
import java.util.Stack;
import org.xml.sax.Attributes;
@@ -159,12 +160,10 @@ public class CallParamRule
if ( getDigester().getLogger().isDebugEnabled() )
{
-
- StringBuilder sb = new StringBuilder( "[CallParamRule]{" );
- sb.append( getDigester().getMatch() );
- sb.append( "} Save from stack; from stack?" ).append(
fromStack );
- sb.append( "; object=" ).append( param );
- getDigester().getLogger().debug( sb.toString() );
+ getDigester().getLogger().debug( format( "[CallParamRule]{%s}
Save from stack; from stack?%s; object=%s",
+
getDigester().getMatch(),
+ fromStack,
+ param ) );
}
}
@@ -221,15 +220,8 @@ public class CallParamRule
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder( "CallParamRule[" );
- sb.append( "paramIndex=" );
- sb.append( paramIndex );
- sb.append( ", attributeName=" );
- sb.append( attributeName );
- sb.append( ", from stack=" );
- sb.append( fromStack );
- sb.append( "]" );
- return ( sb.toString() );
+ return format( "CallParamRule[paramIndex=%s, attributeName=%s, from
stack=%s]",
+ paramIndex, attributeName, fromStack );
}
}
Modified:
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java?rev=1139092&r1=1139091&r2=1139092&view=diff
==============================================================================
---
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java
(original)
+++
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java
Thu Jun 23 22:19:54 2011
@@ -19,6 +19,9 @@ package org.apache.commons.digester3;
* under the License.
*/
+import static java.lang.String.format;
+
+import java.util.Formatter;
import java.util.Stack;
import org.xml.sax.Attributes;
@@ -241,11 +244,10 @@ public class FactoryCreateRule
if ( getDigester().getLogger().isDebugEnabled() )
{
- getDigester().getLogger().debug( "[FactoryCreateRule]{"
- +
getDigester().getMatch()
- + "} New "
- + ( instance == null
? "null object"
- :
instance.getClass().getName() ) );
+ getDigester().getLogger().debug( format(
"[FactoryCreateRule]{%s} New %s",
+
getDigester().getMatch(),
+ ( instance ==
null ? "null object"
+ :
instance.getClass().getName() ) ) );
}
getDigester().push( instance );
exceptionIgnoredStack.push( Boolean.FALSE );
@@ -256,9 +258,10 @@ public class FactoryCreateRule
// log message and error
if ( getDigester().getLogger().isInfoEnabled() )
{
- getDigester().getLogger().info( "[FactoryCreateRule]
Create exception ignored: "
- + ( ( e.getMessage()
== null ) ? e.getClass().getName()
- :
e.getMessage() ) );
+ getDigester().getLogger().info( format(
"[FactoryCreateRule]{%s} Create exception ignored: %s",
+
getDigester().getMatch(),
+ ( ( e.getMessage()
== null ) ? e.getClass().getName()
+ :
e.getMessage() ) ) );
if ( getDigester().getLogger().isDebugEnabled() )
{
getDigester().getLogger().debug( "[FactoryCreateRule]
Ignored exception:", e );
@@ -274,11 +277,10 @@ public class FactoryCreateRule
if ( getDigester().getLogger().isDebugEnabled() )
{
- getDigester().getLogger().debug( "[FactoryCreateRule]{"
- + getDigester().getMatch()
- + "} New "
- + ( instance == null ?
"null object"
- :
instance.getClass().getName() ) );
+ getDigester().getLogger().debug( format(
"[FactoryCreateRule]{%s} New %s",
+
getDigester().getMatch(),
+ ( instance == null ?
"null object"
+ :
instance.getClass().getName() ) ) );
}
getDigester().push( instance );
}
@@ -302,7 +304,8 @@ public class FactoryCreateRule
// nothing was put onto the stack
if ( getDigester().getLogger().isTraceEnabled() )
{
- getDigester().getLogger().trace( "[FactoryCreateRule] No
creation so no push so no pop" );
+ getDigester().getLogger().trace( format(
"[FactoryCreateRule]{%s} No creation so no push so no pop",
+
getDigester().getMatch() ) );
}
return;
}
@@ -311,8 +314,9 @@ public class FactoryCreateRule
Object top = getDigester().pop();
if ( getDigester().getLogger().isDebugEnabled() )
{
- getDigester().getLogger().debug( "[FactoryCreateRule]{" +
getDigester().getMatch() + "} Pop "
- + top.getClass().getName() );
+ getDigester().getLogger().debug( format( "[FactoryCreateRule]{%s}
Pop %s",
+ getDigester().getMatch(),
+ top.getClass().getName()
) );
}
}
@@ -335,18 +339,14 @@ public class FactoryCreateRule
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder( "FactoryCreateRule[" );
- sb.append( "className=" );
- sb.append( className );
- sb.append( ", attributeName=" );
- sb.append( attributeName );
+ Formatter formatter = new Formatter().format(
"FactoryCreateRule[className=%s, attributeName=%s",
+ className, attributeName
);
if ( creationFactory != null )
{
- sb.append( ", creationFactory=" );
- sb.append( creationFactory );
+ formatter.format( ", creationFactory=%s", creationFactory );
}
- sb.append( "]" );
- return ( sb.toString() );
+ formatter.format( "]" );
+ return ( formatter.toString() );
}
// ------------------------------------------------------ Protected Methods
@@ -374,8 +374,8 @@ public class FactoryCreateRule
}
if ( getDigester().getLogger().isDebugEnabled() )
{
- getDigester().getLogger().debug( "[FactoryCreateRule]{" +
getDigester().getMatch() + "} New factory "
- + realClassName );
+ getDigester().getLogger().debug( format(
"[FactoryCreateRule]{%s} New factory %s",
+
getDigester().getMatch(), realClassName ) );
}
Class<?> clazz = getDigester().getClassLoader().loadClass(
realClassName );
creationFactory = (ObjectCreationFactory<?>) clazz.newInstance();
Modified:
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java?rev=1139092&r1=1139091&r2=1139092&view=diff
==============================================================================
---
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
(original)
+++
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
Thu Jun 23 22:19:54 2011
@@ -19,6 +19,8 @@ package org.apache.commons.digester3;
* under the License.
*/
+import static java.lang.String.format;
+
import org.xml.sax.Attributes;
/**
@@ -119,8 +121,9 @@ public class ObjectCreateRule
}
if ( getDigester().getLogger().isDebugEnabled() )
{
- getDigester().getLogger().debug( "[ObjectCreateRule]{" +
getDigester().getMatch() + "}New "
- + realClassName );
+ getDigester().getLogger().debug( format(
"[ObjectCreateRule]{%s} New '%s'",
+
getDigester().getMatch(),
+ realClassName ) );
}
// Instantiate the new object and push it on the context stack
@@ -140,8 +143,9 @@ public class ObjectCreateRule
Object top = getDigester().pop();
if ( getDigester().getLogger().isDebugEnabled() )
{
- getDigester().getLogger().debug( "[ObjectCreateRule]{" +
getDigester().getMatch() + "} Pop "
- + top.getClass().getName() );
+ getDigester().getLogger().debug( format( "[ObjectCreateRule]{%s}
Pop '%s'",
+ getDigester().getMatch(),
+ top.getClass().getName()
) );
}
}
@@ -151,13 +155,7 @@ public class ObjectCreateRule
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder( "ObjectCreateRule[" );
- sb.append( "className=" );
- sb.append( className );
- sb.append( ", attributeName=" );
- sb.append( attributeName );
- sb.append( "]" );
- return ( sb.toString() );
+ return format( "ObjectCreateRule[className=%s, attributeName=%s]",
className, attributeName );
}
}
Modified:
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectParamRule.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectParamRule.java?rev=1139092&r1=1139091&r2=1139092&view=diff
==============================================================================
---
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectParamRule.java
(original)
+++
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/ObjectParamRule.java
Thu Jun 23 22:19:54 2011
@@ -19,6 +19,8 @@ package org.apache.commons.digester3;
* under the License.
*/
+import static java.lang.String.format;
+
import org.xml.sax.Attributes;
/**
@@ -118,15 +120,7 @@ public class ObjectParamRule
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder( "ObjectParamRule[" );
- sb.append( "paramIndex=" );
- sb.append( paramIndex );
- sb.append( ", attributeName=" );
- sb.append( attributeName );
- sb.append( ", param=" );
- sb.append( param );
- sb.append( "]" );
- return ( sb.toString() );
+ return format( "ObjectParamRule[paramIndex=%s, attributeName=%s,
param=%s]", paramIndex, attributeName, param );
}
}
Modified:
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/PathCallParamRule.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/PathCallParamRule.java?rev=1139092&r1=1139091&r2=1139092&view=diff
==============================================================================
---
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/PathCallParamRule.java
(original)
+++
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/PathCallParamRule.java
Thu Jun 23 22:19:54 2011
@@ -19,6 +19,8 @@ package org.apache.commons.digester3;
* under the License.
*/
+import static java.lang.String.format;
+
import org.xml.sax.Attributes;
/**
@@ -77,11 +79,7 @@ public class PathCallParamRule
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder( "PathCallParamRule[" );
- sb.append( "paramIndex=" );
- sb.append( paramIndex );
- sb.append( "]" );
- return ( sb.toString() );
+ return format( "PathCallParamRule[paramIndex=%s]", paramIndex );
}
}
Modified:
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java?rev=1139092&r1=1139091&r2=1139092&view=diff
==============================================================================
---
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java
(original)
+++
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java
Thu Jun 23 22:19:54 2011
@@ -19,6 +19,8 @@ package org.apache.commons.digester3;
* under the License.
*/
+import static java.lang.String.format;
+
import java.util.List;
import java.util.LinkedList;
import java.util.ArrayList;
@@ -317,15 +319,10 @@ public class SetNestedPropertiesRule
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder( "SetNestedPropertiesRule[" );
- sb.append( "allowUnknownChildElements=" );
- sb.append( allowUnknownChildElements );
- sb.append( ", trimData=" );
- sb.append( trimData );
- sb.append( ", elementNames=" );
- sb.append( elementNames );
- sb.append( "]" );
- return sb.toString();
+ return format( "SetNestedPropertiesRule[allowUnknownChildElements=%s,
trimData=%s, elementNames=%s]",
+ allowUnknownChildElements,
+ trimData,
+ elementNames );
}
// ----------------------------------------- local classes
Modified:
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java?rev=1139092&r1=1139091&r2=1139092&view=diff
==============================================================================
---
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java
(original)
+++
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java
Thu Jun 23 22:19:54 2011
@@ -19,6 +19,8 @@ package org.apache.commons.digester3;
* under the License.
*/
+import static java.lang.String.format;
+
import org.apache.commons.beanutils.MethodUtils;
/**
@@ -144,14 +146,18 @@ public class SetNextRule
{
if ( parent == null )
{
- getDigester().getLogger().debug( "[SetNextRule]{" +
getDigester().getMatch() + "} Call [NULL PARENT]."
- + methodName + "(" +
child + ")" );
+ getDigester().getLogger().debug( format( "[SetNextRule]{%s}
Call [NULL PARENT].%s(%s)",
+
getDigester().getMatch(),
+ methodName,
+ child ) );
}
else
{
- getDigester().getLogger().debug( "[SetNextRule]{" +
getDigester().getMatch() + "} Call "
- +
parent.getClass().getName() + "." + methodName + "(" + child
- + ")" );
+ getDigester().getLogger().debug( format( "[SetNextRule]{%s}
Call %s.%s(%s)",
+
getDigester().getMatch(),
+
parent.getClass().getName(),
+ methodName,
+ child ) );
}
}
@@ -182,13 +188,7 @@ public class SetNextRule
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder( "SetNextRule[" );
- sb.append( "methodName=" );
- sb.append( methodName );
- sb.append( ", paramType=" );
- sb.append( paramType );
- sb.append( "]" );
- return ( sb.toString() );
+ return format( "SetNextRule[methodName=%s, paramType=%s]", methodName,
paramType );
}
}
Modified:
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java?rev=1139092&r1=1139091&r2=1139092&view=diff
==============================================================================
---
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java
(original)
+++
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java
Thu Jun 23 22:19:54 2011
@@ -19,6 +19,8 @@ package org.apache.commons.digester3;
* under the License.
*/
+import static java.lang.String.format;
+
import java.util.HashMap;
import java.util.Map;
@@ -170,13 +172,10 @@ public class SetPropertiesRule
if ( getDigester().getLogger().isDebugEnabled() )
{
- getDigester().getLogger().debug( "[SetPropertiesRule]{"
- + getDigester().getMatch()
- + "} Setting property '"
- + attributeName
- + "' to '"
- + value
- + "'" );
+ getDigester().getLogger().debug( format(
"[SetPropertiesRule]{%s} Setting property '%s' to '%s'",
+
getDigester().getMatch(),
+ attributeName,
+ attributeName) );
}
if ( ( !ignoreMissingProperty ) && ( attributeName != null ) )
@@ -220,13 +219,14 @@ public class SetPropertiesRule
{
if ( top != null )
{
- getDigester().getLogger().debug( "[SetPropertiesRule]{" +
getDigester().getMatch() + "} Set "
- +
top.getClass().getName() + " properties" );
+ getDigester().getLogger().debug( format(
"[SetPropertiesRule]{%s} Set '%s' properties",
+
getDigester().getMatch(),
+
top.getClass().getName() ) );
}
else
{
- getDigester().getLogger().debug( "[SetPropertiesRule]{" +
getDigester().getMatch()
- + "} Set NULL properties"
);
+ getDigester().getLogger().debug( format(
"[SetPropertiesRule]{%s} Set NULL properties",
+
getDigester().getMatch() ) );
}
}
BeanUtils.populate( top, values );
@@ -249,9 +249,7 @@ public class SetPropertiesRule
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder( "SetPropertiesRule[" );
- sb.append( "]" );
- return ( sb.toString() );
+ return format( "SetPropertiesRule[aliases=%s,
ignoreMissingProperty=%s]", aliases, ignoreMissingProperty );
}
/**
Modified:
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java?rev=1139092&r1=1139091&r2=1139092&view=diff
==============================================================================
---
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java
(original)
+++
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java
Thu Jun 23 22:19:54 2011
@@ -19,6 +19,8 @@ package org.apache.commons.digester3;
* under the License.
*/
+import static java.lang.String.format;
+
import java.beans.PropertyDescriptor;
import org.apache.commons.beanutils.BeanUtils;
@@ -102,9 +104,11 @@ public class SetPropertyRule
// Log some debugging information
if ( getDigester().getLogger().isDebugEnabled() )
{
- getDigester().getLogger().debug( "[SetPropertyRule]{" +
getDigester().getMatch() + "} Set "
- + top.getClass().getName() +
" property " + actualName + " to "
- + actualValue );
+ getDigester().getLogger().debug( format( "[SetPropertiesRule]{%s}
Set %s property %s to %s",
+ getDigester().getMatch(),
+ top.getClass().getName(),
+ actualName,
+ actualValue ) );
}
// Force an exception if the property does not exist
@@ -140,13 +144,7 @@ public class SetPropertyRule
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder( "SetPropertyRule[" );
- sb.append( "name=" );
- sb.append( name );
- sb.append( ", value=" );
- sb.append( value );
- sb.append( "]" );
- return ( sb.toString() );
+ return format( "SetPropertyRule[name=%s, value=%s]", name, value );
}
}
Modified:
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java?rev=1139092&r1=1139091&r2=1139092&view=diff
==============================================================================
---
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java
(original)
+++
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java
Thu Jun 23 22:19:54 2011
@@ -19,6 +19,8 @@ package org.apache.commons.digester3;
* under the License.
*/
+import static java.lang.String.format;
+
import org.apache.commons.beanutils.MethodUtils;
/**
@@ -138,14 +140,18 @@ public class SetRootRule
{
if ( parent == null )
{
- getDigester().getLogger().debug( "[SetRootRule]{" +
getDigester().getMatch() + "} Call [NULL ROOT]."
- + methodName + "(" +
child + ")" );
+ getDigester().getLogger().debug( format( "[SetRootRule]{%s}
Call [NULL ROOT].%s(%s)",
+
getDigester().getMatch(),
+ methodName,
+ child ) );
}
else
{
- getDigester().getLogger().debug( "[SetRootRule]{" +
getDigester().getMatch() + "} Call "
- +
parent.getClass().getName() + "." + methodName + "(" + child
- + ")" );
+ getDigester().getLogger().debug( format( "[SetRootRule]{%s}
Call %s.%s(%s)",
+
getDigester().getMatch(),
+
parent.getClass().getName(),
+ methodName,
+ child ) );
}
}
@@ -176,13 +182,7 @@ public class SetRootRule
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder( "SetRootRule[" );
- sb.append( "methodName=" );
- sb.append( methodName );
- sb.append( ", paramType=" );
- sb.append( paramType );
- sb.append( "]" );
- return ( sb.toString() );
+ return format( "SetRootRule[methodName=%s, paramType=%s]", methodName,
paramType );
}
}
Modified:
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java?rev=1139092&r1=1139091&r2=1139092&view=diff
==============================================================================
---
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java
(original)
+++
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java
Thu Jun 23 22:19:54 2011
@@ -19,6 +19,8 @@ package org.apache.commons.digester3;
* under the License.
*/
+import static java.lang.String.format;
+
import org.apache.commons.beanutils.MethodUtils;
/**
@@ -177,13 +179,7 @@ public class SetTopRule
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder( "SetTopRule[" );
- sb.append( "methodName=" );
- sb.append( methodName );
- sb.append( ", paramType=" );
- sb.append( paramType );
- sb.append( "]" );
- return ( sb.toString() );
+ return format( "SetTopRule[methodName=%s, paramType=%s]", methodName,
paramType );
}
}
