Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/PackageScanRouteBuilderFinder.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/PackageScanRouteBuilderFinder.java?rev=1086028&r1=1086027&r2=1086028&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/PackageScanRouteBuilderFinder.java (original) +++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/PackageScanRouteBuilderFinder.java Sun Mar 27 20:29:58 2011 @@ -58,9 +58,7 @@ public class PackageScanRouteBuilderFind public void appendBuilders(List<RoutesBuilder> list) throws IllegalAccessException, InstantiationException { Set<Class<?>> classes = resolver.findImplementations(RoutesBuilder.class, packages); for (Class aClass : classes) { - if (LOG.isTraceEnabled()) { - LOG.trace("Found RouteBuilder class: " + aClass); - } + LOG.trace("Found RouteBuilder class: {}", aClass); // certain beans should be ignored if (shouldIgnoreBean(aClass)) {
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/SpringAntPathMatcherFileFilter.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/SpringAntPathMatcherFileFilter.java?rev=1086028&r1=1086027&r2=1086028&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/SpringAntPathMatcherFileFilter.java (original) +++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/SpringAntPathMatcherFileFilter.java Sun Mar 27 20:29:58 2011 @@ -50,18 +50,14 @@ public class SpringAntPathMatcherFileFil // must use single / as path separators path = StringUtils.replace(path, File.separator, "/"); - if (LOG.isTraceEnabled()) { - LOG.trace("Filtering file: " + path); - } + LOG.trace("Filtering file: {}", path); // excludes take precedence if (excludes != null) { for (String exclude : excludes) { if (matcher.match(exclude, path)) { // something to exclude so we cant accept it - if (LOG.isTraceEnabled()) { - LOG.trace("File is excluded: " + path); - } + LOG.trace("File is excluded: {}", path); return false; } } @@ -71,9 +67,7 @@ public class SpringAntPathMatcherFileFil for (String include : includes) { if (matcher.match(include, path)) { // something to include so we accept it - if (LOG.isTraceEnabled()) { - LOG.trace("File is included: " + path); - } + LOG.trace("File is included: {}", path); return true; } } Modified: camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java?rev=1086028&r1=1086027&r2=1086028&view=diff ============================================================================== --- camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java (original) +++ camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java Sun Mar 27 20:29:58 2011 @@ -242,9 +242,7 @@ public class JdbcAggregationRepository e new RowMapper<String>() { public String mapRow(ResultSet rs, int rowNum) throws SQLException { String id = rs.getString(ID); - if (LOG.isTraceEnabled()) { - LOG.trace("getKey [" + id + "]"); - } + LOG.trace("getKey [{}]", id); return id; } }); @@ -261,9 +259,7 @@ public class JdbcAggregationRepository e new RowMapper<String>() { public String mapRow(ResultSet rs, int rowNum) throws SQLException { String id = rs.getString(ID); - if (LOG.isTraceEnabled()) { - LOG.trace("getKey [" + id + "]"); - } + LOG.trace("getKey [{}]", id); return id; } }); Modified: camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java?rev=1086028&r1=1086027&r2=1086028&view=diff ============================================================================== --- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java (original) +++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java Sun Mar 27 20:29:58 2011 @@ -118,9 +118,7 @@ public class StreamConsumer extends Defa // repeat scanning from stream while (isRunAllowed()) { line = br.readLine(); - if (LOG.isTraceEnabled()) { - LOG.trace("Read line: " + line); - } + LOG.trace("Read line: {}", line); boolean eos = line == null; if (!eos && isRunAllowed()) { processLine(line); @@ -144,9 +142,7 @@ public class StreamConsumer extends Defa } line = br.readLine(); - if (LOG.isTraceEnabled()) { - LOG.trace("Read line: " + line); - } + LOG.trace("Read line: {}", line); eos = line == null; if (!eos && isRunAllowed()) { processLine(line); Modified: camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java?rev=1086028&r1=1086027&r2=1086028&view=diff ============================================================================== --- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java (original) +++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java Sun Mar 27 20:29:58 2011 @@ -116,9 +116,7 @@ public class StreamProducer extends Defa if (ms == 0) { return; } - if (LOG.isTraceEnabled()) { - LOG.trace("Delaying " + ms + " millis"); - } + LOG.trace("Delaying {} millis", ms); Thread.sleep(ms); } Modified: camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java?rev=1086028&r1=1086027&r2=1086028&view=diff ============================================================================== --- camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java (original) +++ camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java Sun Mar 27 20:29:58 2011 @@ -262,9 +262,7 @@ public final class Rfc3164SyslogConverte syslogMessage.setTimestamp(calendar.getTime()); syslogMessage.setLogMessage(msg.toString()); - if (LOG.isTraceEnabled()) { - LOG.trace("Syslog message : " + syslogMessage.toString()); - } + LOG.trace("Syslog message : {}", syslogMessage.toString()); return syslogMessage; } Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java?rev=1086028&r1=1086027&r2=1086028&view=diff ============================================================================== --- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java (original) +++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java Sun Mar 27 20:29:58 2011 @@ -71,9 +71,7 @@ public class XmppBinding { } else { try { message.setProperty(name, value); - if (LOG.isTraceEnabled()) { - LOG.trace("Added property name: " + name + " value: " + value.toString()); - } + LOG.trace("Added property name: {} value: {}", name, value.toString()); } catch (IllegalArgumentException iae) { if (LOG.isDebugEnabled()) { LOG.debug("Cannot add property " + name + " to XMPP message due: ", iae); Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java?rev=1086028&r1=1086027&r2=1086028&view=diff ============================================================================== --- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java (original) +++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java Sun Mar 27 20:29:58 2011 @@ -65,14 +65,10 @@ public class XmppPrivateChatProducer ext ChatManager chatManager = connection.getChatManager(); - if (LOG.isTraceEnabled()) { - LOG.trace("Looking for existing chat instance with thread ID " + endpoint.getChatId()); - } + LOG.trace("Looking for existing chat instance with thread ID {}", endpoint.getChatId()); Chat chat = chatManager.getThreadChat(endpoint.getChatId()); if (chat == null) { - if (LOG.isTraceEnabled()) { - LOG.trace("Creating new chat instance with thread ID " + endpoint.getChatId()); - } + LOG.trace("Creating new chat instance with thread ID {}", endpoint.getChatId()); chat = chatManager.createChat(getParticipant(), endpoint.getChatId(), new MessageListener() { public void processMessage(Chat chat, Message message) { // not here to do conversation
