Author: cbrisson
Date: Tue Nov 15 10:34:58 2016
New Revision: 1769770
URL: http://svn.apache.org/viewvc?rev=1769770&view=rev
Log:
[tools] still fixing tools logging:
- LogTool initialization is now redundant
- tools should use a getter which ensure the logger is not null
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ClassTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/FieldTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LogTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LoopTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MarkupTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/RenderTool.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/SafeConfig.java
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/SortTool.java
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ClassTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ClassTool.java?rev=1769770&r1=1769769&r2=1769770&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ClassTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ClassTool.java
Tue Nov 15 10:34:58 2016
@@ -128,7 +128,7 @@ public class ClassTool extends SafeConfi
}
catch (Exception e)
{
- log.error("Could not load Class for {}", name);
+ getLog().error("Could not load Class for {}", name);
return null;
}
}
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/FieldTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/FieldTool.java?rev=1769770&r1=1769769&r2=1769770&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/FieldTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/FieldTool.java
Tue Nov 15 10:34:58 2016
@@ -146,7 +146,7 @@ public class FieldTool extends SafeConfi
}
catch (Exception e)
{
- log.debug("Unable to retrieve value of field at {}", name, e);
+ getLog().debug("Unable to retrieve value of field at {}",
name, e);
}
}
// otherwise, we should have stored the value directly
@@ -227,9 +227,9 @@ public class FieldTool extends SafeConfi
if (Modifier.isStatic(mod) && Modifier.isPublic(mod))
{
// make it easy to debug key collisions
- if (log.isDebugEnabled() &&
results.containsKey(field.getName()))
+ if (getLog().isDebugEnabled() &&
results.containsKey(field.getName()))
{
- log.debug("{} is being overridden by {}", field.getName(),
clazz.getName());
+ getLog().debug("{} is being overridden by {}",
field.getName(), clazz.getName());
}
// if the field is final
if (Modifier.isFinal(mod))
@@ -261,7 +261,7 @@ public class FieldTool extends SafeConfi
}
catch(IllegalAccessException iae)
{
- log.warn("IllegalAccessException while trying to access {}",
field.getName(), iae);
+ getLog().warn("IllegalAccessException while trying to access {}",
field.getName(), iae);
return null;
}
}
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java?rev=1769770&r1=1769769&r2=1769770&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LinkTool.java
Tue Nov 15 10:34:58 2016
@@ -242,7 +242,7 @@ public class LinkTool extends SafeConfig
catch (CloneNotSupportedException e)
{
String msg = "Could not properly clone " + getClass();
- log.error(msg, e);
+ getLog().error(msg, e);
throw new RuntimeException(msg, e);
}
}
@@ -349,7 +349,7 @@ public class LinkTool extends SafeConfig
}
catch (NumberFormatException nfe)
{
- log.error("Could not convert '{}' to int", obj, nfe);
+ getLog().error("Could not convert '{}' to int", obj, nfe);
this.port = -2; // use this to mean error
}
}
@@ -904,7 +904,7 @@ public class LinkTool extends SafeConfig
}
catch (Exception e)
{
- log.error("Could not convert '{}' to URI", obj, e);
+ getLog().error("Could not convert '{}' to URI", obj, e);
return null;
}
}
@@ -949,7 +949,7 @@ public class LinkTool extends SafeConfig
}
catch (Exception e)
{
- log.error("Could not create URI", e);
+ getLog().error("Could not create URI", e);
}
return null;
}
@@ -1741,7 +1741,7 @@ public class LinkTool extends SafeConfig
}
catch (UnsupportedEncodingException uee)
{
- log.error("Character encoding '{}' is unsupported", charset, uee);
+ getLog().error("Character encoding '{}' is unsupported", charset,
uee);
return null;
}
}
@@ -1764,7 +1764,7 @@ public class LinkTool extends SafeConfig
}
catch (UnsupportedEncodingException uee)
{
- log.error("Character encoding '{}' is unsupported", charset, uee);
+ getLog().error("Character encoding '{}' is unsupported", charset,
uee);
return null;
}
}
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LogTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LogTool.java?rev=1769770&r1=1769769&r2=1769770&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LogTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LogTool.java
Tue Nov 15 10:34:58 2016
@@ -58,43 +58,28 @@ import org.slf4j.LoggerFactory;
@ValidScope(Scope.APPLICATION)
public class LogTool extends SafeConfig
{
- public static final String LOGGER_NAME_KEY = "loggerName";
-
- /**
- * configure the logger
- */
- protected void configure(ValueParser values)
- {
- String loggerName = values.getString(LOGGER_NAME_KEY);
- if (loggerName != null)
- {
- /* override defaultly configured logger */
- log = LoggerFactory.getLogger(loggerName);
- }
- }
-
public void error(String message)
{
- log.error(message);
+ getLog().error(message);
}
public void warn(String message)
{
- log.warn(message);
+ getLog().warn(message);
}
public void info(String message)
{
- log.info(message);
+ getLog().info(message);
}
public void debug(String message)
{
- log.debug(message);
+ getLog().debug(message);
}
public void trace(String message)
{
- log.trace(message);
+ getLog().trace(message);
}
}
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LoopTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LoopTool.java?rev=1769770&r1=1769769&r2=1769770&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LoopTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/LoopTool.java
Tue Nov 15 10:34:58 2016
@@ -588,7 +588,7 @@ public class LoopTool extends SafeConfig
}
catch (Exception e)
{
- log.error("Exception while getting Iterator:", e);
+ getLog().error("Exception while getting Iterator:", e);
}
return null;
}
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MarkupTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MarkupTool.java?rev=1769770&r1=1769769&r2=1769770&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MarkupTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/MarkupTool.java
Tue Nov 15 10:34:58 2016
@@ -77,7 +77,7 @@ public class MarkupTool extends SafeConf
{
if (isConfigLocked())
{
- log.error("setTab() failure: configuration is locked");
+ getLog().error("setTab() failure: configuration is locked");
}
else
{
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/RenderTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/RenderTool.java?rev=1769770&r1=1769769&r2=1769770&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/RenderTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/RenderTool.java
Tue Nov 15 10:34:58 2016
@@ -176,7 +176,7 @@ public class RenderTool extends SafeConf
}
else if (this.parseDepth != depth)
{
- log.error("Attempt was made to alter parse depth while config was
locked.");
+ getLog().error("Attempt was made to alter parse depth while config
was locked.");
}
}
@@ -196,7 +196,7 @@ public class RenderTool extends SafeConf
}
else if (this.context != context)
{
- log.error("Attempt was made to set a new context while config was
locked.");
+ getLog().error("Attempt was made to set a new context while config
was locked.");
}
}
@@ -223,7 +223,7 @@ public class RenderTool extends SafeConf
}
else if (this.catchExceptions != catchExceptions)
{
- log.error("Attempt was made to alter catchE while config was
locked.");
+ getLog().error("Attempt was made to alter catchE while config was
locked.");
}
}
@@ -295,7 +295,7 @@ public class RenderTool extends SafeConf
}
catch (Exception e)
{
- log.error("evaluation failed:", e);
+ getLog().error("evaluation failed:", e);
return null;
}
}
@@ -366,7 +366,7 @@ public class RenderTool extends SafeConf
else
{
// abort, log and return what we have so far
- log.error("recursion exceeded the maximum parse depth" +
+ getLog().error("recursion exceeded the maximum parse depth" +
" of {} on the following template: {}",
parseDepth, vtl);
return result;
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/SafeConfig.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/SafeConfig.java?rev=1769770&r1=1769769&r2=1769770&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/SafeConfig.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/SafeConfig.java
Tue Nov 15 10:34:58 2016
@@ -184,4 +184,20 @@ public class SafeConfig
}
}
}
+
+ protected Logger getLog()
+ {
+ if (log == null)
+ {
+ /* if logger hasn't been innitialized, fall back to class logger */
+ synchronized(this)
+ {
+ if (log == null)
+ {
+ log = LoggerFactory.getLogger(getClass());
+ }
+ }
+ }
+ return log;
+ }
}
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/SortTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/SortTool.java?rev=1769770&r1=1769769&r2=1769770&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/SortTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/SortTool.java
Tue Nov 15 10:34:58 2016
@@ -201,7 +201,7 @@ public class SortTool extends SafeConfig
else
{
// the object type is not supported
- log.error("object type not supported: {}", o == null ? "null" :
o.getClass().getName());
+ getLog().error("object type not supported: {}", o == null ? "null"
: o.getClass().getName());
return null;
}
}
@@ -245,7 +245,7 @@ public class SortTool extends SafeConfig
return sort((Map)object, properties);
}
// the object type is not supported
- log.error("object type not supported: {}", object == null ? "null" :
object.getClass().getName());
+ getLog().error("object type not supported: {}", object == null ?
"null" : object.getClass().getName());
return null;
}
@@ -280,7 +280,7 @@ public class SortTool extends SafeConfig
}
catch (Exception e)
{
- log.error("exception encountered while sorting: {}",
e.getMessage());
+ getLog().error("exception encountered while sorting: {}",
e.getMessage());
return null;
}
}
