You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2011/03/27 22:30:01 UTC
svn commit: r1086028 [1/3] - in /camel/trunk/components:
camel-blueprint/src/main/java/org/apache/camel/blueprint/
camel-cache/src/main/java/org/apache/camel/component/cache/
camel-cache/src/main/java/org/apache/camel/processor/cache/
camel-cometd/src/...
Author: cmueller
Date: Sun Mar 27 20:29:58 2011
New Revision: 1086028
URL: http://svn.apache.org/viewvc?rev=1086028&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/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ContextScanRouteBuilderFinder.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java
camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheProducer.java
camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedTokenReplacer.java
camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheValidate.java
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/SoapMessageHeaderFilter.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java
camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java
camel/trunk/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBFile.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java
camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisConsumer.java
camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisProducer.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/PersistentQueueReplyManager.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueConsumer.java
camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java
camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java
camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java
camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaHelper.java
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyHelper.java
camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ServerChannelHandler.java
camel/trunk/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxConfiguration.java
camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/seda/RouteboxSedaProducer.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ContextScanRouteBuilderFinder.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/PackageScanRouteBuilderFinder.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/SpringAntPathMatcherFileFilter.java
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
camel/trunk/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogConverter.java
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ContextScanRouteBuilderFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ContextScanRouteBuilderFinder.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ContextScanRouteBuilderFinder.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ContextScanRouteBuilderFinder.java Sun Mar 27 20:29:58 2011
@@ -52,9 +52,7 @@ public class ContextScanRouteBuilderFind
String key = entry.getKey();
Object bean = entry.getValue();
- if (LOG.isTraceEnabled()) {
- LOG.trace("Found RouteBuilder with id: " + key + " -> " + bean);
- }
+ LOG.trace("Found RouteBuilder with id: {} -> {}", key, bean);
// certain beans should be ignored
if (shouldIgnoreBean(bean)) {
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java Sun Mar 27 20:29:58 2011
@@ -57,9 +57,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-cache/src/main/java/org/apache/camel/component/cache/CacheProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheProducer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheProducer.java (original)
+++ camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheProducer.java Sun Mar 27 20:29:58 2011
@@ -54,15 +54,13 @@ public class CacheProducer extends Defau
}
public void process(Exchange exchange) throws Exception {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Cache Name: " + config.getCacheName());
- }
+ LOG.trace("Cache Name: {}", config.getCacheName());
if (cacheManager.cacheExists(config.getCacheName())) {
if (LOG.isTraceEnabled()) {
- LOG.trace("Found an existing cache: " + config.getCacheName());
- LOG.trace("Cache " + config.getCacheName() + " currently contains "
- + cacheManager.getCache(config.getCacheName()).getSize() + " elements");
+ LOG.trace("Found an existing cache: {}", config.getCacheName());
+ LOG.trace("Cache {} currently contains {} elements",
+ config.getCacheName(), cacheManager.getCache(config.getCacheName()).getSize());
}
cache = cacheManager.getCache(config.getCacheName());
} else {
Modified: camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedTokenReplacer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedTokenReplacer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedTokenReplacer.java (original)
+++ camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedTokenReplacer.java Sun Mar 27 20:29:58 2011
@@ -74,9 +74,7 @@ public class CacheBasedTokenReplacer ext
.convertTo(String.class, cache.get(key).getObjectValue());
String replacedTokenString = new String(buffer).replaceAll(replacementToken, cacheValue);
- if (LOG.isTraceEnabled()) {
- LOG.trace("replacedTokenString = " + replacedTokenString);
- }
+ LOG.trace("replacedTokenString = {}", replacedTokenString);
exchange.getIn().setBody(replacedTokenString.getBytes());
}
}
Modified: camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheValidate.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheValidate.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheValidate.java (original)
+++ camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheValidate.java Sun Mar 27 20:29:58 2011
@@ -26,9 +26,7 @@ public class CacheValidate {
private static final transient Logger LOG = LoggerFactory.getLogger(CacheValidate.class);
public boolean isValid(CacheManager cacheManager, String cacheName, String key) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Cache Name: " + cacheName);
- }
+ LOG.trace("Cache Name: {}", cacheName);
if (!cacheManager.cacheExists(cacheName)) {
if (LOG.isDebugEnabled()) {
@@ -44,7 +42,7 @@ public class CacheValidate {
}
if (LOG.isTraceEnabled()) {
- LOG.trace("Cache " + cacheName + " currently contains " + cacheManager.getCache(cacheName).getSize() + " elements");
+ LOG.trace("Cache {} currently contains {} elements", cacheName, cacheManager.getCache(cacheName).getSize());
}
Ehcache cache = cacheManager.getCache(cacheName);
Modified: camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java (original)
+++ camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java Sun Mar 27 20:29:58 2011
@@ -60,7 +60,8 @@ public class CometdProducer extends Defa
Collection<Client> clients = bayeux.getClients();
for (Client client : clients) {
if (LOG.isTraceEnabled()) {
- LOG.trace("Delivering to client id: " + client.getId() + " path:" + endpoint.getPath() + " exchange: " + exchange);
+ LOG.trace("Delivering to client id: {} path: {} exchange: {}",
+ new Object[]{client.getId(), endpoint.getPath(), exchange});
}
client.deliver(client, endpoint.getPath(), exchange.getIn().getBody(), null);
}
Modified: camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java (original)
+++ camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java Sun Mar 27 20:29:58 2011
@@ -69,7 +69,7 @@ public class LocalContextComponent exten
Map<String, Endpoint> map = getLocalCamelContext().getEndpointMap();
if (LOG.isTraceEnabled()) {
- LOG.trace("Trying to lookup " + remaining + " in local map " + map.keySet());
+ LOG.trace("Trying to lookup {} in local map {}", remaining, map.keySet());
}
Endpoint endpoint = map.get(remaining);
if (endpoint != null) {
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiComponentResolver.java Sun Mar 27 20:29:58 2011
@@ -62,9 +62,7 @@ public class OsgiComponentResolver imple
}
protected Component getComponent(String name, CamelContext context) throws Exception {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Finding Component: " + name);
- }
+ LOG.trace("Finding Component: {}", name);
try {
ServiceReference[] refs = bundleContext.getServiceReferences(ComponentResolver.class.getName(), "(component=" + name + ")");
if (refs != null && refs.length > 0) {
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDataFormatResolver.java Sun Mar 27 20:29:58 2011
@@ -74,9 +74,7 @@ public class OsgiDataFormatResolver impl
}
protected DataFormat getDataFormat(String name, CamelContext context) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Finding DataFormat: " + name);
- }
+ LOG.trace("Finding DataFormat: {}", name);
try {
ServiceReference[] refs = bundleContext.getServiceReferences(DataFormatResolver.class.getName(), "(dataformat=" + name + ")");
if (refs != null && refs.length > 0) {
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiLanguageResolver.java Sun Mar 27 20:29:58 2011
@@ -64,9 +64,7 @@ public class OsgiLanguageResolver implem
}
protected Language getLanguage(String name, CamelContext context) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Finding Language: " + name);
- }
+ LOG.trace("Finding Language: {}", name);
try {
ServiceReference[] refs = bundleContext.getServiceReferences(LanguageResolver.class.getName(), "(language=" + name + ")");
if (refs != null && refs.length > 0) {
@@ -80,9 +78,7 @@ public class OsgiLanguageResolver implem
}
protected LanguageResolver getLanguageResolver(String name, CamelContext context) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Finding LanguageResolver: " + name);
- }
+ LOG.trace("Finding LanguageResolver: {}", name);
try {
ServiceReference[] refs = bundleContext.getServiceReferences(LanguageResolver.class.getName(), "(resolver=" + name + ")");
if (refs != null && refs.length > 0) {
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiPackageScanClassResolver.java Sun Mar 27 20:29:58 2011
@@ -56,9 +56,7 @@ public class OsgiPackageScanClassResolve
// Using the non-OSGi classloaders as a fallback
// this is necessary when use JBI packaging for servicemix-camel SU
// so that we get chance to use SU classloader to scan packages in the SU
- if (log.isTraceEnabled()) {
- log.trace("Cannot find any classes in bundles, not trying regular classloaders scanning: " + packageName);
- }
+ log.trace("Cannot find any classes in bundles, not trying regular classloaders scanning: {}", packageName);
for (ClassLoader classLoader : super.getClassLoaders()) {
if (!isOsgiClassloader(classLoader)) {
find(test, packageName, classLoader, classes);
@@ -99,9 +97,7 @@ public class OsgiPackageScanClassResolve
}
Set<String> urls = new LinkedHashSet<String>();
for (Bundle bd : bundles) {
- if (log.isTraceEnabled()) {
- log.trace("Searching in bundle:" + bd);
- }
+ log.trace("Searching in bundle: {}", bd);
try {
Enumeration<URL> paths = bd.findEntries("/" + packageName, "*.class", true);
while (paths != null && paths.hasMoreElements()) {
@@ -109,9 +105,7 @@ public class OsgiPackageScanClassResolve
String pathString = path.getPath();
String urlString = pathString.substring(pathString.indexOf(packageName));
urls.add(urlString);
- if (log.isTraceEnabled()) {
- log.trace("Added url: " + urlString);
- }
+ log.trace("Added url: {}", urlString);
}
} catch (Throwable t) {
log.warn("Cannot search in bundle: " + bundle + " for classes matching criteria: " + test + " due: "
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java Sun Mar 27 20:29:58 2011
@@ -51,9 +51,7 @@ public class OsgiTypeConverter extends S
}
public Object addingService(ServiceReference serviceReference) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("AddingService: " + serviceReference);
- }
+ LOG.trace("AddingService: {}", serviceReference);
TypeConverterLoader loader = (TypeConverterLoader) bundleContext.getService(serviceReference);
if (loader != null) {
try {
@@ -69,9 +67,7 @@ public class OsgiTypeConverter extends S
}
public void removedService(ServiceReference serviceReference, Object o) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("RemovedService: " + serviceReference);
- }
+ LOG.trace("RemovedService: {}", serviceReference);
this.delegate = null;
}
@@ -155,12 +151,7 @@ public class OsgiTypeConverter extends S
}
}
- if (LOG.isTraceEnabled()) {
- LOG.trace("Created TypeConverter: " + reg);
- }
+ LOG.trace("Created TypeConverter: {}", reg);
return reg;
}
-
-
-
}
Modified: camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java (original)
+++ camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java Sun Mar 27 20:29:58 2011
@@ -43,16 +43,12 @@ public class BundleDelegatingClassLoader
}
protected Class<?> findClass(String name) throws ClassNotFoundException {
- if (LOG.isTraceEnabled()) {
- LOG.trace("FindClass: " + name);
- }
+ LOG.trace("FindClass: {}", name);
return bundle.loadClass(name);
}
protected URL findResource(String name) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("FindResource: " + name);
- }
+ LOG.trace("FindResource: {}", name);
URL resource = bundle.getResource(name);
if (classLoader != null && resource == null) {
resource = classLoader.getResource(name);
@@ -62,16 +58,12 @@ public class BundleDelegatingClassLoader
@SuppressWarnings("unchecked")
protected Enumeration findResources(String name) throws IOException {
- if (LOG.isTraceEnabled()) {
- LOG.trace("FindResource: " + name);
- }
+ LOG.trace("FindResource: {}", name);
return bundle.getResources(name);
}
protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
- if (LOG.isTraceEnabled()) {
- LOG.trace("LoadClass: " + name + ", resolve: " + resolve);
- }
+ LOG.trace("LoadClass: {}, resolve: {}", name, resolve);
Class clazz;
try {
clazz = findClass(name);
Modified: camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java Sun Mar 27 20:29:58 2011
@@ -667,9 +667,7 @@ public abstract class AbstractCamelConte
name = context.resolvePropertyPlaceholders(name);
name = ObjectHelper.normalizeClassName(name);
if (ObjectHelper.isNotEmpty(name)) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Using package: " + name + " to scan for RouteBuilder classes");
- }
+ LOG.trace("Using package: {} to scan for RouteBuilder classes", name);
packages.add(name);
}
}
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java Sun Mar 27 20:29:58 2011
@@ -61,19 +61,13 @@ public class CxfConsumer extends Default
// we receive a CXF request when this method is called
public Object invoke(Exchange cxfExchange, Object o) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Received CXF Request: " + cxfExchange);
- }
+ LOG.trace("Received CXF Request: {}", cxfExchange);
Continuation continuation;
if (!endpoint.isSynchronous() && (continuation = getContinuation(cxfExchange)) != null) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Calling the Camel async processors.");
- }
+ LOG.trace("Calling the Camel async processors.");
return asyncInvoke(cxfExchange, continuation);
} else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Calling the Camel sync processors.");
- }
+ LOG.trace("Calling the Camel sync processors.");
return syncInvoke(cxfExchange);
}
}
@@ -85,9 +79,7 @@ public class CxfConsumer extends Default
final org.apache.camel.Exchange camelExchange = perpareCamelExchange(cxfExchange);
// Now we don't set up the timeout value
- if (LOG.isTraceEnabled()) {
- LOG.trace("Suspending continuation of exchangeId: " + camelExchange.getExchangeId());
- }
+ LOG.trace("Suspending continuation of exchangeId: {}", camelExchange.getExchangeId());
// TODO Support to set the timeout in case the Camel can't send the response back on time.
// The continuation could be called before the suspend is called
continuation.suspend(0);
@@ -97,10 +89,7 @@ public class CxfConsumer extends Default
public void done(boolean doneSync) {
// make sure the continuation resume will not be called before the suspend method in other thread
synchronized (continuation) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Resuming continuation of exchangeId: "
- + camelExchange.getExchangeId());
- }
+ LOG.trace("Resuming continuation of exchangeId: {}", camelExchange.getExchangeId());
// resume processing after both, sync and async callbacks
continuation.setObject(camelExchange);
continuation.resume();
@@ -128,17 +117,13 @@ public class CxfConsumer extends Default
private Object syncInvoke(Exchange cxfExchange) {
org.apache.camel.Exchange camelExchange = perpareCamelExchange(cxfExchange);
// send Camel exchange to the target processor
- if (LOG.isTraceEnabled()) {
- LOG.trace("Processing +++ START +++");
- }
+ LOG.trace("Processing +++ START +++");
try {
getProcessor().process(camelExchange);
} catch (Exception e) {
throw new Fault(e);
}
- if (LOG.isTraceEnabled()) {
- LOG.trace("Processing +++ END +++");
- }
+ LOG.trace("Processing +++ END +++");
setResponseBack(cxfExchange, camelExchange);
// response should have been set in outMessage's content
return null;
@@ -162,17 +147,12 @@ public class CxfConsumer extends Default
if (boi != null) {
camelExchange.setProperty(BindingOperationInfo.class.getName(), boi);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Set exchange property: BindingOperationInfo: " + boi);
- }
+ LOG.trace("Set exchange property: BindingOperationInfo: {}", boi);
}
// set data format mode in Camel exchange
camelExchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, dataFormat);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Set Exchange property: " + DataFormat.class.getName()
- + "=" + dataFormat);
- }
+ LOG.trace("Set Exchange property: {}={}", DataFormat.class.getName(), dataFormat);
camelExchange.setProperty(Message.MTOM_ENABLED, String.valueOf(endpoint.isMtomEnabled()));
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java Sun Mar 27 20:29:58 2011
@@ -127,9 +127,7 @@ public class CxfHeaderFilterStrategy ext
return false;
}
- if (LOG.isTraceEnabled()) {
- LOG.trace("messageHeaderfilter = " + messageHeaderfilter);
- }
+ LOG.trace("messageHeaderfilter = {}", messageHeaderfilter);
try {
messageHeaderfilter.filter(direction, (List<Header>)value);
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java Sun Mar 27 20:29:58 2011
@@ -73,9 +73,7 @@ public class CxfProducer extends Default
// As the cxf client async and sync api is implement different,
// so we don't delegate the sync process call to the async process
public boolean process(Exchange camelExchange, AsyncCallback callback) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Process exchange: " + camelExchange + " in an async way.");
- }
+ LOG.trace("Process exchange: {} in an async way.", camelExchange);
try {
// create CXF exchange
@@ -111,10 +109,7 @@ public class CxfProducer extends Default
* invokes the CXF client.
*/
public void process(Exchange camelExchange) throws Exception {
-
- if (LOG.isTraceEnabled()) {
- LOG.trace("Process exchange: " + camelExchange + "in sync way.");
- }
+ LOG.trace("Process exchange: {} in sync way.", camelExchange);
// create CXF exchange
ExchangeImpl cxfExchange = new ExchangeImpl();
@@ -160,10 +155,7 @@ public class CxfProducer extends Default
// set data format mode in exchange
DataFormat dataFormat = endpoint.getDataFormat();
camelExchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, dataFormat);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Set Camel Exchange property: " + DataFormat.class.getName()
- + "=" + dataFormat);
- }
+ LOG.trace("Set Camel Exchange property: {}={}", DataFormat.class.getName(), dataFormat);
// set data format mode in the request context
requestContext.put(DataFormat.class.getName(), dataFormat);
@@ -171,10 +163,7 @@ public class CxfProducer extends Default
// don't let CXF ClientImpl close the input stream
if (dataFormat == DataFormat.MESSAGE) {
cxfExchange.put(Client.KEEP_CONDUIT_ALIVE, true);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Set CXF Exchange property: " + Client.KEEP_CONDUIT_ALIVE
- + "=" + true);
- }
+ LOG.trace("Set CXF Exchange property: {}={}", Client.KEEP_CONDUIT_ALIVE, true);
}
// bind the request CXF exchange
@@ -203,17 +192,13 @@ public class CxfProducer extends Default
// store the original boi in the exchange
camelExchange.setProperty(BindingOperationInfo.class.getName(), boi);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Set exchange property: BindingOperationInfo: " + boi);
- }
+ LOG.trace("Set exchange property: BindingOperationInfo: {}", boi);
// Unwrap boi before passing it to make a client call
if (endpoint.getDataFormat() != DataFormat.PAYLOAD && !endpoint.isWrapped() && boi != null) {
if (boi.isUnwrappedCapable()) {
boi = boi.getUnwrappedOperation();
- if (LOG.isTraceEnabled()) {
- LOG.trace("Unwrapped BOI " + boi);
- }
+ LOG.trace("Unwrapped BOI {}", boi);
}
}
return boi;
@@ -303,7 +288,7 @@ public class CxfProducer extends Default
if (LOG.isTraceEnabled()) {
if (params != null) {
for (int i = 0; i < params.length; i++) {
- LOG.trace("params[" + i + "] = " + params[i]);
+ LOG.trace("params[{}] = {}", i, params[i]);
}
}
}
@@ -342,16 +327,12 @@ public class CxfProducer extends Default
}
if (ns == null) {
ns = client.getEndpoint().getService().getName().getNamespaceURI();
- if (LOG.isTraceEnabled()) {
- LOG.trace("Operation namespace not in header. Set it to: " + ns);
- }
+ LOG.trace("Operation namespace not in header. Set it to: {}", ns);
}
QName qname = new QName(ns, lp);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Operation qname = " + qname.toString());
- }
+ LOG.trace("Operation qname = {}", qname.toString());
answer = client.getEndpoint().getEndpointInfo().getBinding().getOperation(qname);
if (answer == null) {
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java Sun Mar 27 20:29:58 2011
@@ -96,10 +96,8 @@ public class DefaultCxfBinding implement
String overrideAddress = camelExchange.getIn().getHeader(Exchange.DESTINATION_OVERRIDE_URL, String.class);
if (overrideAddress != null) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Client address is overridden by header '" + Exchange.DESTINATION_OVERRIDE_URL
- + "' to value '" + overrideAddress + "'");
- }
+ LOG.trace("Client address is overridden by header '{}' to value '{}'",
+ Exchange.DESTINATION_OVERRIDE_URL, overrideAddress);
requestContext.put(Message.ENDPOINT_ADDRESS, overrideAddress);
}
@@ -135,9 +133,7 @@ public class DefaultCxfBinding implement
return;
}
- if (LOG.isTraceEnabled()) {
- LOG.trace("Populate exchange from CXF response message: " + cxfMessage);
- }
+ LOG.trace("Populate exchange from CXF response message: {}", cxfMessage);
// propagate body
camelExchange.getOut().setBody(DefaultCxfBinding.getContentFromCxf(cxfMessage,
@@ -148,10 +144,7 @@ public class DefaultCxfBinding implement
if (!headerFilterStrategy.applyFilterToExternalHeaders(Client.RESPONSE_CONTEXT,
responseContext, camelExchange)) {
camelExchange.getOut().setHeader(Client.RESPONSE_CONTEXT, responseContext);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Set header = " + Client.RESPONSE_CONTEXT + " value = "
- + responseContext);
- }
+ LOG.trace("Set header = {} value = {}", Client.RESPONSE_CONTEXT, responseContext);
}
}
@@ -205,24 +198,22 @@ public class DefaultCxfBinding implement
camelExchange.getIn().setHeader(CxfConstants.OPERATION_NAME,
boi.getName().getLocalPart());
if (LOG.isTraceEnabled()) {
- LOG.trace("Set IN header: " + CxfConstants.OPERATION_NAMESPACE + "="
- + boi.getName().getNamespaceURI());
- LOG.trace("Set IN header: " + CxfConstants.OPERATION_NAME + "="
- + boi.getName().getLocalPart());
+ LOG.trace("Set IN header: {}={}",
+ CxfConstants.OPERATION_NAMESPACE, boi.getName().getNamespaceURI());
+ LOG.trace("Set IN header: {}={}",
+ CxfConstants.OPERATION_NAME, boi.getName().getLocalPart());
}
} else if (method != null) {
camelExchange.getIn().setHeader(CxfConstants.OPERATION_NAME, method.getName());
if (LOG.isTraceEnabled()) {
- LOG.trace("Set IN header: " + CxfConstants.OPERATION_NAME + "="
- + method.getName());
+ LOG.trace("Set IN header: {}={}",
+ CxfConstants.OPERATION_NAME, method.getName());
}
}
// set message exchange pattern
camelExchange.setPattern(mep);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Set exchange MEP: " + mep);
- }
+ LOG.trace("Set exchange MEP: {}", mep);
// propagate headers
Message cxfMessage = cxfExchange.getInMessage();
@@ -246,10 +237,7 @@ public class DefaultCxfBinding implement
if (value != null && !headerFilterStrategy.applyFilterToExternalHeaders(
Client.REQUEST_CONTEXT, value, camelExchange)) {
camelExchange.getIn().setHeader(Client.REQUEST_CONTEXT, value);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Populate context from CXF message " + Client.REQUEST_CONTEXT
- + " value=" + value);
- }
+ LOG.trace("Populate context from CXF message {} value={}", Client.REQUEST_CONTEXT, value);
}
// set body
@@ -301,9 +289,7 @@ public class DefaultCxfBinding implement
// Do we still need to put the response context back like this
outMessage.put(Client.RESPONSE_CONTEXT, responseContext);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Set out response context = " + responseContext);
- }
+ LOG.trace("Set out response context = {}", responseContext);
// set body
Object outBody = DefaultCxfBinding.getBodyFromCamel(camelExchange.getOut(), dataFormat);
@@ -331,9 +317,7 @@ public class DefaultCxfBinding implement
if (resList != null) {
outMessage.setContent(List.class, resList);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Set Out CXF message content = " + resList);
- }
+ LOG.trace("Set Out CXF message content = {}", resList);
}
}
}
@@ -417,10 +401,10 @@ public class DefaultCxfBinding implement
if (context != null) {
cxfContext.putAll(context);
if (LOG.isTraceEnabled()) {
- LOG.trace("Propagate " + contextKey + " from header context = "
- + ((context instanceof WrappedMessageContext)
+ LOG.trace("Propagate {} from header context = {}",
+ contextKey, (context instanceof WrappedMessageContext)
? ((WrappedMessageContext)context).getWrappedMap()
- : context));
+ : context);
}
}
@@ -429,10 +413,10 @@ public class DefaultCxfBinding implement
if (context != null) {
cxfContext.putAll(context);
if (LOG.isTraceEnabled()) {
- LOG.trace("Propagate " + contextKey + " from exchange property context = "
- + ((context instanceof WrappedMessageContext)
+ LOG.trace("Propagate {} from exchange property context = {}",
+ contextKey, (context instanceof WrappedMessageContext)
? ((WrappedMessageContext)context).getWrappedMap()
- : context));
+ : context);
}
}
@@ -467,15 +451,11 @@ public class DefaultCxfBinding implement
&& entry.getValue().get(0) != null
&& entry.getValue().get(0).startsWith("multipart/related")) {
String contentType = replaceMultiPartContentType(entry.getValue().get(0));
- if (LOG.isTraceEnabled()) {
- LOG.trace("Find the multi-part Conent-Type, and replace it with " + contentType);
- }
+ LOG.trace("Find the multi-part Conent-Type, and replace it with {}", contentType);
camelHeaders.put(entry.getKey(), contentType);
} else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Populate header from CXF header=" + entry.getKey() + " value="
- + entry.getValue());
- }
+ LOG.trace("Populate header from CXF header={} value={}",
+ entry.getKey(), entry.getValue());
camelHeaders.put(entry.getKey(), entry.getValue().get(0));
}
@@ -490,9 +470,7 @@ public class DefaultCxfBinding implement
if (value != null) {
if (!headerFilterStrategy.applyFilterToExternalHeaders(key, value, exchange)) {
camelHeaders.put(key, value);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Populate header from CXF header=" + key + " value=" + value);
- }
+ LOG.trace("Populate header from CXF header={} value={}", key, value);
} else {
((List<?>)value).clear();
}
@@ -543,9 +521,7 @@ public class DefaultCxfBinding implement
continue;
}
- if (LOG.isTraceEnabled()) {
- LOG.trace("Propagate to CXF header: " + entry.getKey() + " value: " + entry.getValue());
- }
+ LOG.trace("Propagate to CXF header: {} value: {}", entry.getKey(), entry.getValue());
// put response code in request context so it will be copied to CXF message's property
if (Message.RESPONSE_CODE.equals(entry.getKey())) {
@@ -558,9 +534,7 @@ public class DefaultCxfBinding implement
List<Header> headerList = (List<Header>)entry.getValue();
for (Header header : headerList) {
header.setDirection(Header.Direction.DIRECTION_OUT);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Propagate SOAP/protocol header: " + header.getName() + " : " + header.getObject());
- }
+ LOG.trace("Propagate SOAP/protocol header: {} : {}", header.getName(), header.getObject());
}
//cxfExchange.put(Header.HEADER_LIST, headerList);
@@ -591,8 +565,8 @@ public class DefaultCxfBinding implement
if (LOG.isTraceEnabled()) {
for (Class<?> contentFormat : contentFormats) {
- LOG.trace("Content format=" + contentFormat + " value="
- + message.getContent(contentFormat));
+ LOG.trace("Content format={} value={}",
+ contentFormat, message.getContent(contentFormat));
}
}
@@ -612,9 +586,7 @@ public class DefaultCxfBinding implement
answer = message.getContent(InputStream.class);
}
- if (LOG.isTraceEnabled()) {
- LOG.trace("Extracted body from CXF message = " + answer);
- }
+ LOG.trace("Extracted body from CXF message = {}", answer);
}
return answer;
}
@@ -666,8 +638,8 @@ public class DefaultCxfBinding implement
}
if (LOG.isTraceEnabled()) {
- LOG.trace("Extract body element "
- + (element == null ? "null" : XMLUtils.toString(element)));
+ LOG.trace("Extract body element {}",
+ element == null ? "null" : XMLUtils.toString(element));
}
} else if (part instanceof Element) {
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/SoapMessageHeaderFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/SoapMessageHeaderFilter.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/SoapMessageHeaderFilter.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/SoapMessageHeaderFilter.java Sun Mar 27 20:29:58 2011
@@ -56,14 +56,10 @@ public class SoapMessageHeaderFilter imp
Iterator<Header> iterator = headers.iterator();
while (iterator.hasNext()) {
Header header = iterator.next();
- if (LOG.isTraceEnabled()) {
- LOG.trace("Processing header: " + header);
- }
+ LOG.trace("Processing header: {}", header);
if (!(header instanceof SoapHeader)) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Skipped header: " + header + " since it is not a SoapHeader");
- }
+ LOG.trace("Skipped header: {} since it is not a SoapHeader", header);
continue;
}
@@ -76,9 +72,7 @@ public class SoapMessageHeaderFilter imp
// dropping headers if actor/role equals to {ns}/role|actor/next
// cxf SoapHeader needs to have soap:header@relay attribute,
// then we can check for it here as well
- if (LOG.isTraceEnabled()) {
- LOG.trace("Filtered header: " + header);
- }
+ LOG.trace("Filtered header: {}", header);
iterator.remove();
break;
}
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java Sun Mar 27 20:29:58 2011
@@ -69,9 +69,7 @@ public class CxfBeanDestination extends
}
public void process(Exchange camelExchange) throws Exception {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Received request : " + camelExchange);
- }
+ LOG.trace("Received request : {}", camelExchange);
org.apache.cxf.message.Message cxfMessage =
endpoint.getCxfBeanBinding().createCxfMessageFromCamelExchange(camelExchange,
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java Sun Mar 27 20:29:58 2011
@@ -65,11 +65,8 @@ public class DefaultCxfBeanBinding imple
// TODO propagate security context
- if (LOG.isTraceEnabled()) {
- LOG.trace("Processing " + camelExchange + ", requestContentType = " + requestContentType
- + ", acceptContentTypes = " + acceptContentTypes + ", encoding = " + enc
- + ", path = " + path + ", basePath = " + basePath + ", verb = " + verb);
- }
+ LOG.trace("Processing {}, requestContentType = {}, acceptContentTypes = {}, encoding = {}, path = {}, basePath = {}, verb = {}",
+ new Object[]{camelExchange, requestContentType, acceptContentTypes, enc, path, basePath, verb});
return answer;
}
@@ -77,9 +74,7 @@ public class DefaultCxfBeanBinding imple
public void propagateResponseHeadersToCamel(Message cxfMessage, Exchange exchange,
HeaderFilterStrategy strategy) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Propagating response headers from CXF message " + cxfMessage);
- }
+ LOG.trace("Propagating response headers from CXF message {}", cxfMessage);
if (strategy == null) {
return;
@@ -95,10 +90,7 @@ public class DefaultCxfBeanBinding imple
if (!strategy.applyFilterToExternalHeaders(entry.getKey(), entry.getValue(), exchange)) {
camelHeaders.put(entry.getKey(), entry.getValue().get(0));
- if (LOG.isTraceEnabled()) {
- LOG.trace("Populate header from CXF header=" + entry.getKey() + " value="
- + entry.getValue());
- }
+ LOG.trace("Populate header from CXF header={} value={}", entry.getKey(), entry.getValue());
}
}
}
@@ -108,10 +100,8 @@ public class DefaultCxfBeanBinding imple
Object value = cxfMessage.get(key);
if (value != null && !strategy.applyFilterToExternalHeaders(key, value, exchange)) {
camelHeaders.put(Exchange.HTTP_RESPONSE_CODE, value);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Populate header from CXF header=" + key + " value=" + value
- + " as " + Exchange.HTTP_RESPONSE_CODE);
- }
+ LOG.trace("Populate header from CXF header={} value={} as {}",
+ new Object[]{key, value, Exchange.HTTP_RESPONSE_CODE});
}
// propagate HTTP CONTENT_TYPE
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java Sun Mar 27 20:29:58 2011
@@ -55,14 +55,10 @@ public class CxfRsInvoker extends JAXRSI
}
Continuation continuation;
if (!endpoint.isSynchronous() && (continuation = getContinuation(cxfExchange)) != null) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Calling the Camel async processors.");
- }
+ LOG.trace("Calling the Camel async processors.");
return asyncInvoke(cxfExchange, serviceObject, method, paramArray, continuation);
} else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Calling the Camel sync processors.");
- }
+ LOG.trace("Calling the Camel sync processors.");
return syncInvoke(cxfExchange, serviceObject, method, paramArray);
}
}
@@ -85,9 +81,7 @@ public class CxfRsInvoker extends JAXRSI
CxfRsBinding binding = endpoint.getBinding();
binding.populateExchangeFromCxfRsRequest(cxfExchange, camelExchange, method, paramArray);
// Now we don't set up the timeout value
- if (LOG.isTraceEnabled()) {
- LOG.trace("Suspending continuation of exchangeId: " + camelExchange.getExchangeId());
- }
+ LOG.trace("Suspending continuation of exchangeId: {}", camelExchange.getExchangeId());
// TODO Support to set the timeout in case the Camel can't send the response back on time.
// The continuation could be called before the suspend is called
continuation.suspend(0);
@@ -96,9 +90,7 @@ public class CxfRsInvoker extends JAXRSI
public void done(boolean doneSync) {
// make sure the continuation resume will not be called before the suspend method in other thread
synchronized (continuation) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Resuming continuation of exchangeId: " + camelExchange.getExchangeId());
- }
+ LOG.trace("Resuming continuation of exchangeId: {}", camelExchange.getExchangeId());
// resume processing after both, sync and async callbacks
continuation.setObject(camelExchange);
continuation.resume();
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java Sun Mar 27 20:29:58 2011
@@ -90,9 +90,9 @@ public class CxfRsProducer extends Defau
String path = inMessage.getHeader(Exchange.HTTP_PATH, String.class);
if (LOG.isTraceEnabled()) {
- LOG.trace("HTTP method = " + httpMethod);
- LOG.trace("path = " + path);
- LOG.trace("responseClass = " + responseClass);
+ LOG.trace("HTTP method = {}", httpMethod);
+ LOG.trace("path = {}", path);
+ LOG.trace("responseClass = {}", responseClass);
}
// set the path
@@ -156,9 +156,7 @@ public class CxfRsProducer extends Defau
}
// set response
if (exchange.getPattern().isOutCapable()) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Response body = " + response);
- }
+ LOG.trace("Response body = {}", response);
exchange.getOut().setBody(binding.bindResponseToCamelBody(response, exchange));
exchange.getOut().setHeaders(binding.bindResponseHeadersToCamelHeaders(response, exchange));
}
@@ -277,9 +275,7 @@ public class CxfRsProducer extends Defau
if (response instanceof Response) {
for (Map.Entry<String, List<Object>> entry : ((Response) response).getMetadata().entrySet()) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Parse external header " + entry.getKey() + "=" + entry.getValue());
- }
+ LOG.trace("Parse external header {}={}", entry.getKey(), entry.getValue());
answer.put(entry.getKey(), entry.getValue().get(0).toString());
}
}
@@ -311,14 +307,10 @@ public class CxfRsProducer extends Defau
cache.put(address, new SoftReference<JAXRSClientFactoryBean>(retval));
- if (LOG.isTraceEnabled()) {
- LOG.trace("Created client factory bean and add to cache for address '" + address + "'");
- }
+ LOG.trace("Created client factory bean and add to cache for address '{}'", address);
} else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Retrieved client factory bean from cache for address '" + address + "'");
- }
+ LOG.trace("Retrieved client factory bean from cache for address '{}'", address);
}
}
return retval;
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java Sun Mar 27 20:29:58 2011
@@ -132,9 +132,7 @@ public class DefaultCxfRsBinding impleme
for (Map.Entry<String, Object> entry : camelHeaders.entrySet()) {
if (headerFilterStrategy.applyFilterToCamelHeaders(entry.getKey(), entry.getValue(), camelExchange)) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Drop Camel header: " + entry.getKey() + "=" + entry.getValue());
- }
+ LOG.trace("Drop Camel header: {}={}", entry.getKey(), entry.getValue());
continue;
}
@@ -143,10 +141,8 @@ public class DefaultCxfRsBinding impleme
mappedHeaderName = entry.getKey();
}
- if (LOG.isTraceEnabled()) {
- LOG.trace("Propagate Camel header: " + entry.getKey() + "=" + entry.getValue() + " as "
- + mappedHeaderName);
- }
+ LOG.trace("Propagate Camel header: {}={} as {}",
+ new Object[]{entry.getKey(), entry.getValue(), mappedHeaderName});
answer.putSingle(mappedHeaderName, entry.getValue().toString());
}
@@ -196,17 +192,13 @@ public class DefaultCxfRsBinding impleme
mappedHeaderName = entry.getKey();
}
- if (LOG.isTraceEnabled()) {
- LOG.trace("Populate external header " + entry.getKey() + "=" + entry.getValue()
- + " as " + mappedHeaderName);
- }
+ LOG.trace("Populate external header {}={} as {}",
+ new Object[]{entry.getKey(), entry.getValue(), mappedHeaderName});
answer.put(mappedHeaderName, entry.getValue().get(0));
} else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Drop external header " + entry.getKey() + "=" + entry.getValue());
- }
+ LOG.trace("Drop external header {}={}", entry.getKey(), entry.getValue());
}
}
@@ -259,9 +251,7 @@ public class DefaultCxfRsBinding impleme
Map<String, List<String>> headers = (Map<String, List<String>>)cxfMessage.get(org.apache.cxf.message.Message.PROTOCOL_HEADERS);
for (Map.Entry<String, List<String>>entry : headers.entrySet()) {
if (headerFilterStrategy.applyFilterToCamelHeaders(entry.getKey(), entry.getValue(), camelExchange)) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Drop CXF message protocol header: " + entry.getKey() + "=" + entry.getValue());
- }
+ LOG.trace("Drop CXF message protocol header: {}={}", entry.getKey(), entry.getValue());
} else {
// just put the first String element, as the complex one is filtered
camelMessage.setHeader(entry.getKey(), entry.getValue().get(0));
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java Sun Mar 27 20:29:58 2011
@@ -172,10 +172,8 @@ public final class CxfEndpointUtils {
if (retval == null) {
retval = defaultAddress;
} else {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Client address is overridden by header '" + Exchange.DESTINATION_OVERRIDE_URL
- + "' to value '" + retval + "'");
- }
+ LOG.trace("Client address is overridden by header '{}' to value '{}'",
+ Exchange.DESTINATION_OVERRIDE_URL, retval);
}
return retval;
}
Modified: camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java (original)
+++ camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java Sun Mar 27 20:29:58 2011
@@ -46,9 +46,7 @@ public class EventAdminConsumer extends
// TODO: populate exchange headers
exchange.getIn().setBody(event);
- if (LOG.isTraceEnabled()) {
- LOG.trace("EventAdmin " + endpoint.getTopic() + " is firing");
- }
+ LOG.trace("EventAdmin {} is firing", endpoint.getTopic());
try {
getProcessor().process(exchange);
// log exception if an exception occurred and was not handled
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java Sun Mar 27 20:29:58 2011
@@ -64,9 +64,7 @@ public class FtpConsumer extends RemoteF
}
protected boolean doPollDirectory(String absolutePath, String dirName, List<GenericFile<FTPFile>> fileList) {
- if (log.isTraceEnabled()) {
- log.trace("doPollDirectory from absolutePath: " + absolutePath + ", dirName: " + dirName);
- }
+ log.trace("doPollDirectory from absolutePath: {}, dirName: {}", absolutePath, dirName);
// remove trailing /
dirName = FileUtil.stripTrailingSeparator(dirName);
@@ -79,9 +77,7 @@ public class FtpConsumer extends RemoteF
dir = absolutePath;
}
- if (log.isTraceEnabled()) {
- log.trace("Polling directory: " + dir);
- }
+ log.trace("Polling directory: {}", dir);
List<FTPFile> files;
if (isStepwise()) {
files = operations.listFiles();
@@ -91,15 +87,11 @@ public class FtpConsumer extends RemoteF
if (files == null || files.isEmpty()) {
// no files in this directory to poll
- if (log.isTraceEnabled()) {
- log.trace("No files found in directory: " + dir);
- }
+ log.trace("No files found in directory: {}", dir);
return true;
} else {
// we found some files
- if (log.isTraceEnabled()) {
- log.trace("Found " + files.size() + " in directory: " + dir);
- }
+ log.trace("Found {} in directory: {}", files.size(), dir);
}
for (FTPFile file : files) {
@@ -124,9 +116,7 @@ public class FtpConsumer extends RemoteF
RemoteFile<FTPFile> remote = asRemoteFile(absolutePath, file);
if (isValidFile(remote, false)) {
if (isInProgress(remote)) {
- if (log.isTraceEnabled()) {
- log.trace("Skipping as file is already in progress: " + remote.getFileName());
- }
+ log.trace("Skipping as file is already in progress: {}", remote.getFileName());
} else {
// matched file so add
fileList.add(remote);
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java Sun Mar 27 20:29:58 2011
@@ -64,21 +64,20 @@ public class FtpOperations implements Re
}
public boolean connect(RemoteFileConfiguration configuration) throws GenericFileOperationFailedException {
- if (log.isTraceEnabled()) {
- log.trace("Connecting using FTPClient: " + client);
- }
+ log.trace("Connecting using FTPClient: {}", client);
String host = configuration.getHost();
int port = configuration.getPort();
String username = configuration.getUsername();
if (clientConfig != null) {
- log.trace("Configuring FTPClient with config: " + clientConfig);
+ log.trace("Configuring FTPClient with config: {}", clientConfig);
client.configure(clientConfig);
}
if (log.isTraceEnabled()) {
- log.trace("Connecting to " + configuration.remoteServerInformation() + " using connection timeout: " + client.getConnectTimeout());
+ log.trace("Connecting to {} using connection timeout: {}",
+ configuration.remoteServerInformation(), client.getConnectTimeout());
}
boolean connected = false;
@@ -87,7 +86,7 @@ public class FtpOperations implements Re
while (!connected) {
try {
if (log.isTraceEnabled() && attempt > 0) {
- log.trace("Reconnect attempt #" + attempt + " connecting to + " + configuration.remoteServerInformation());
+ log.trace("Reconnect attempt #{} connecting to {}", attempt, configuration.remoteServerInformation());
}
client.connect(host, port);
// must check reply code if we are connected
@@ -113,9 +112,7 @@ public class FtpOperations implements Re
failed = new GenericFileOperationFailedException(client.getReplyCode(), client.getReplyString(), e.getMessage(), e);
}
- if (log.isTraceEnabled()) {
- log.trace("Cannot connect due: " + failed.getMessage());
- }
+ log.trace("Cannot connect due: {}", failed.getMessage());
attempt++;
if (attempt > endpoint.getMaximumReconnectAttempts()) {
throw failed;
@@ -154,17 +151,13 @@ public class FtpOperations implements Re
try {
boolean login;
if (username != null) {
- if (log.isTraceEnabled()) {
- log.trace("Attempting to login user: " + username + " using password: " + configuration.getPassword());
- }
+ log.trace("Attempting to login user: {} using password: {}", username, configuration.getPassword());
login = client.login(username, configuration.getPassword());
} else {
log.trace("Attempting to login anonymous");
login = client.login("anonymous", "");
}
- if (log.isTraceEnabled()) {
- log.trace("User " + (username != null ? username : "anonymous") + " logged in: " + login);
- }
+ log.trace("User {} logged in: {}", username != null ? username : "anonymous", login);
if (!login) {
throw new GenericFileOperationFailedException(client.getReplyCode(), client.getReplyString());
}
@@ -180,9 +173,7 @@ public class FtpOperations implements Re
while (it.hasNext()) {
Object next = it.next();
String command = endpoint.getCamelContext().getTypeConverter().convertTo(String.class, next);
- if (log.isTraceEnabled()) {
- log.trace("Site command to send: " + command);
- }
+ log.trace("Site command to send: {}", command);
if (command != null) {
boolean result = sendSiteCommand(command);
if (!result) {
@@ -240,9 +231,7 @@ public class FtpOperations implements Re
// must normalize directory first
directory = endpoint.getConfiguration().normalizePath(directory);
- if (log.isTraceEnabled()) {
- log.trace("buildDirectory(" + directory + ")");
- }
+ log.trace("buildDirectory({})", directory);
try {
String originalDirectory = client.printWorkingDirectory();
@@ -251,9 +240,7 @@ public class FtpOperations implements Re
// maybe the full directory already exists
success = client.changeWorkingDirectory(directory);
if (!success) {
- if (log.isTraceEnabled()) {
- log.trace("Trying to build remote directory: " + directory);
- }
+ log.trace("Trying to build remote directory: {}", directory);
success = client.makeDirectory(directory);
if (!success) {
// we are here if the server side doesn't create intermediate folders so create the folder one by one
@@ -274,9 +261,7 @@ public class FtpOperations implements Re
}
public boolean retrieveFile(String name, Exchange exchange) throws GenericFileOperationFailedException {
- if (log.isTraceEnabled()) {
- log.trace("retrieveFile(" + name + ")");
- }
+ log.trace("retrieveFile({})", name);
if (ObjectHelper.isNotEmpty(endpoint.getLocalWorkDirectory())) {
// local work directory is configured so we should store file content as files in this local directory
return retrieveFileToFileInLocalWorkDirectory(name, exchange);
@@ -402,9 +387,7 @@ public class FtpOperations implements Re
}
} catch (IOException e) {
- if (log.isTraceEnabled()) {
- log.trace("Error occurred during retrieving file: " + name + " to local directory. Deleting local work file: " + temp);
- }
+ log.trace("Error occurred during retrieving file: {} to local directory. Deleting local work file: {}", name, temp);
// failed to retrieve the file so we need to close streams and delete in progress file
// must close stream before deleting file
IOHelper.close(os, "retrieve: " + name, log);
@@ -423,9 +406,7 @@ public class FtpOperations implements Re
}
if (result) {
- if (log.isTraceEnabled()) {
- log.trace("Renaming local in progress file from: " + temp + " to: " + local);
- }
+ log.trace("Renaming local in progress file from: {} to: {}", temp, local);
// operation went okay so rename temp to local after we have retrieved the data
if (!FileUtil.renameFile(temp, local)) {
throw new GenericFileOperationFailedException("Cannot rename local work file from: " + temp + " to: " + local);
@@ -439,9 +420,7 @@ public class FtpOperations implements Re
// must normalize name first
name = endpoint.getConfiguration().normalizePath(name);
- if (log.isTraceEnabled()) {
- log.trace("storeFile(" + name + ")");
- }
+ log.trace("storeFile({})", name);
boolean answer = false;
String currentDir = null;
@@ -473,18 +452,14 @@ public class FtpOperations implements Re
}
private boolean doStoreFile(String name, String targetName, Exchange exchange) throws GenericFileOperationFailedException {
- if (log.isTraceEnabled()) {
- log.trace("doStoreFile(" + targetName + ")");
- }
+ log.trace("doStoreFile({})", targetName);
// if an existing file already exists what should we do?
if (endpoint.getFileExist() == GenericFileExist.Ignore || endpoint.getFileExist() == GenericFileExist.Fail) {
boolean existFile = existsFile(targetName);
if (existFile && endpoint.getFileExist() == GenericFileExist.Ignore) {
// ignore but indicate that the file was written
- if (log.isTraceEnabled()) {
- log.trace("An existing file already exists: " + name + ". Ignore and do not override it.");
- }
+ log.trace("An existing file already exists: {}. Ignore and do not override it.", name);
return true;
} else if (existFile && endpoint.getFileExist() == GenericFileExist.Fail) {
throw new GenericFileOperationFailedException("File already exist: " + name + ". Cannot write new file.");
@@ -509,9 +484,7 @@ public class FtpOperations implements Re
}
public boolean existsFile(String name) throws GenericFileOperationFailedException {
- if (log.isTraceEnabled()) {
- log.trace("existsFile(" + name + ")");
- }
+ log.trace("existsFile({})", name);
// check whether a file already exists
String directory = FileUtil.onlyPath(name);
@@ -528,9 +501,7 @@ public class FtpOperations implements Re
return false;
}
for (String existing : names) {
- if (log.isTraceEnabled()) {
- log.trace("Existing file: " + existing + ", target file: " + name);
- }
+ log.trace("Existing file: {}, target file: {}", existing, name);
existing = FileUtil.stripPath(existing);
if (existing != null && existing.equals(onlyName)) {
return true;
@@ -543,9 +514,7 @@ public class FtpOperations implements Re
}
public String getCurrentDirectory() throws GenericFileOperationFailedException {
- if (log.isTraceEnabled()) {
- log.trace("getCurrentDirectory()");
- }
+ log.trace("getCurrentDirectory()");
try {
return client.printWorkingDirectory();
} catch (IOException e) {
@@ -554,9 +523,7 @@ public class FtpOperations implements Re
}
public void changeCurrentDirectory(String path) throws GenericFileOperationFailedException {
- if (log.isTraceEnabled()) {
- log.trace("changeCurrentDirectory(" + path + ")");
- }
+ log.trace("changeCurrentDirectory({})", path);
if (ObjectHelper.isEmpty(path)) {
return;
}
@@ -597,9 +564,7 @@ public class FtpOperations implements Re
return;
}
- if (log.isTraceEnabled()) {
- log.trace("Changing directory: " + path);
- }
+ log.trace("Changing directory: {}", path);
boolean success;
try {
if ("..".equals(path)) {
@@ -625,9 +590,7 @@ public class FtpOperations implements Re
}
public List<FTPFile> listFiles() throws GenericFileOperationFailedException {
- if (log.isTraceEnabled()) {
- log.trace("listFiles()");
- }
+ log.trace("listFiles()");
try {
final List<FTPFile> list = new ArrayList<FTPFile>();
FTPFile[] files = client.listFiles();
@@ -642,9 +605,7 @@ public class FtpOperations implements Re
}
public List<FTPFile> listFiles(String path) throws GenericFileOperationFailedException {
- if (log.isTraceEnabled()) {
- log.trace("listFiles(" + path + ")");
- }
+ log.trace("listFiles({})", path);
// use current directory if path not given
if (ObjectHelper.isEmpty(path)) {
path = ".";
@@ -664,9 +625,7 @@ public class FtpOperations implements Re
}
public boolean sendNoop() throws GenericFileOperationFailedException {
- if (log.isTraceEnabled()) {
- log.trace("sendNoOp");
- }
+ log.trace("sendNoOp");
try {
return client.sendNoOp();
} catch (IOException e) {
@@ -675,9 +634,7 @@ public class FtpOperations implements Re
}
public boolean sendSiteCommand(String command) throws GenericFileOperationFailedException {
- if (log.isTraceEnabled()) {
- log.trace("sendSiteCommand(" + command + ")");
- }
+ log.trace("sendSiteCommand({})", command);
try {
return client.sendSiteCommand(command);
} catch (IOException e) {
@@ -701,9 +658,7 @@ public class FtpOperations implements Re
// do not try to build root folder (/ or \)
if (!(directory.equals("/") || directory.equals("\\"))) {
- if (log.isTraceEnabled()) {
- log.trace("Trying to build remote directory by chunk: " + directory);
- }
+ log.trace("Trying to build remote directory by chunk: {}", directory);
success = client.makeDirectory(directory);
}
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java?rev=1086028&r1=1086027&r2=1086028&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java Sun Mar 27 20:29:58 2011
@@ -72,9 +72,7 @@ public abstract class RemoteFileConsumer
@Override
protected void postPollCheck() {
if (getEndpoint().isDisconnect()) {
- if (log.isTraceEnabled()) {
- log.trace("postPollCheck disconnect from: " + getEndpoint());
- }
+ log.trace("postPollCheck disconnect from: {}", getEndpoint());
disconnect();
}
}