You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/01/22 04:32:39 UTC
[commons-beanutils] branch master updated: Refactor logger usage:
(#72)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
The following commit(s) were added to refs/heads/master by this push:
new d635831 Refactor logger usage: (#72)
d635831 is described below
commit d63583146a4240b14bd75ccd4857649724a99890
Author: Andrei Korzhevskii <an...@korzha.com>
AuthorDate: Fri Jan 22 07:32:31 2021 +0300
Refactor logger usage: (#72)
1. Skip message concatenation if logging level is not enabled
2. Remove logging level prefix from messages because it's printed by
logger formatter itself
3. Remove exception from message, pass it as a last parameter of slf4j
logger call
---
src/main/java/org/apache/commons/beanutils2/BeanPredicate.java | 2 +-
.../apache/commons/beanutils2/BeanPropertyValueChangeConsumer.java | 2 +-
.../commons/beanutils2/BeanPropertyValueEqualsPredicate.java | 2 +-
.../apache/commons/beanutils2/BeanToPropertyValueTransformer.java | 2 +-
src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java | 4 +++-
.../apache/commons/beanutils2/FluentPropertyBeanIntrospector.java | 7 ++++---
src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java | 4 ++--
.../commons/beanutils2/locale/converters/DateLocaleConverter.java | 4 +++-
8 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java b/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java
index a116b3f..7b58a4d 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java
@@ -69,7 +69,7 @@ public class BeanPredicate<T> implements Predicate<T> {
evaluation = predicate.test(propValue);
} catch (final IllegalArgumentException e) {
final String errorMsg = "Problem during evaluation.";
- log.error("ERROR: " + errorMsg, e);
+ log.error(errorMsg, e);
throw e;
} catch (final IllegalAccessException e) {
final String errorMsg = "Unable to access the property provided.";
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeConsumer.java b/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeConsumer.java
index 6042926..4a63373 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeConsumer.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeConsumer.java
@@ -167,7 +167,7 @@ public class BeanPropertyValueChangeConsumer<T, V> implements Consumer<T> {
final String errorMsg = "Unable to execute Closure. Null value encountered in property path...";
if (ignoreNull) {
- log.warn("WARNING: " + errorMsg + e);
+ log.warn(errorMsg, e);
} else {
final IllegalArgumentException iae = new IllegalArgumentException(errorMsg);
if (!BeanUtils.initCause(iae, e)) {
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java b/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java
index b56e153..d84d01e 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java
@@ -205,7 +205,7 @@ public class BeanPropertyValueEqualsPredicate<T, V> implements Predicate<T> {
final String errorMsg = "Problem during evaluation. Null value encountered in property path...";
if (ignoreNull) {
- log.warn("WARNING: " + errorMsg + e);
+ log.warn(errorMsg, e);
} else {
final IllegalArgumentException iae = new IllegalArgumentException(errorMsg);
if (!BeanUtils.initCause(iae, e)) {
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java b/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java
index 72853e8..e531b05 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java
@@ -156,7 +156,7 @@ public class BeanToPropertyValueTransformer<T, R> implements Function<T, R> {
final String errorMsg = "Problem during transformation. Null value encountered in property path...";
if (ignoreNull) {
- log.warn("WARNING: " + errorMsg + e);
+ log.warn(errorMsg, e);
} else {
final IllegalArgumentException iae = new IllegalArgumentException(errorMsg);
if (!BeanUtils.initCause(iae, e)) {
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java
index 1d3832a..815b531 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java
@@ -1058,7 +1058,9 @@ public class BeanUtilsBean {
protected Object convert(final Object value, final Class<?> type) {
final Converter converter = getConvertUtils().lookup(type);
if (converter != null) {
- log.trace(" USING CONVERTER " + converter);
+ if (log.isTraceEnabled()) {
+ log.trace(" USING CONVERTER " + converter);
+ }
return converter.convert(type, value);
}
return value;
diff --git a/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java b/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java
index 6bfa2be..1438945 100644
--- a/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java
+++ b/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java
@@ -144,9 +144,10 @@ public class FluentPropertyBeanIntrospector implements BeanIntrospector {
pd.setWriteMethod(m);
}
} catch (final IntrospectionException e) {
- log.debug("Error when creating PropertyDescriptor for " + m
- + "! Ignoring this property.");
- log.debug("Exception is:", e);
+ if (log.isDebugEnabled()) {
+ log.debug("Error when creating PropertyDescriptor for " + m
+ + "! Ignoring this property.", e);
+ }
}
}
}
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
index 2da46e7..fbc612e 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
@@ -784,7 +784,7 @@ public class LazyDynaBean implements DynaBean, Serializable {
catch (final Exception ex) {
if (logger().isWarnEnabled()) {
logger().warn("Error instantiating DynaBean property of type '" +
- type.getName() + "' for '" + name + "' " + ex);
+ type.getName() + "' for '" + name + "' ", ex);
}
return null;
}
@@ -855,7 +855,7 @@ public class LazyDynaBean implements DynaBean, Serializable {
}
catch (final Exception ex) {
if (logger().isWarnEnabled()) {
- logger().warn("Error instantiating property of type '" + type.getName() + "' for '" + name + "' " + ex);
+ logger().warn("Error instantiating property of type '" + type.getName() + "' for '" + name + "' ", ex);
}
return null;
}
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java
index 5773bee..45c4331 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java
@@ -304,7 +304,9 @@ public class DateLocaleConverter extends BaseLocaleConverter {
localChars,
DEFAULT_PATTERN_CHARS);
} catch (final Exception ex) {
- log.debug("Converting pattern '" + localizedPattern + "' for " + locale, ex);
+ if (log.isDebugEnabled()) {
+ log.debug("Converting pattern '" + localizedPattern + "' for " + locale, ex);
+ }
}
return convertedPattern;
}