Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0B4D2200B27 for ; Wed, 22 Jun 2016 15:29:22 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 084AC160A36; Wed, 22 Jun 2016 13:29:22 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A3EC6160A24 for ; Wed, 22 Jun 2016 15:29:20 +0200 (CEST) Received: (qmail 24797 invoked by uid 500); 22 Jun 2016 13:29:19 -0000 Mailing-List: contact commits-help@velocity.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@velocity.apache.org Delivered-To: mailing list commits@velocity.apache.org Received: (qmail 24788 invoked by uid 99); 22 Jun 2016 13:29:19 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jun 2016 13:29:19 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 3290F1A5222 for ; Wed, 22 Jun 2016 13:29:19 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.374 X-Spam-Level: X-Spam-Status: No, score=0.374 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 2kc1wRnvQO-h for ; Wed, 22 Jun 2016 13:29:13 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id 6E1DA5FBDE for ; Wed, 22 Jun 2016 13:29:13 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 7DFE1E0069 for ; Wed, 22 Jun 2016 13:29:12 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 22C213A031D for ; Wed, 22 Jun 2016 13:29:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1749696 - in /velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity: runtime/ runtime/directive/ runtime/parser/node/ runtime/resource/ runtime/resource/loader/ util/introspection/ Date: Wed, 22 Jun 2016 13:29:11 -0000 To: commits@velocity.apache.org From: cbrisson@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160622132912.22C213A031D@svn01-us-west.apache.org> archived-at: Wed, 22 Jun 2016 13:29:22 -0000 Author: cbrisson Date: Wed Jun 22 13:29:11 2016 New Revision: 1749696 URL: http://svn.apache.org/viewvc?rev=1749696&view=rev Log: fix some parametrized logger messages for slf4j '{}' placeholders, and add parametrization when possible Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Block.java velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.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/DataSourceResourceLoader.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/JarHolder.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/ResourceLoader.java velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/AbstractChainableUberspector.java velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureIntrospectorImpl.java velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/SecureUberspector.java velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java?rev=1749696&r1=1749695&r2=1749696&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java Wed Jun 22 13:29:11 2016 @@ -427,7 +427,7 @@ public class RuntimeInstance implements if (log.isDebugEnabled()) { - log.debug("Default Properties File: " + + log.debug("Default Properties File: {}", new File(DEFAULT_RUNTIME_PROPERTIES).getPath()); } @@ -984,7 +984,7 @@ public class RuntimeInstance implements { String directiveClass = (String) directiveClasses.nextElement(); loadDirective(directiveClass); - log.debug("Loaded System Directive: " + directiveClass); + log.debug("Loaded System Directive: {}", directiveClass); } /* @@ -998,7 +998,7 @@ public class RuntimeInstance implements loadDirective(userdirective[i]); if (log.isDebugEnabled()) { - log.debug("Loaded User Directive: " + userdirective[i]); + log.debug("Loaded User Directive: {}", userdirective[i]); } } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java?rev=1749696&r1=1749695&r2=1749696&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java Wed Jun 22 13:29:11 2016 @@ -151,9 +151,7 @@ public class VelocimacroFactory if (libfiles == null) { - log.debug("\"" + RuntimeConstants.VM_LIBRARY + - "\" is not set. Trying default library: " + - RuntimeConstants.VM_LIBRARY_DEFAULT); + log.debug("\"{}\" is not set. Trying default library: {}", RuntimeConstants.VM_LIBRARY, RuntimeConstants.VM_LIBRARY_DEFAULT); // try the default library. if (rsvc.getLoaderNameForResource(RuntimeConstants.VM_LIBRARY_DEFAULT) != null) @@ -195,7 +193,7 @@ public class VelocimacroFactory vmManager.setRegisterFromLib(true); - log.debug("adding VMs from VM library : " + lib); + log.debug("adding VMs from VM library : {}", lib); try { @@ -466,7 +464,7 @@ public class VelocimacroFactory } if (log.isDebugEnabled()) { - log.debug("added VM "+name+": source="+sourceTemplate); + log.debug("added VM {}: source={}", name, sourceTemplate); } return true; } @@ -501,7 +499,7 @@ public class VelocimacroFactory */ if (!addNewAllowed) { - log.warn("VM addition rejected : "+name+" : inline VMs not allowed."); + log.warn("VM addition rejected : {} : inline VelociMacros not allowed.", name); return false; } @@ -526,7 +524,7 @@ public class VelocimacroFactory * some macro */ if (log.isDebugEnabled()) - log.debug("VM addition rejected : "+name+" : inline not allowed to replace existing VM"); + log.debug("VM addition rejected : {} : inline not allowed to replace existing VM", name); return false; } } @@ -617,7 +615,7 @@ public class VelocimacroFactory if (ft > tt) { - log.debug("auto-reloading VMs from VM library : " + lib); + log.debug("auto-reloading VMs from VM library : {}", lib); /* * when there are VMs in a library that invoke each other, there are Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Block.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Block.java?rev=1749696&r1=1749695&r2=1749696&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Block.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Block.java Wed Jun 22 13:29:11 2016 @@ -84,9 +84,8 @@ public abstract class Block extends Dire } catch (IOException e) { - String msg = "Failed to render " + id(context) + " to writer " - + " at " + StringUtils.formatFileString(this); - + String msg = "Failed to render " + id(context) + " to writer at " + + StringUtils.formatFileString(this); log.error(msg, e); throw new RuntimeException(msg, e); } @@ -152,8 +151,7 @@ public abstract class Block extends Dire * use recursive block definitions and having problems * pulling it off properly. */ - parent.log.debug("Max recursion depth reached for " + parent.id(context) - + " at " + StringUtils.formatFileString(parent)); + parent.log.debug("Max recursion depth reached for {} at {}", parent.id(context), StringUtils.formatFileString(parent)); depth--; return false; } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java?rev=1749696&r1=1749695&r2=1749696&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java Wed Jun 22 13:29:11 2016 @@ -428,8 +428,9 @@ public class ASTReference extends Simple { if (referenceType != QUIET_REFERENCE) { - log.error("Prepend the reference with '$!' e.g., $!" + literal().substring(1) - + " if you want Velocity to ignore the reference when it evaluates to null"); + log.error("Prepend the reference with '$!' e.g., $!{}" + + " if you want Velocity to ignore the reference when it evaluates to null", + literal().substring(1)); if (value == null) { throw new VelocityException("Reference " + literal() @@ -467,9 +468,8 @@ public class ASTReference extends Simple if (logOnNull && referenceType != QUIET_REFERENCE && log.isDebugEnabled()) { - log.debug("Null reference [template '" + getTemplateName() - + "', line " + this.getLine() + ", column " + this.getColumn() + "] : " - + this.literal() + " cannot be resolved."); + log.debug("Null reference [template '{}', line {}, column {}] : {} cannot be resolved.", + getTemplateName(), this.getLine(), this.getColumn(), this.literal()); } return true; } @@ -591,9 +591,8 @@ public class ASTReference extends Simple if (result == null) { - String msg = "reference set is not a valid reference at " - + StringUtils.formatFileString(uberInfo); - log.error(msg); + log.error("reference set is not a valid reference at {}", + StringUtils.formatFileString(uberInfo)); return false; } @@ -615,10 +614,8 @@ public class ASTReference extends Simple jjtGetChild(i+1).getLine(), jjtGetChild(i+1).getColumn()); } - String msg = "reference set is not a valid reference at " - + StringUtils.formatFileString(uberInfo); - log.error(msg); - + log.error("reference set is not a valid reference at {}", + StringUtils.formatFileString(uberInfo)); return false; } } @@ -976,8 +973,8 @@ public class ASTReference extends Simple } catch(RuntimeException e) { - log.error("Exception calling reference $" + variable + " at " - + StringUtils.formatFileString(uberInfo)); + log.error("Exception calling reference ${} at {}", + variable, StringUtils.formatFileString(uberInfo)); throw e; } @@ -985,8 +982,8 @@ public class ASTReference extends Simple { if (!context.containsKey(variable)) { - log.error("Variable $" + variable + " has not been set at " - + StringUtils.formatFileString(uberInfo)); + log.error("Variable ${} has not been set at {}", + variable, StringUtils.formatFileString(uberInfo)); throw new MethodInvocationException("Variable $" + variable + " has not been set", null, identifier, uberInfo.getTemplateName(), uberInfo.getLine(), uberInfo.getColumn()); 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=1749696&r1=1749695&r2=1749696&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 Wed Jun 22 13:29:11 2016 @@ -107,7 +107,7 @@ public class ResourceManagerImpl this.rsvc = rsvc; log = rsvc.getLog(); - log.trace("ResourceManager initializing: %s", this.getClass()); + log.trace("ResourceManager initializing: {}", this.getClass()); assembleResourceLoaderInitializers(); @@ -240,7 +240,7 @@ public class ResourceManagerImpl if (loaderConfiguration == null) { log.debug("ResourceManager : No configuration information found "+ - "for resource loader named '%s' (id is %s). Skipping it...", + "for resource loader named '{}' (id is {}). Skipping it...", loaderName, loaderID); continue; } @@ -448,7 +448,7 @@ public class ResourceManagerImpl if (logWhenFound && log.isDebugEnabled()) { - log.debug("ResourceManager: found %s with loader ", + log.debug("ResourceManager: found {} with loader {}", resourceName, resourceLoader.getClassName()); } @@ -536,7 +536,7 @@ public class ResourceManagerImpl if (!org.apache.commons.lang3.StringUtils.equals(resource.getEncoding(), encoding)) { - log.warn("Declared encoding for template '%s' is different on reload. Old = '%s' New = '%s'", + log.warn("Declared encoding for template '{}' is different on reload. Old = '{}' New = '{}'", resource.getName(), resource.getEncoding(), encoding); resource.setEncoding(encoding); } Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java?rev=1749696&r1=1749695&r2=1749696&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java Wed Jun 22 13:29:11 2016 @@ -151,11 +151,8 @@ public class DataSourceResourceLoader ex { if (log.isDebugEnabled()) { - log.debug("DataSourceResourceLoader: using dataSource instance with table \"" - + tableName + "\""); - log.debug("DataSourceResourceLoader: using columns \"" - + keyColumn + "\", \"" + templateColumn + "\" and \"" - + timestampColumn + "\""); + log.debug("DataSourceResourceLoader: using dataSource instance with table \"{}\"", tableName); + log.debug("DataSourceResourceLoader: using columns \"{}\", \"{}\" and \"{}\"", keyColumn, templateColumn, timestampColumn); } log.trace("DataSourceResourceLoader initialized."); @@ -164,11 +161,8 @@ public class DataSourceResourceLoader ex { if (log.isDebugEnabled()) { - log.debug("DataSourceResourceLoader: using \"" + dataSourceName - + "\" datasource with table \"" + tableName + "\""); - log.debug("DataSourceResourceLoader: using columns \"" - + keyColumn + "\", \"" + templateColumn + "\" and \"" - + timestampColumn + "\""); + log.debug("DataSourceResourceLoader: using \"{}\" datasource with table \"{}\"", dataSourceName, tableName); + log.debug("DataSourceResourceLoader: using columns \"{}\", \"{}\" and \"{}\"", keyColumn, templateColumn, timestampColumn); } log.trace("DataSourceResourceLoader initialized."); 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=1749696&r1=1749695&r2=1749696&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 Wed Jun 22 13:29:11 2016 @@ -85,7 +85,7 @@ public class FileResourceLoader extends if (log.isDebugEnabled()) { - log.debug("Do unicode file recognition: " + unicode); + log.debug("Do unicode file recognition: {}", unicode); } if (log.isDebugEnabled()) @@ -97,7 +97,7 @@ public class FileResourceLoader extends int sz = paths.size(); for( int i=0; i < sz; i++) { - log.debug("FileResourceLoader : adding path '" + (String) paths.get(i) + "'"); + log.debug("FileResourceLoader : adding path '{}'", (String)paths.get(i)); } log.trace("FileResourceLoader : initialization complete."); } @@ -208,8 +208,7 @@ public class FileResourceLoader extends } catch (Exception ioe) { - String msg = "Exception while checking for template " + name; - log.debug(msg, ioe); + log.debug("Exception while checking for template {}", name); } } return false; @@ -247,7 +246,7 @@ public class FileResourceLoader extends if (log.isDebugEnabled()) { - log.debug("File Encoding for " + file + " is: " + uis.getEncodingFromStream()); + log.debug("File Encoding for {} is: {}", file, uis.getEncodingFromStream()); } return new BufferedInputStream(uis); Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java?rev=1749696&r1=1749695&r2=1749696&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java Wed Jun 22 13:29:11 2016 @@ -61,7 +61,7 @@ public class JarHolder if (log.isDebugEnabled()) { - log.debug("JarHolder: initialized JAR: " + urlpath); + log.debug("JarHolder: initialized JAR: {}", urlpath); } } @@ -74,7 +74,7 @@ public class JarHolder { if (log.isDebugEnabled()) { - log.debug("JarHolder: attempting to connect to " + urlpath); + log.debug("JarHolder: attempting to connect to {}", urlpath); } URL url = new URL( urlpath ); conn = (JarURLConnection) url.openConnection(); 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=1749696&r1=1749695&r2=1749696&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 Wed Jun 22 13:29:11 2016 @@ -94,7 +94,7 @@ public class JarResourceLoader extends R if (paths != null) { - log.debug("JarResourceLoader # of paths : " + paths.size() ); + log.debug("JarResourceLoader # of paths : {}", paths.size() ); for ( int i=0; i