Author: cbrisson
Date: Thu Jan 26 00:53:09 2017
New Revision: 1780296
URL: http://svn.apache.org/viewvc?rev=1780296&view=rev
Log:
[engine] fix slf4j params non-usage
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/Template.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/Template.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/Template.java?rev=1780296&r1=1780295&r2=1780296&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/Template.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/Template.java
Thu Jan 26 00:53:09 2017
@@ -325,9 +325,8 @@ public class Template extends Resource
/*
* the macro lib wasn't found. Note it and throw
*/
- log.error("template.merge(): " +
- "cannot find template " +
- (String) macroLibraries.get(i));
+ log.error("template.merge(): cannot find template {}",
+ (String)macroLibraries.get(i));
throw re;
}
catch (ParseErrorException pe)
@@ -336,9 +335,8 @@ public class Template extends Resource
* the macro lib was found, but didn't parse - syntax
error
* note it and throw
*/
- rsvc.getLog("parser").error("template.merge(): " +
- "syntax error in template " +
- (String) macroLibraries.get(i) + ": {}",
pe.getMessage(), pe);
+ rsvc.getLog("parser").error("template.merge(): syntax
error in template {}: {}",
+
(String)macroLibraries.get(i), pe.getMessage(), pe);
throw pe;
}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java?rev=1780296&r1=1780295&r2=1780296&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java
Thu Jan 26 00:53:09 2017
@@ -140,8 +140,8 @@ public abstract class EscapeReference im
}
catch (PatternSyntaxException E)
{
- log.error("Invalid regular expression '" + matchRegExp
- + "'. No escaping will be performed.", E);
+ log.error("Invalid regular expression '{}'. No escaping will
be performed.",
+ matchRegExp, E);
matchRegExp = null;
}
}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java?rev=1780296&r1=1780295&r2=1780296&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
Thu Jan 26 00:53:09 2017
@@ -96,7 +96,7 @@ public class IncludeNotFound implements
/**
* can't find not found, so display nothing
*/
- log.error("Can't find include not found page: " + notfound);
+ log.error("Can't find include not found page: {}", notfound);
return null;
}
}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java?rev=1780296&r1=1780295&r2=1780296&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java
Thu Jan 26 00:53:09 2017
@@ -55,7 +55,7 @@ public class ParserPoolImpl implements P
if (log.isDebugEnabled())
{
- log.debug("Created '" + max + "' parsers.");
+ log.debug("Created '{}' parsers.", max);
}
}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java?rev=1780296&r1=1780295&r2=1780296&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java
Thu Jan 26 00:53:09 2017
@@ -242,8 +242,8 @@ public class Include extends InputBase
/*
* the arg wasn't found. Note it and throw
*/
- log.error("#include(): cannot find resource '" + arg +
- "', called at " +
StringUtils.formatFileString(this));
+ log.error("#include(): cannot find resource '{}', called at {}",
+ arg, StringUtils.formatFileString(this));
throw rnfe;
}
@@ -252,8 +252,8 @@ public class Include extends InputBase
*/
catch( RuntimeException e )
{
- log.error("#include(): arg = '" + arg +
- "', called at " +
StringUtils.formatFileString(this));
+ log.error("#include(): arg = '{}', called at {}",
+ arg, StringUtils.formatFileString(this));
throw e;
}
catch (Exception e)
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java?rev=1780296&r1=1780295&r2=1780296&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java
Thu Jan 26 00:53:09 2017
@@ -151,8 +151,7 @@ public class Parse extends InputBase
Object value = node.jjtGetChild(0).value( context );
if (value == null && log.isDebugEnabled())
{
- log.debug("#parse(): null argument at " +
- StringUtils.formatFileString(this));
+ log.debug("#parse(): null argument at {}",
StringUtils.formatFileString(this));
}
/*
@@ -198,9 +197,9 @@ public class Parse extends InputBase
{
path.append( " > " + templateStack[i] );
}
- log.error("Max recursion depth reached (" +
- templateStack.length + ')' + " File
stack:" +
- path);
+ log.error("Max recursion depth reached ({}) File stack: {}",
+ templateStack.length, path);
+
return false;
}
}
@@ -220,8 +219,8 @@ public class Parse extends InputBase
/*
* the arg wasn't found. Note it and throw
*/
- log.error("#parse(): cannot find template '" + arg +
- "', called at " +
StringUtils.formatFileString(this));
+ log.error("#parse(): cannot find template '{}', called at {}",
+ arg, StringUtils.formatFileString(this));
throw rnfe;
}
catch ( ParseErrorException pee )
@@ -230,8 +229,8 @@ public class Parse extends InputBase
* the arg was found, but didn't parse - syntax error
* note it and throw
*/
- log.error("#parse(): syntax error in #parse()-ed template '"
- + arg + "', called at " +
StringUtils.formatFileString(this));
+ log.error("#parse(): syntax error in #parse()-ed template '{}',
called at {}",
+ arg, StringUtils.formatFileString(this));
throw pee;
}
/**
@@ -239,11 +238,11 @@ public class Parse extends InputBase
*/
catch( RuntimeException e )
{
- log.error("Exception rendering #parse(" + arg + ") at " +
- StringUtils.formatFileString(this));
+ log.error("Exception rendering #parse({}) at {}",
+ arg, StringUtils.formatFileString(this));
throw e;
}
- catch ( Exception e)
+ catch ( Exception e )
{
String msg = "Exception rendering #parse(" + arg + ") at " +
StringUtils.formatFileString(this);
@@ -294,8 +293,8 @@ public class Parse extends InputBase
/**
* Log #parse errors so the user can track which file called which.
*/
- log.error("Exception rendering #parse(" + arg + ") at " +
- StringUtils.formatFileString(this));
+ log.error("Exception rendering #parse({}) at {}",
+ arg, StringUtils.formatFileString(this));
throw e;
}
catch ( Exception e )
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java?rev=1780296&r1=1780295&r2=1780296&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java
Thu Jan 26 00:53:09 2017
@@ -342,14 +342,14 @@ public class RuntimeMacro extends Direct
* especially important for multiple macro call levels.
* this is also true for the following catch blocks.
*/
- log.error("Exception in macro #" + macroName + " called at " +
- StringUtils.formatFileString(node));
+ log.error("Exception in macro #{} called at {}",
+ macroName, StringUtils.formatFileString(node));
throw e;
}
catch (IOException e)
{
- log.error("Exception in macro #" + macroName + " called at " +
- StringUtils.formatFileString(node));
+ log.error("Exception in macro #{} called at {}",
+ macroName, StringUtils.formatFileString(node));
throw e;
}
finally
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java?rev=1780296&r1=1780295&r2=1780296&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
Thu Jan 26 00:53:09 2017
@@ -256,13 +256,9 @@ public class VelocimacroProxy extends Di
+ macroArgs.get(0).name + " accepts at most " +
(macroArgs.size()-1)
+ " at " + StringUtils.formatFileString(node));
}
- else if (log.isDebugEnabled())
- {
- // Backward compatibility logging, Mainly for
MacroForwardDefinedTestCase
- log.debug("VM #" + macroArgs.get(0).name
- + ": too many arguments to macro. Wanted " +
(macroArgs.size()-1)
- + " got " + callArgNum);
- }
+ // Backward compatibility logging, Mainly for
MacroForwardDefinedTestCase
+ log.debug("VM #{}: too many arguments to macro. Wanted {} got {}",
+ macroArgs.get(0).name, macroArgs.size() - 1, callArgNum);
}
}
@@ -346,12 +342,8 @@ public class VelocimacroProxy extends Di
else
{
// Backward compatibility logging, Mainly for
MacroForwardDefinedTestCase
- if (log.isDebugEnabled())
- {
- log.debug("VM #" + macroArgs.get(0).name
- + ": too few arguments to macro. Wanted " +
(macroArgs.size()-1)
- + " got " + callArgNum);
- }
+ log.debug("VM #{}: too few arguments to macro. Wanted {} got
{}",
+ macroArgs.get(0).name, macroArgs.size() - 1,
callArgNum);
break;
}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java?rev=1780296&r1=1780295&r2=1780296&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java
Thu Jan 26 00:53:09 2017
@@ -115,8 +115,7 @@ public class ResourceCacheImpl implement
lruCache.putAll(cache);
cache = lruCache;
}
- rsvc.getLog().debug("initialized (" + this.getClass() + ") with " +
- cache.getClass() + " cache map.");
+ rsvc.getLog().debug("initialized ({}) with {} cache map.",
this.getClass(), cache.getClass());
}
/**
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java?rev=1780296&r1=1780295&r2=1780296&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
Thu Jan 26 00:53:09 2017
@@ -355,8 +355,7 @@ public class ResourceManagerImpl
}
catch (ResourceNotFoundException rnfe)
{
- log.error("ResourceManager : unable to find resource '" +
- resourceName + "' in any resource loader.");
+ log.error("ResourceManager : unable to find resource '{}' in
any resource loader.", resourceName);
throw rnfe;
}
catch (ParseErrorException pee)
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java?rev=1780296&r1=1780295&r2=1780296&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
Thu Jan 26 00:53:09 2017
@@ -125,7 +125,7 @@ public class FileResourceLoader extends
" contains .. and may be trying to access " +
"content outside of template root. Rejected.";
- log.error("FileResourceLoader : " + msg);
+ log.error("FileResourceLoader : {}", msg);
throw new ResourceNotFoundException ( msg );
}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java?rev=1780296&r1=1780295&r2=1780296&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
Thu Jan 26 00:53:09 2017
@@ -195,7 +195,7 @@ public class JarResourceLoader extends R
" contains .. and may be trying to access " +
"content outside of template root. Rejected.";
- log.error( "JarResourceLoader : " + msg );
+ log.error( "JarResourceLoader : {}", msg );
throw new ResourceNotFoundException ( msg );
}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java?rev=1780296&r1=1780295&r2=1780296&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoaderFactory.java
Thu Jan 26 00:53:09 2017
@@ -45,8 +45,7 @@ public class ResourceLoaderFactory
{
loader = (ResourceLoader) ClassUtils.getNewInstance(
loaderClassName );
- rs.getLog().debug("ResourceLoader instantiated: "
- + loader.getClass().getName());
+ rs.getLog().debug("ResourceLoader instantiated: {}",
loader.getClass().getName());
return loader;
}
