Repository: tapestry-5 Updated Branches: refs/heads/master 3288d3767 -> 504f1ada7
don't use String.format for logging Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/504f1ada Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/504f1ada Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/504f1ada Branch: refs/heads/master Commit: 504f1ada79ec10080395a8d84e548e43ab51b532 Parents: 3288d37 Author: Jochen Kemnade <[email protected]> Authored: Thu Jul 14 11:51:36 2016 +0200 Committer: Jochen Kemnade <[email protected]> Committed: Thu Jul 14 11:51:36 2016 +0200 ---------------------------------------------------------------------- .../apache/tapestry5/corelib/components/Form.java | 5 ++--- .../services/ComponentInstanceResultProcessor.java | 2 +- .../services/DefaultRequestExceptionHandler.java | 6 +++--- .../internal/services/RequestPageCacheImpl.java | 2 +- .../services/assets/StackAssetRequestHandler.java | 4 ++-- .../internal/transform/ParameterWorker.java | 14 +++++++------- .../internal/AbstractReloadableObjectCreator.java | 15 ++++++--------- .../apache/tapestry5/ioc/internal/RegistryImpl.java | 4 ++-- .../ioc/internal/services/BridgeBuilder.java | 2 +- .../ioc/internal/services/PerthreadManagerImpl.java | 3 +-- .../ioc/internal/services/RegistryStartup.java | 4 ++-- .../internal/services/cron/PeriodicExecutorImpl.java | 5 +---- 12 files changed, 29 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/504f1ada/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java index 0102260..39451f7 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java @@ -392,9 +392,8 @@ public class Form implements ClientElement, FormValidationControl value = URLDecoder.decode(value, "UTF-8"); } catch (UnsupportedEncodingException e) { - logger.error(String.format( - "Enable to decode parameter value for parameter %s in form %s", - parameterName, form.getName()), e); + logger.error("Enable to decode parameter value for parameter {} in form {}", + parameterName, form.getName(), e); } writer.element("input", "type", "hidden", "name", parameterName, "value", value); writer.end(); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/504f1ada/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessor.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessor.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessor.java index 0e333f0..84048ef 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessor.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessor.java @@ -44,7 +44,7 @@ public class ComponentInstanceResultProcessor implements ComponentEventResultPro if (resources.getContainer() != null) { - logger.warn(String.format("Component %s was returned from an event handler method, but is not a page component. The page containing the component will render the client response.", value.getComponentResources().getCompleteId())); + logger.warn("Component {} was returned from an event handler method, but is not a page component. The page containing the component will render the client response.", value.getComponentResources().getCompleteId()); } resultProcessor.processResultValue(resources.getPageName()); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/504f1ada/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java index 39c4bac..1055df5 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java @@ -224,8 +224,8 @@ public class DefaultRequestExceptionHandler implements RequestExceptionHandler // user's responsibility not to abuse the mechanism catch (Exception e) { - logger.warn(String.format("A new exception was thrown while trying to handle an instance of %s.", - exception.getClass().getName()), e); + logger.warn("A new exception was thrown while trying to handle an instance of {}.", + exception.getClass().getName(), e); // Nothing to do but delegate renderException(exception); } @@ -233,7 +233,7 @@ public class DefaultRequestExceptionHandler implements RequestExceptionHandler private void renderException(Throwable exception) throws IOException { - logger.error(String.format("Processing of request failed with uncaught exception: %s", exception), exception); + logger.error("Processing of request failed with uncaught exception: {}", exception, exception); // In the case where one of the contributed rules, above, changes the behavior, then we don't report the // exception. This is just for exceptions that are going to be rendered, real failures. http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/504f1ada/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCacheImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCacheImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCacheImpl.java index 7af9671..5493675 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCacheImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCacheImpl.java @@ -70,7 +70,7 @@ public class RequestPageCacheImpl implements RequestPageCache, Runnable page.detached(); } catch (Throwable t) { - logger.error(String.format("Error detaching page %s: %s", page, ExceptionUtils.toMessage(t)), t); + logger.error("Error detaching page {}: {}", page, ExceptionUtils.toMessage(t), t); } } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/504f1ada/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/StackAssetRequestHandler.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/StackAssetRequestHandler.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/StackAssetRequestHandler.java index 2c44691..91dc14f 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/StackAssetRequestHandler.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/assets/StackAssetRequestHandler.java @@ -79,7 +79,7 @@ public class StackAssetRequestHandler implements AssetRequestHandler if (!matcher.matches()) { - logger.warn(String.format("Unable to parse '%s' as an asset stack path", extraPath)); + logger.warn("Unable to parse '{}' as an asset stack path", extraPath); return false; } @@ -99,7 +99,7 @@ public class StackAssetRequestHandler implements AssetRequestHandler if (stack == null) { - logger.warn(String.format("JavaScript stack '%s' not found.", stackName)); + logger.warn("JavaScript stack '{}' not found.", stackName); return false; } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/504f1ada/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java index 9025fdc..1a2b6a8 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java @@ -316,7 +316,7 @@ public class ParameterWorker implements ComponentClassTransformWorker2 { if (logger.isDebugEnabled()) { - logger.debug(String.format("%s loading parameter %s", icr.getCompleteId(), parameterName)); + logger.debug("{} loading parameter {}", icr.getCompleteId(), parameterName); } // If it's bound at this point, that's because of an explicit binding @@ -326,8 +326,8 @@ public class ParameterWorker implements ComponentClassTransformWorker2 { if (logger.isDebugEnabled()) { - logger.debug(String.format("%s parameter %s not yet bound", icr.getCompleteId(), - parameterName)); + logger.debug("{} parameter {} not yet bound", icr.getCompleteId(), + parameterName); } // Otherwise, construct a default binding, or use one provided from @@ -337,8 +337,8 @@ public class ParameterWorker implements ComponentClassTransformWorker2 if (logger.isDebugEnabled()) { - logger.debug(String.format("%s parameter %s bound to default %s", icr.getCompleteId(), - parameterName, binding)); + logger.debug("{} parameter {} bound to default {}", icr.getCompleteId(), + parameterName, binding); } if (binding != null) @@ -423,8 +423,8 @@ public class ParameterWorker implements ComponentClassTransformWorker2 if (logger.isDebugEnabled()) { - logger.debug(String.format("%s invoking method %s to obtain default for parameter %s", - icr.getCompleteId(), defaultMethodHandle, parameterName)); + logger.debug("{} invoking method {} to obtain default for parameter {}", + icr.getCompleteId(), defaultMethodHandle, parameterName); } MethodInvocationResult result = defaultMethodHandle.invoke(icr.getComponent()); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/504f1ada/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractReloadableObjectCreator.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractReloadableObjectCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractReloadableObjectCreator.java index 1bc2c91..1dfd262 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractReloadableObjectCreator.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractReloadableObjectCreator.java @@ -84,11 +84,8 @@ public abstract class AbstractReloadableObjectCreator implements ObjectCreator, return; } - if (logger.isDebugEnabled()) - { - logger.debug(String.format("Implementation class %s has changed and will be reloaded on next use.", - implementationClassName)); - } + logger.debug("Implementation class {} has changed and will be reloaded on next use.", + implementationClassName); changeTracker.clear(); @@ -150,7 +147,7 @@ public abstract class AbstractReloadableObjectCreator implements ObjectCreator, { if (logger.isDebugEnabled()) { - logger.debug(String.format("%s class %s.", firstTime ? "Loading" : "Reloading", implementationClassName)); + logger.debug("{} class {}.", firstTime ? "Loading" : "Reloading", implementationClassName); } loader = new PlasticClassLoader(baseClassLoader, this); @@ -177,7 +174,7 @@ public abstract class AbstractReloadableObjectCreator implements ObjectCreator, { if (!classesToLoad.contains(className)) { - logger.debug(String.format("Marking class %s to be (re-)loaded", className)); + logger.debug("Marking class {} to be (re-)loaded", className); classesToLoad.add(className); } @@ -192,7 +189,7 @@ public abstract class AbstractReloadableObjectCreator implements ObjectCreator, @Override public Class<?> loadAndTransformClass(String className) throws ClassNotFoundException { - logger.debug(String.format("BEGIN Analyzing %s", className)); + logger.debug("BEGIN Analyzing {}", className); Class<?> result; @@ -207,7 +204,7 @@ public abstract class AbstractReloadableObjectCreator implements ObjectCreator, trackClassFileChanges(className); - logger.debug(String.format(" END Analyzing %s", className)); + logger.debug(" END Analyzing {}", className); return result; } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/504f1ada/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java index 822d4be..b36fef3 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java @@ -1388,8 +1388,8 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro { if (logger.isDebugEnabled()) { - logger.debug(String.format("Service %s %s configuration: %s", - serviceDef.getServiceId(), type, configuration.toString())); + logger.debug("Service {} {} configuration: {}", + serviceDef.getServiceId(), type, configuration.toString()); } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/504f1ada/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java index ca15784..3de30f1 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java @@ -123,7 +123,7 @@ public class BridgeBuilder<S, F> { MethodSignature ms = (MethodSignature) i.next(); - logger.error(String.format("Method %s of filter interface %s does not have a matching method in %s.", ms, filterInterface.getName(), serviceInterface.getName())); + logger.error("Method {} of filter interface {} does not have a matching method in {}.", ms, filterInterface.getName(), serviceInterface.getName()); } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/504f1ada/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java index 83b08f7..75d78af 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java @@ -135,8 +135,7 @@ public class PerthreadManagerImpl implements PerthreadManager callback.run(); } catch (Exception ex) { - logger.warn(String.format("Error invoking callback %s: %s", callback, ex), - ex); + logger.warn("Error invoking callback {}: {}", callback, ex, ex); } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/504f1ada/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java index 8988d74..87b1e17 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java @@ -59,8 +59,8 @@ public class RegistryStartup implements Runnable { // startup-failure=An exception occurred during startup: %s - logger.error(String.format("An exception occurred during startup: %s", - ExceptionUtils.toMessage(ex)), ex); + logger.error("An exception occurred during startup: {}", + ExceptionUtils.toMessage(ex), ex); } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/504f1ada/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java index a1b2a80..f18c726 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java @@ -218,10 +218,7 @@ public class PeriodicExecutorImpl implements PeriodicExecutor, Runnable @Override public Void invoke() { - if (logger.isDebugEnabled()) - { - logger.debug(String.format("Executing job #%d (%s)", jobId, name)); - } + logger.debug("Executing job #{} ({})", jobId, name); try {
