Author: cmueller
Date: Thu Mar 24 06:49:07 2011
New Revision: 1084858
URL: http://svn.apache.org/viewvc?rev=1084858&view=rev
Log:
CAMEL-3759: After switching to slf4j, we can get rid of the 'isTraceEnabled',
'isDebugEnabled' and 'isInfoEnabled' statements - work in progress
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java
camel/trunk/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
camel/trunk/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecProducer.java
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java?rev=1084858&r1=1084857&r2=1084858&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java
Thu Mar 24 06:49:07 2011
@@ -252,9 +252,7 @@ public class FileIdempotentRepository ex
* to the file store.
*/
protected void trunkStore() {
- if (LOG.isInfoEnabled()) {
- LOG.info("Trunking idempotent filestore: " + fileStore);
- }
+ LOG.info("Trunking idempotent filestore: {}", fileStore);
FileOutputStream fos = null;
try {
fos = new FileOutputStream(fileStore);
Modified:
camel/trunk/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java?rev=1084858&r1=1084857&r2=1084858&view=diff
==============================================================================
---
camel/trunk/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
(original)
+++
camel/trunk/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
Thu Mar 24 06:49:07 2011
@@ -127,9 +127,7 @@ public class DozerTypeConverterLoader im
private void registerClassMaps(TypeConverterRegistry registry,
DozerBeanMapper dozer, List<ClassMap> all) {
DozerTypeConverter converter = new DozerTypeConverter(dozer);
for (ClassMap map : all) {
- if (log.isInfoEnabled()) {
- log.info("Added " + map.getSrcClassName() + " -> " +
map.getDestClassName() + " as type converter to: " + registry);
- }
+ log.info("Added {} -> {} as type converter to: {}", new
Object[]{map.getSrcClassName(), map.getDestClassName(), registry});
registry.addTypeConverter(map.getSrcClassToMap(),
map.getDestClassToMap(), converter);
registry.addTypeConverter(map.getDestClassToMap(),
map.getSrcClassToMap(), converter);
}
Modified:
camel/trunk/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecProducer.java?rev=1084858&r1=1084857&r2=1084858&view=diff
==============================================================================
---
camel/trunk/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecProducer.java
(original)
+++
camel/trunk/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecProducer.java
Thu Mar 24 06:49:07 2011
@@ -42,15 +42,12 @@ public class ExecProducer extends Defaul
public void process(Exchange exchange) throws Exception {
ExecCommand execCommand = getBinding().readInput(exchange, endpoint);
- if (log.isInfoEnabled()) {
- log.info("Executing " + execCommand);
- }
+ log.info("Executing {}", execCommand);
ExecResult result = endpoint.getCommandExecutor().execute(execCommand);
ObjectHelper.notNull(result, "The command executor must return a
not-null result");
- if (log.isInfoEnabled()) {
- log.info("The command " + execCommand + " had exit value " +
result.getExitValue());
- } else if (log.isErrorEnabled() && result.getExitValue() != 0) {
- log.error("The command " + execCommand + " returned exit value " +
result.getExitValue());
+ log.info("The command {} had exit value {}", execCommand,
result.getExitValue());
+ if (result.getExitValue() != 0) {
+ log.error("The command {} returned exit value {}", execCommand,
result.getExitValue());
}
getBinding().writeOutput(exchange, result);
}
Modified:
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java?rev=1084858&r1=1084857&r2=1084858&view=diff
==============================================================================
---
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
(original)
+++
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
Thu Mar 24 06:49:07 2011
@@ -56,9 +56,7 @@ public class MinaConsumer extends Defaul
@Override
protected void doStart() throws Exception {
super.doStart();
- if (LOG.isInfoEnabled()) {
- LOG.info("Binding to server address: " + address + " using
acceptor: " + acceptor);
- }
+ LOG.info("Binding to server address: {} using acceptor: {}", address,
acceptor);
IoHandler handler = new ReceiveHandler();
acceptor.bind(address, handler, getEndpoint().getAcceptorConfig());
@@ -66,9 +64,7 @@ public class MinaConsumer extends Defaul
@Override
protected void doStop() throws Exception {
- if (LOG.isInfoEnabled()) {
- LOG.info("Unbinding from server address: " + address + " using
acceptor: " + acceptor);
- }
+ LOG.info("Unbinding from server address: {} using acceptor: {}",
address, acceptor);
acceptor.unbind(address);
super.doStop();
}
Modified:
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java?rev=1084858&r1=1084857&r2=1084858&view=diff
==============================================================================
---
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
(original)
+++
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
Thu Mar 24 06:49:07 2011
@@ -50,9 +50,7 @@ public class NagiosEventNotifier extends
Level level = determineLevel(eventObject);
MessagePayload payload = new MessagePayload(getHostName(),
level.ordinal(), getServiceName(), message);
- if (log.isInfoEnabled()) {
- log.info("Sending notification to Nagios: " +
payload.getMessage());
- }
+ log.info("Sending notification to Nagios: {}", payload.getMessage());
sender.send(payload);
if (log.isTraceEnabled()) {
log.trace("Sending notification done");
Modified:
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java?rev=1084858&r1=1084857&r2=1084858&view=diff
==============================================================================
---
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
(original)
+++
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
Thu Mar 24 06:49:07 2011
@@ -395,9 +395,7 @@ public class QuartzComponent extends Def
protected Properties loadProperties() throws SchedulerException {
Properties answer = getProperties();
if (answer == null && getPropertiesFile() != null) {
- if (LOG.isInfoEnabled()) {
- LOG.info("Loading Quartz properties file from classpath: " +
getPropertiesFile());
- }
+ LOG.info("Loading Quartz properties file from classpath: {}",
getPropertiesFile());
InputStream is =
getCamelContext().getClassResolver().loadResourceAsStream(getPropertiesFile());
if (is == null) {
throw new SchedulerException("Quartz properties file not found
in classpath: " + getPropertiesFile());
Modified:
camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java?rev=1084858&r1=1084857&r2=1084858&view=diff
==============================================================================
---
camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java
(original)
+++
camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java
Thu Mar 24 06:49:07 2011
@@ -52,9 +52,7 @@ public class SnmpTrapConsumer extends De
super.doStart();
// load connection data only if the endpoint is enabled
- if (LOG.isInfoEnabled()) {
- LOG.info("Starting trap consumer on " +
this.endpoint.getAddress());
- }
+ LOG.info("Starting trap consumer on {}", this.endpoint.getAddress());
this.listenGenericAddress =
GenericAddress.parse(this.endpoint.getAddress());
Modified:
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java?rev=1084858&r1=1084857&r2=1084858&view=diff
==============================================================================
---
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
(original)
+++
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
Thu Mar 24 06:49:07 2011
@@ -84,9 +84,7 @@ public class XmppConsumer extends Defaul
history.setMaxChars(0); // we do not want any historical messages
muc.join(endpoint.getNickname(), null, history,
SmackConfiguration.getPacketReplyTimeout());
- if (LOG.isInfoEnabled()) {
- LOG.info("Joined room: " + muc.getRoom() + " as: " +
endpoint.getNickname());
- }
+ LOG.info("Joined room: {} as: {}", muc.getRoom(),
endpoint.getNickname());
}
super.doStart();
@@ -96,9 +94,7 @@ public class XmppConsumer extends Defaul
protected void doStop() throws Exception {
super.doStop();
if (muc != null) {
- if (LOG.isInfoEnabled()) {
- LOG.info("Leaving room: " + muc.getRoom());
- }
+ LOG.info("Leaving room: {}", muc.getRoom());
muc.removeMessageListener(this);
muc.leave();
muc = null;
Modified:
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java?rev=1084858&r1=1084857&r2=1084858&view=diff
==============================================================================
---
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
(original)
+++
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
Thu Mar 24 06:49:07 2011
@@ -82,9 +82,7 @@ public class XmppGroupChatProducer exten
DiscussionHistory history = new DiscussionHistory();
history.setMaxChars(0); // we do not want any historical messages
chat.join(endpoint.getNickname(), null, history,
SmackConfiguration.getPacketReplyTimeout());
- if (LOG.isInfoEnabled()) {
- LOG.info("Joined room: " + room + " as: " +
endpoint.getNickname());
- }
+ LOG.info("Joined room: {} as: {}", room, endpoint.getNickname());
}
super.doStart();
@@ -93,9 +91,7 @@ public class XmppGroupChatProducer exten
@Override
protected void doStop() throws Exception {
if (chat != null) {
- if (LOG.isInfoEnabled()) {
- LOG.info("Leaving room: " + room);
- }
+ LOG.info("Leaving room: {}", room);
chat.leave();
chat = null;
}
