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/06/10 08:02:12 UTC
svn commit: r1134198 [1/5] - in /camel/trunk/components:
camel-atom/src/main/java/org/apache/camel/component/atom/
camel-bam/src/main/java/org/apache/camel/bam/model/
camel-bam/src/main/java/org/apache/camel/bam/processor/
camel-bindy/src/main/java/org...
Author: cmueller
Date: Fri Jun 10 06:02:06 2011
New Revision: 1134198
URL: http://svn.apache.org/viewvc?rev=1134198&view=rev
Log:
CAMEL-3759: After switching to slf4j, we can get rid of the 'isTraceEnabled', 'isDebugEnabled' and 'isInfoEnabled' statements
Modified:
camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/UpdatedDateFilter.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintDataFormatResolver.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintLanguageResolver.java
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/CacheConsumer.java
camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheEventListener.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/CacheBasedMessageBodyReplacer.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/CacheBasedXPathReplacer.java
camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheValidate.java
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerFIFOTest.java
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/QualifiedContextComponent.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.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-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfClientCallback.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.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/cxfbean/CxfBeanDestination.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
camel/trunk/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecBinding.java
camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackComponent.java
camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.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/FtpsEndpoint.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.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/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-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadAndRecoverTest.java
camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java
camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadTest.java
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPDecoder.java
camel/trunk/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7MLLPEncoder.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisConsumer.java
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java
camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/DefaultJettyHttpBinding.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingComponent.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/JmsConsumer.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.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/ReplyManagerSupport.java
camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.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/KestrelComponent.java
camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelConsumer.java
camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelProducer.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-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailProducer.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/DummyTrustManager.java
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.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-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultClientPipelineFactory.java
camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultServerPipelineFactory.java
camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConsumer.java
camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.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-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactoryAsynchTest.java
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyCustomPipelineFactorySynchTest.java
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPSyncNotLazyChannelTest.java
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPAsyncTest.java
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPObjectSyncTest.java
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPSyncTest.java
camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterOperations.java
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java
camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java
camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjProducer.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/routing/FixMessageRouter.java
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/MethodBasedRouter.java
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletConsumer.java
camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxServiceSupport.java
camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/direct/RouteboxDirectProducer.java
camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/seda/RouteboxSedaConsumer.java
camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/strategy/RouteboxDispatcher.java
camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDefaultContextAndRouteBuilderTest.java
camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectProducerOnlyTest.java
camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDirectTest.java
camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxDispatchMapTest.java
camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/RouteboxSedaTest.java
camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/demo/BookCatalog.java
camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipSubscriptionListener.java
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpEndpoint.java
camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java
camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapConsumer.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java
camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/test/JavaConfigContextLoader.java
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/ValidatorComponent.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/osgi/CamelContextFactory.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.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/SpringCamelContext.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadAndRecoverTest.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadTest.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/StreamEndpoint.java
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.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/XmppEndpoint.java
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppLogger.java
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
Modified: camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/UpdatedDateFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/UpdatedDateFilter.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/UpdatedDateFilter.java (original)
+++ camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/UpdatedDateFilter.java Fri Jun 10 06:02:06 2011
@@ -45,17 +45,12 @@ public class UpdatedDateFilter implement
updated = ((Entry)entry).getPublished();
}
if (updated == null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("No updated time for entry so assuming its valid: entry=[" + entry + "]");
- }
+ LOG.debug("No updated time for entry so assuming its valid: entry=[{}]", entry);
return true;
}
if (lastUpdate != null) {
if (lastUpdate.after(updated) || lastUpdate.equals(updated)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Entry is older than lastupdate=[" + lastUpdate
- + "], no valid entry=[" + entry + "]");
- }
+ LOG.debug("Entry is older than lastupdate=[{}], no valid entry=[{}]", lastUpdate, entry);
return false;
}
}
Modified: camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java (original)
+++ camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java Fri Jun 10 06:02:06 2011
@@ -165,9 +165,7 @@ public class ActivityState extends Tempo
if (!isStarted()) {
setTimeStarted(currentTime());
context.onStarted(this);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Activity first message: " + this);
- }
+ LOG.debug("Activity first message: {}", this);
}
}
@@ -180,9 +178,7 @@ public class ActivityState extends Tempo
// must also clear overdue otherwise we will get failures
setTimeOverdue(null);
context.onCompleted(this);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Activity complete: " + this);
- }
+ LOG.debug("Activity complete: {}", this);
}
}
Modified: camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java (original)
+++ camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java Fri Jun 10 06:02:06 2011
@@ -91,9 +91,7 @@ public class ActivityMonitorEngine exten
long timeToSleep = nextPoll - System.currentTimeMillis();
if (timeToSleep > 0) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Sleeping for " + timeToSleep + " millis");
- }
+ LOG.debug("Sleeping for {} millis", timeToSleep);
try {
Thread.sleep(timeToSleep);
} catch (InterruptedException e) {
@@ -108,9 +106,7 @@ public class ActivityMonitorEngine exten
@SuppressWarnings("unchecked")
protected void fireExpiredEvent(final ActivityState activityState) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Trying to fire expiration of: " + activityState);
- }
+ LOG.debug("Trying to fire expiration of: {}", activityState);
template.execute(new JpaCallback() {
public Object doInJpa(EntityManager entityManager) throws PersistenceException {
Modified: camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java (original)
+++ camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java Fri Jun 10 06:02:06 2011
@@ -93,9 +93,7 @@ public abstract class BamProcessorSuppor
T entity = loadEntity(exchange, key);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Correlation key: " + key + " with entity: " + entity);
- }
+ LOG.debug("Correlation key: {} with entity: {}", key, entity);
processEntity(exchange, entity);
return entity;
@@ -105,7 +103,7 @@ public abstract class BamProcessorSuppor
}
});
if (i > 1) {
- LOG.info("Attempt " + i + " worked!");
+ LOG.info("Attempt {} worked!", i);
}
return;
} catch (Exception e) {
Modified: camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java (original)
+++ camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java Fri Jun 10 06:02:06 2011
@@ -47,9 +47,7 @@ public class JpaBamProcessor extends Jpa
}
protected void processEntity(Exchange exchange, ProcessInstance process) throws Exception {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Processing process instance: " + process);
- }
+ LOG.debug("Processing process instance: {}", process);
// lets force the lazy creation of this activity
ActivityRules rules = getActivityRules();
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java Fri Jun 10 06:02:06 2011
@@ -50,7 +50,7 @@ public abstract class BindyAbstractFacto
if (LOG.isDebugEnabled()) {
for (String str : this.packageNames) {
- LOG.debug("Package name: " + str);
+ LOG.debug("Package name: {}", str);
}
}
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java Fri Jun 10 06:02:06 2011
@@ -98,14 +98,15 @@ public class BindyCsvFactory extends Bin
List<Field> linkFields = new ArrayList<Field>();
if (LOG.isDebugEnabled()) {
- LOG.debug("Class retrieved : " + cl.getName());
+ LOG.debug("Class retrieved : {}", cl.getName());
}
for (Field field : cl.getDeclaredFields()) {
DataField dataField = field.getAnnotation(DataField.class);
if (dataField != null) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Position defined in the class : " + cl.getName() + ", position : " + dataField.pos() + ", Field : " + dataField.toString());
+ LOG.debug("Position defined in the class : {}, position : {}, Field : {}",
+ new Object[]{cl.getName(), dataField.pos(), dataField});
}
if (dataField.required()) {
@@ -122,7 +123,7 @@ public class BindyCsvFactory extends Bin
if (linkField != null) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Class linked : " + cl.getName() + ", Field" + field.toString());
+ LOG.debug("Class linked : {}, Field {}", cl.getName(), field);
}
linkFields.add(field);
}
@@ -136,11 +137,10 @@ public class BindyCsvFactory extends Bin
totalFields = numberMandatoryFields + numberOptionalFields;
if (LOG.isDebugEnabled()) {
- LOG.debug("Number of optional fields : " + numberOptionalFields);
- LOG.debug("Number of mandatory fields : " + numberMandatoryFields);
- LOG.debug("Total : " + totalFields);
+ LOG.debug("Number of optional fields : {}", numberOptionalFields);
+ LOG.debug("Number of mandatory fields : {}", numberMandatoryFields);
+ LOG.debug("Total : {}", totalFields);
}
-
}
}
@@ -175,7 +175,7 @@ public class BindyCsvFactory extends Bin
field.setAccessible(true);
if (LOG.isDebugEnabled()) {
- LOG.debug("Pos : " + pos + ", Data : " + data + ", Field type : " + field.getType());
+ LOG.debug("Pos : {}, Data : {}, Field type : {}", new Object[]{pos, data, field.getType()});
}
Format<?> format;
@@ -210,9 +210,7 @@ public class BindyCsvFactory extends Bin
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Counter mandatory fields : " + counterMandatoryFields);
- }
+ LOG.debug("Counter mandatory fields : {}", counterMandatoryFields);
if (pos < totalFields) {
throw new IllegalArgumentException("Some fields are missing (optional or mandatory), line : " + line);
@@ -236,7 +234,7 @@ public class BindyCsvFactory extends Bin
char separator = Converter.getCharDelimitor(this.getSeparator());
if (LOG.isDebugEnabled()) {
- LOG.debug("Separator converted : '0x" + Integer.toHexString(separator) + "', from : " + this.getSeparator());
+ LOG.debug("Separator converted : '0x{}', from : {}", Integer.toHexString(separator), this.getSeparator());
}
for (Class clazz : models) {
@@ -244,7 +242,7 @@ public class BindyCsvFactory extends Bin
Object obj = model.get(clazz.getName());
if (LOG.isDebugEnabled()) {
- LOG.debug("Model object : " + obj + ", class : " + obj.getClass().getName());
+ LOG.debug("Model object : {}, class : {}", obj, obj.getClass().getName());
}
if (obj != null) {
@@ -333,14 +331,14 @@ public class BindyCsvFactory extends Bin
v.add(l.get(idx));
index.put(ii, idx);
if (LOG.isDebugEnabled()) {
- LOG.debug("Value : " + l.get(idx) + ", pos : " + ii + ", at :" + idx);
+ LOG.debug("Value : {}, pos : {}, at : {}", new Object[]{l.get(idx), ii, idx});
}
} else {
v.add(l.get(0));
index.put(ii, 0);
++idxSize;
if (LOG.isDebugEnabled()) {
- LOG.debug("Value : " + l.get(0) + ", pos : " + ii + ", at index : " + 0);
+ LOG.debug("Value : {}, pos : {}, at index : {}", new Object[]{l.get(0), ii, 0});
}
}
}
@@ -395,7 +393,7 @@ public class BindyCsvFactory extends Bin
result = formatString(format, value);
if (LOG.isDebugEnabled()) {
- LOG.debug("Value to be formatted : " + value + ", position : " + datafield.pos() + ", and its formated value : " + result);
+ LOG.debug("Value to be formatted : {}, position : {}, and its formated value : {}", new Object[]{value, datafield.pos(), result});
}
} else {
@@ -413,7 +411,7 @@ public class BindyCsvFactory extends Bin
Integer keyGenerated = generateKey(key1, key2);
if (LOG.isDebugEnabled()) {
- LOG.debug("Key generated : " + String.valueOf(keyGenerated) + ", for section : " + key1);
+ LOG.debug("Key generated : {}, for section : {}", String.valueOf(keyGenerated), key1);
}
key = keyGenerated;
@@ -520,41 +518,28 @@ public class BindyCsvFactory extends Bin
Section section = cl.getAnnotation(Section.class);
if (record != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Csv record : " + record.toString());
- }
+ LOG.debug("Csv record : {}", record);
// Get skipFirstLine parameter
skipFirstLine = record.skipFirstLine();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Skip First Line parameter of the CSV : " + skipFirstLine);
- }
+ LOG.debug("Skip First Line parameter of the CSV : {}" + skipFirstLine);
// Get generateHeaderColumnNames parameter
generateHeaderColumnNames = record.generateHeaderColumns();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Generate header column names parameter of the CSV : " + generateHeaderColumnNames);
- }
+ LOG.debug("Generate header column names parameter of the CSV : {}", generateHeaderColumnNames);
// Get Separator parameter
ObjectHelper.notNull(record.separator(), "No separator has been defined in the @Record annotation !");
separator = record.separator();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Separator defined for the CSV : " + separator);
- }
+ LOG.debug("Separator defined for the CSV : {}", separator);
// Get carriage return parameter
crlf = record.crlf();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Carriage return defined for the CSV : " + crlf);
- }
+ LOG.debug("Carriage return defined for the CSV : {}", crlf);
// Get isOrdered parameter
messageOrdered = record.isOrdered();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Must CSV record be ordered ? " + messageOrdered);
- }
-
+ LOG.debug("Must CSV record be ordered ? {}", messageOrdered);
}
if (section != null) {
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java Fri Jun 10 06:02:06 2011
@@ -92,15 +92,14 @@ public class BindyFixedLengthFactory ext
List<Field> linkFields = new ArrayList<Field>();
if (LOG.isDebugEnabled()) {
- LOG.debug("Class retrieved: " + cl.getName());
+ LOG.debug("Class retrieved: {}", cl.getName());
}
for (Field field : cl.getDeclaredFields()) {
DataField dataField = field.getAnnotation(DataField.class);
if (dataField != null) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Position defined in the class: " + cl.getName()
- + ", position: " + dataField.pos() + ", Field: " + dataField.toString());
+ LOG.debug("Position defined in the class: {}, position: {}, Field: {}", new Object[]{cl.getName(), dataField.pos(), dataField});
}
if (dataField.required()) {
@@ -117,7 +116,7 @@ public class BindyFixedLengthFactory ext
if (linkField != null) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Class linked: " + cl.getName() + ", Field: " + field.toString());
+ LOG.debug("Class linked: {}, Field: {}", cl.getName(), field);
}
linkFields.add(field);
}
@@ -131,9 +130,9 @@ public class BindyFixedLengthFactory ext
totalFields = numberMandatoryFields + numberOptionalFields;
if (LOG.isDebugEnabled()) {
- LOG.debug("Number of optional fields: " + numberOptionalFields);
- LOG.debug("Number of mandatory fields: " + numberMandatoryFields);
- LOG.debug("Total: " + totalFields);
+ LOG.debug("Number of optional fields: {}", numberOptionalFields);
+ LOG.debug("Number of mandatory fields: {}", numberMandatoryFields);
+ LOG.debug("Total: {}", totalFields);
}
}
@@ -202,7 +201,7 @@ public class BindyFixedLengthFactory ext
field.setAccessible(true);
if (LOG.isDebugEnabled()) {
- LOG.debug("Pos/Offset: " + offset + ", Data: " + token + ", Field type: " + field.getType());
+ LOG.debug("Pos/Offset: {}, Data: {}, Field type: {}", new Object[]{offset, token, field.getType()});
}
Format<?> format;
@@ -237,9 +236,7 @@ public class BindyFixedLengthFactory ext
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Counter mandatory fields: " + counterMandatoryFields);
- }
+ LOG.debug("Counter mandatory fields: {}", counterMandatoryFields);
if (pos < totalFields) {
throw new IllegalArgumentException("Some fields are missing (optional or mandatory), line: " + line);
@@ -263,7 +260,7 @@ public class BindyFixedLengthFactory ext
Object obj = model.get(clazz.getName());
if (LOG.isDebugEnabled()) {
- LOG.debug("Model object: " + obj + ", class: " + obj.getClass().getName());
+ LOG.debug("Model object: {}, class: {}", obj, obj.getClass().getName());
}
if (obj != null) {
@@ -383,7 +380,7 @@ public class BindyFixedLengthFactory ext
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Value to be formatted: " + value + ", position: " + datafield.pos() + ", and its formatted value: " + result);
+ LOG.debug("Value to be formatted: {}, position: {}, and its formatted value: {}", new Object[]{value, datafield.pos(), result});
}
} else {
@@ -429,45 +426,31 @@ public class BindyFixedLengthFactory ext
FixedLengthRecord record = cl.getAnnotation(FixedLengthRecord.class);
if (record != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Fixed length record : " + record.toString());
- }
+ LOG.debug("Fixed length record : {}", record);
// Get carriage return parameter
crlf = record.crlf();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Carriage return defined for the CSV : " + crlf);
- }
+ LOG.debug("Carriage return defined for the CSV : {}", crlf);
// Get hasHeader parameter
hasHeader = record.hasHeader();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Has Header : " + hasHeader);
- }
+ LOG.debug("Has Header : {}", hasHeader);
// Get hasFooter parameter
hasFooter = record.hasFooter();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Has Footer : " + hasFooter);
- }
+ LOG.debug("Has Footer : {}", hasFooter);
// Get padding character
paddingChar = record.paddingChar();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Padding char : " + paddingChar);
- }
+ LOG.debug("Padding char : {}", paddingChar);
// Get length of the record
recordLength = record.length();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Length of the record : " + recordLength);
- }
+ LOG.debug("Length of the record : {}", recordLength);
// Get length of the record
recordLength = record.length();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Length of the record : " + recordLength);
- }
+ LOG.debug("Length of the record : {}", recordLength);
}
}
}
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java Fri Jun 10 06:02:06 2011
@@ -94,7 +94,7 @@ public class BindyKeyValuePairFactory ex
KeyValuePairField keyValuePairField = field.getAnnotation(KeyValuePairField.class);
if (keyValuePairField != null) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Key declared in the class : " + cl.getName() + ", key : " + keyValuePairField.tag() + ", Field : " + keyValuePairField.toString());
+ LOG.debug("Key declared in the class : {}, key : {}, Field : {}", new Object[]{cl.getName(), keyValuePairField.tag(), keyValuePairField});
}
keyValuePairFields.put(keyValuePairField.tag(), keyValuePairField);
annotedFields.put(keyValuePairField.tag(), field);
@@ -104,7 +104,7 @@ public class BindyKeyValuePairFactory ex
if (linkField != null) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Class linked : " + cl.getName() + ", Field" + field.toString());
+ LOG.debug("Class linked : {}, Field {}", cl.getName(), field);
}
linkFields.add(field);
}
@@ -124,9 +124,7 @@ public class BindyKeyValuePairFactory ex
Map<Integer, List> results = new HashMap<Integer, List>();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Key value pairs data : " + data);
- }
+ LOG.debug("Key value pairs data : {}", data);
// Separate the key from its value
// e.g 8=FIX 4.1 --> key = 8 and Value = FIX 4.1
@@ -146,9 +144,7 @@ public class BindyKeyValuePairFactory ex
// Extract key value
String value = keyValuePair[1];
- if (LOG.isDebugEnabled()) {
- LOG.debug("Key : " + key + ", value : " + value);
- }
+ LOG.debug("Key : {}, value : {}", key, value);
// Add value to the Map using key value as key
if (!results.containsKey(key)) {
@@ -294,9 +290,7 @@ public class BindyKeyValuePairFactory ex
// format the value of the key received
result = formatField(format, value, key, line);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Value formated : " + result);
- }
+ LOG.debug("Value formated : {}", result);
} else {
result = getDefaultValueForPrimitive(field.getType());
@@ -336,9 +330,7 @@ public class BindyKeyValuePairFactory ex
// format the value of the key received
Object result = formatField(format, value, key, line);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Value formated : " + result);
- }
+ LOG.debug("Value formated : {}", result);
try {
if (value != null) {
@@ -439,7 +431,7 @@ public class BindyKeyValuePairFactory ex
char separator = Converter.getCharDelimitor(this.getPairSeparator());
if (LOG.isDebugEnabled()) {
- LOG.debug("Separator converted : '0x" + Integer.toHexString(separator) + "', from : " + this.getPairSeparator());
+ LOG.debug("Separator converted : '0x{}', from : {}", Integer.toHexString(separator), this.getPairSeparator());
}
while (it.hasNext()) {
@@ -453,7 +445,7 @@ public class BindyKeyValuePairFactory ex
field.setAccessible(true);
if (LOG.isDebugEnabled()) {
- LOG.debug("Tag : " + keyValuePairField.tag() + ", Field type : " + field.getType() + ", class : " + field.getDeclaringClass().getName());
+ LOG.debug("Tag : {}, Field type : {}, class : {}", new Object[]{keyValuePairField.tag(), field.getType(), field.getDeclaringClass().getName()});
}
// Retrieve the format, pattern and precision associated to the type
@@ -478,14 +470,12 @@ public class BindyKeyValuePairFactory ex
Integer key1 = sections.get(obj.getClass().getName());
Integer key2 = keyValuePairField.position();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Key of the section : " + key1 + ", and the field : " + key2);
- }
+ LOG.debug("Key of the section : {}, and the field : {}", key1, key2);
Integer keyGenerated = generateKey(key1, key2);
if (LOG.isDebugEnabled()) {
- LOG.debug("Key generated : " + String.valueOf(keyGenerated) + ", for section : " + key1);
+ LOG.debug("Key generated : {}, for section : {}", String.valueOf(keyGenerated), key1);
}
// Add value to the list if not null
@@ -504,7 +494,7 @@ public class BindyKeyValuePairFactory ex
String value = keyValuePairField.tag() + this.getKeyValuePairSeparator() + valueFormated;
if (LOG.isDebugEnabled()) {
- LOG.debug("Value to be formatted : " + keyValue + ", for the tag : " + keyValuePairField.tag() + ", and its formated value : " + valueFormated);
+ LOG.debug("Value to be formatted : {}, for the tag : {}, and its formated value : {}", new Object[]{keyValue, keyValuePairField.tag(), valueFormated});
}
// Add the content to the TreeMap according to the
@@ -512,7 +502,7 @@ public class BindyKeyValuePairFactory ex
positions.put(keyGenerated, value);
if (LOG.isDebugEnabled()) {
- LOG.debug("Positions size : " + positions.size());
+ LOG.debug("Positions size : {}", positions.size());
}
}
} else {
@@ -536,7 +526,7 @@ public class BindyKeyValuePairFactory ex
builder.append(value);
if (LOG.isDebugEnabled()) {
- LOG.debug("Value added : " + keyValuePairField.tag() + this.getKeyValuePairSeparator() + valueFormated + separator);
+ LOG.debug("Value added : {}{}{}{}", new Object[]{keyValuePairField.tag(), this.getKeyValuePairSeparator(), valueFormated, separator});
}
}
}
@@ -553,7 +543,7 @@ public class BindyKeyValuePairFactory ex
String value = positions.get(posit.next());
if (LOG.isDebugEnabled()) {
- LOG.debug("Value added at the position (" + posit + ") : " + value + separator);
+ LOG.debug("Value added at the position ({}) : {}{}", new Object[]{posit, value, separator});
}
builder.append(value + separator);
@@ -621,28 +611,20 @@ public class BindyKeyValuePairFactory ex
// Get Pair Separator parameter
ObjectHelper.notNull(message.pairSeparator(), "No Pair Separator has been defined in the @Message annotation !");
pairSeparator = message.pairSeparator();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Pair Separator defined for the message : " + pairSeparator);
- }
+ LOG.debug("Pair Separator defined for the message : {}", pairSeparator);
// Get KeyValuePair Separator parameter
ObjectHelper.notNull(message.keyValuePairSeparator(), "No Key Value Pair Separator has been defined in the @Message annotation !");
keyValuePairSeparator = message.keyValuePairSeparator();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Key Value Pair Separator defined for the message : " + keyValuePairSeparator);
- }
+ LOG.debug("Key Value Pair Separator defined for the message : {}", keyValuePairSeparator);
// Get carriage return parameter
crlf = message.crlf();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Carriage return defined for the message : " + crlf);
- }
+ LOG.debug("Carriage return defined for the message : {}", crlf);
// Get isOrderer parameter
messageOrdered = message.isOrdered();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Is the message ordered in output : " + messageOrdered);
- }
+ LOG.debug("Is the message ordered in output : {}", messageOrdered);
}
if (section != null) {
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java Fri Jun 10 06:02:06 2011
@@ -160,9 +160,8 @@ public class BindyCsvDataFormat extends
}
if (result.size() > 0) {
-
if (LOG.isDebugEnabled()) {
- LOG.debug("Size of the record splitted : " + result.size());
+ LOG.debug("Size of the record splitted : {}", result.size());
}
// Bind data from CSV record with model classes
@@ -174,12 +173,8 @@ public class BindyCsvDataFormat extends
// Add objects graph to the list
models.add(model);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Graph of objects created : " + model);
- }
-
+ LOG.debug("Graph of objects created : {}", model);
}
-
}
// Test if models list is empty or not
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java Fri Jun 10 06:02:06 2011
@@ -146,10 +146,7 @@ public class BindyFixedLengthDataFormat
// Add objects graph to the list
models.add(model);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Graph of objects created : " + model);
- }
-
+ LOG.debug("Graph of objects created : {}", model);
}
// Test if models list is empty or not
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java Fri Jun 10 06:02:06 2011
@@ -115,7 +115,6 @@ public class BindyKeyValuePairDataFormat
}
if (result.size() > 0) {
-
// Bind data from message with model classes
// Counter is used to detect line where error occurs
factory.bind(result, model, count);
@@ -126,11 +125,8 @@ public class BindyKeyValuePairDataFormat
// Add objects graph to the list
models.add(model);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Graph of objects created : " + model);
- }
+ LOG.debug("Graph of objects created : {}", model);
}
-
}
// Test if models list is empty or not
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java Fri Jun 10 06:02:06 2011
@@ -38,9 +38,7 @@ public class BlueprintComponentResolver
try {
Object bean = context.getRegistry().lookup(name);
if (bean instanceof Component) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Found component: " + name + " in registry: " + bean);
- }
+ LOG.debug("Found component: {} in registry: {}", name, bean);
return (Component) bean;
} else {
// lets use Camel's type conversion mechanism to convert things like CamelContext
@@ -56,9 +54,7 @@ public class BlueprintComponentResolver
try {
Object bean = context.getRegistry().lookup(".camelBlueprint.componentResolver." + name);
if (bean instanceof ComponentResolver) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Found component resolver: " + name + " in registry: " + bean);
- }
+ LOG.debug("Found component resolver: {} in registry: {}", name, bean);
return ((ComponentResolver) bean).resolveComponent(name, context);
}
} catch (Exception e) {
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintDataFormatResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintDataFormatResolver.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintDataFormatResolver.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintDataFormatResolver.java Fri Jun 10 06:02:06 2011
@@ -37,9 +37,7 @@ public class BlueprintDataFormatResolver
try {
Object bean = context.getRegistry().lookup(".camelBlueprint.dataformatResolver." + name);
if (bean instanceof DataFormatResolver) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Found dataformat resolver: " + name + " in registry: " + bean);
- }
+ LOG.debug("Found dataformat resolver: {} in registry: {}", name, bean);
return ((DataFormatResolver) bean).resolveDataFormat(name, context);
}
} catch (Exception e) {
Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintLanguageResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintLanguageResolver.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintLanguageResolver.java (original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintLanguageResolver.java Fri Jun 10 06:02:06 2011
@@ -37,9 +37,7 @@ public class BlueprintLanguageResolver e
try {
Object bean = context.getRegistry().lookup(".camelBlueprint.languageResolver." + name);
if (bean instanceof LanguageResolver) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Found language resolver: " + name + " in registry: " + bean);
- }
+ LOG.debug("Found language resolver: {} in registry: {}", name, bean);
return ((LanguageResolver) bean).resolveLanguage(name, context);
}
} catch (Exception e) {
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=1134198&r1=1134197&r2=1134198&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 Fri Jun 10 06:02:06 2011
@@ -56,21 +56,19 @@ public class ContextScanRouteBuilderFind
// certain beans should be ignored
if (shouldIgnoreBean(bean)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Ignoring RouteBuilder id: " + key);
- }
+ LOG.debug("Ignoring RouteBuilder id: {}", key);
continue;
}
if (!isFilteredClass(bean)) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Ignoring filtered RouteBuilder id: " + key + " as class: " + bean.getClass());
+ LOG.debug("Ignoring filtered RouteBuilder id: {} as class: {}", key, bean.getClass());
}
continue;
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Adding instantiated RouteBuilder id: " + key + " as class: " + bean.getClass());
+ LOG.debug("Adding instantiated RouteBuilder id: {} as class: {}", key, bean.getClass());
}
list.add((RoutesBuilder) 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=1134198&r1=1134197&r2=1134198&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 Fri Jun 10 06:02:06 2011
@@ -61,16 +61,12 @@ public class PackageScanRouteBuilderFind
// certain beans should be ignored
if (shouldIgnoreBean(aClass)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Ignoring RouteBuilder class: " + aClass);
- }
+ LOG.debug("Ignoring RouteBuilder class: {}", aClass);
continue;
}
if (!isValidClass(aClass)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Ignoring invalid RouteBuilder class: " + aClass);
- }
+ LOG.debug("Ignoring invalid RouteBuilder class: {}", aClass);
continue;
}
@@ -80,9 +76,7 @@ public class PackageScanRouteBuilderFind
// Inject the annotated resource
// beanPostProcessor.postProcessBeforeInitialization(builder, builder.toString());
// }
- if (LOG.isDebugEnabled()) {
- LOG.debug("Adding instantiated RouteBuilder: " + builder);
- }
+ LOG.debug("Adding instantiated RouteBuilder: {}", builder);
list.add(builder);
}
}
Modified: camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConsumer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConsumer.java (original)
+++ camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConsumer.java Fri Jun 10 06:02:06 2011
@@ -48,5 +48,4 @@ public class CacheConsumer extends Defau
getEndpoint().initializeCache();
}
-
}
Modified: camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheEventListener.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheEventListener.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheEventListener.java (original)
+++ camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheEventListener.java Fri Jun 10 06:02:06 2011
@@ -39,56 +39,37 @@ public class CacheEventListener implemen
}
public void notifyElementEvicted(Ehcache cache, Element element) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Element" + element.toString() + " is being evicted from cache " + cache.getName());
- }
+ LOG.debug("Element {} is being evicted from cache {}", element, cache.getName());
}
public void notifyElementExpired(Ehcache cache, Element element) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Element" + element.toString() + " has expired in cache " + cache.getName());
- }
+ LOG.debug("Element {} has expired in cache {}", element, cache.getName());
}
- public void notifyElementPut(Ehcache cache, Element element)
- throws CacheException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Element" + element.toString() + " has just been added/put in cache " + cache.getName());
- }
+ public void notifyElementPut(Ehcache cache, Element element) throws CacheException {
+ LOG.debug("Element {} has just been added/put in cache {}", element, cache.getName());
dispatchExchange(cache, element, "ADD");
}
- public void notifyElementRemoved(Ehcache cache, Element element)
- throws CacheException {
-
- if (LOG.isDebugEnabled()) {
- LOG.debug("Element" + element.toString() + " has just been removed from cache " + cache.getName());
- }
+ public void notifyElementRemoved(Ehcache cache, Element element) throws CacheException {
+ LOG.debug("Element {} has just been removed from cache {}", element, cache.getName());
dispatchExchange(cache, element, "DELETE");
}
- public void notifyElementUpdated(Ehcache cache, Element element)
- throws CacheException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Element" + element.toString() + " has just been updated in cache " + cache.getName());
- }
+ public void notifyElementUpdated(Ehcache cache, Element element) throws CacheException {
+ LOG.debug("Element {} has just been updated in cache {}", element, cache.getName());
dispatchExchange(cache, element, "UPDATE");
}
public void notifyRemoveAll(Ehcache cache) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Cache " + cache.getName() + " is being emptied and all elements removed");
- }
+ LOG.debug("Cache {} is being emptied and all elements removed", cache.getName());
dispatchExchange(cache, null, "DELETEALL");
-
}
private void dispatchExchange(Ehcache cache, Element element, String operation) {
Exchange exchange;
+ LOG.debug("Consumer Dispatching the Exchange containing the Element {} in cache {}", element, cache.getName());
- if (LOG.isDebugEnabled()) {
- LOG.debug("Consumer Dispatching the Exchange containing the Element " + element.toString() + " in cache " + cache.getName());
- }
if (element == null) {
exchange = cacheConsumer.getEndpoint().createCacheExchange(operation, "", "");
} else {
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=1134198&r1=1134197&r2=1134198&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 Fri Jun 10 06:02:06 2011
@@ -76,31 +76,21 @@ public class CacheProducer extends Defau
Object element;
if (operation.equalsIgnoreCase(CacheConstants.CACHE_OPERATION_ADD)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Adding an element with key " + key + " into the Cache");
- }
+ LOG.debug("Adding an element with key {} into the Cache", key);
element = createElementFromBody(exchange, CacheConstants.CACHE_OPERATION_ADD);
cache.put(new Element(key, element));
} else if (operation.equalsIgnoreCase(CacheConstants.CACHE_OPERATION_UPDATE)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Updating an element with key " + key + " into the Cache");
- }
+ LOG.debug("Updating an element with key {} into the Cache", key);
element = createElementFromBody(exchange, CacheConstants.CACHE_OPERATION_UPDATE);
cache.put(new Element(key, element));
} else if (operation.equalsIgnoreCase(CacheConstants.CACHE_OPERATION_DELETEALL)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Deleting All elements from the Cache");
- }
+ LOG.debug("Deleting All elements from the Cache");
cache.removeAll();
} else if (operation.equalsIgnoreCase(CacheConstants.CACHE_OPERATION_DELETE)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Deleting an element with key " + key + " into the Cache");
- }
+ LOG.debug("Deleting an element with key {} into the Cache", key);
cache.remove(key);
} else if (operation.equalsIgnoreCase(CacheConstants.CACHE_OPERATION_GET)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Quering an element with key " + key + " from the Cache");
- }
+ LOG.debug("Quering an element with key {} from the Cache", key);
if (cache.isKeyInCache(key) && cache.get(key) != null) {
exchange.getIn().setHeader(CacheConstants.CACHE_ELEMENT_WAS_FOUND, true);
exchange.getIn().setBody(cache.get(key).getValue());
@@ -108,9 +98,7 @@ public class CacheProducer extends Defau
exchange.getIn().removeHeader(CacheConstants.CACHE_ELEMENT_WAS_FOUND);
}
} else if (operation.equalsIgnoreCase(CacheConstants.CACHE_OPERATION_CHECK)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Querying an element with key " + key + " from the Cache");
- }
+ LOG.debug("Querying an element with key {} from the Cache", key);
if (cache.isKeyInCache(key)) {
exchange.getIn().setHeader(CacheConstants.CACHE_ELEMENT_WAS_FOUND, true);
} else {
Modified: camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedMessageBodyReplacer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedMessageBodyReplacer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedMessageBodyReplacer.java (original)
+++ camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedMessageBodyReplacer.java Fri Jun 10 06:02:06 2011
@@ -49,9 +49,7 @@ public class CacheBasedMessageBodyReplac
if (isValid(cacheManager, cacheName, key)) {
cache = cacheManager.getCache(cacheName);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Replacing Message Body from CacheName " + cacheName + " for key " + key);
- }
+ LOG.debug("Replacing Message Body from CacheName {} for key {}", cacheName, key);
exchange.getIn().setHeader(CacheConstants.CACHE_KEY, key);
exchange.getIn().setBody(cache.get(key).getObjectValue());
}
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=1134198&r1=1134197&r2=1134198&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 Fri Jun 10 06:02:06 2011
@@ -57,8 +57,8 @@ public class CacheBasedTokenReplacer ext
cache = cacheManager.getCache(cacheName);
if (LOG.isDebugEnabled()) {
- LOG.debug("Replacing Token " + replacementToken + "in Message with value stored against key "
- + key + " in CacheName " + cacheName);
+ LOG.debug("Replacing Token {} in Message with value stored against key {} in CacheName {}",
+ new Object[]{replacementToken, key, cacheName});
}
exchange.getIn().setHeader(CacheConstants.CACHE_KEY, key);
Modified: camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedXPathReplacer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedXPathReplacer.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedXPathReplacer.java (original)
+++ camel/trunk/components/camel-cache/src/main/java/org/apache/camel/processor/cache/CacheBasedXPathReplacer.java Fri Jun 10 06:02:06 2011
@@ -70,8 +70,8 @@ public class CacheBasedXPathReplacer ext
cache = cacheManager.getCache(cacheName);
if (LOG.isDebugEnabled()) {
- LOG.debug("Replacing XPath value " + xpath + "in Message with value stored against key " + key
- + " in CacheName " + cacheName);
+ LOG.debug("Replacing XPath value {} in Message with value stored against key {} in CacheName {}",
+ new Object[]{xpath, key, cacheName});
}
exchange.getIn().setHeader(CacheConstants.CACHE_KEY, key);
Object body = exchange.getIn().getBody();
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=1134198&r1=1134197&r2=1134198&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 Fri Jun 10 06:02:06 2011
@@ -34,6 +34,7 @@ public class CacheValidate {
+ " Replacement will not be performed since the cache {} does not presently exist", cacheName, cacheName);
return false;
}
+
LOG.debug("Found an existing cache: {}", cacheName);
if (LOG.isTraceEnabled()) {
Modified: camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerFIFOTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerFIFOTest.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerFIFOTest.java (original)
+++ camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerFIFOTest.java Fri Jun 10 06:02:06 2011
@@ -37,9 +37,9 @@ public class CacheConsumerFIFOTest exten
if (LOG.isDebugEnabled()) {
LOG.debug("------- Cache Event Notification ---------");
LOG.debug("Received notification for the following activity in cache TestCache1:");
- LOG.debug("Operation = " + operation);
- LOG.debug("key = " + key);
- LOG.debug("value = " + data);
+ LOG.debug("Operation = {}", operation);
+ LOG.debug("key = {}", key);
+ LOG.debug("value = {}", data);
LOG.debug("------ End Cache Event Notification ------");
}
}
Modified: camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java (original)
+++ camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java Fri Jun 10 06:02:06 2011
@@ -111,9 +111,9 @@ public class CacheConsumerTest extends C
if (LOG.isDebugEnabled()) {
LOG.debug("------- Cache Event Notification ---------");
LOG.debug("Received notification for the following activity in cache TestCache1:");
- LOG.debug("Operation = " + operation);
- LOG.debug("key = " + key);
- LOG.debug("value = " + data);
+ LOG.debug("Operation = {}", operation);
+ LOG.debug("key = {}", key);
+ LOG.debug("value = {}", data);
LOG.debug("------ End Cache Event Notification ------");
}
}
Modified: camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java (original)
+++ camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java Fri Jun 10 06:02:06 2011
@@ -90,9 +90,9 @@ public class CacheBasedBodyReplacerTest
if (LOG.isDebugEnabled()) {
LOG.debug("------- Payload Replacement Results ---------");
LOG.debug("The following Payload was replaced from Cache: TestCache1");
- LOG.debug("key = " + key);
+ LOG.debug("key = {}", key);
LOG.debug("Before value = Hello World");
- LOG.debug("After value = " + data);
+ LOG.debug("After value = {}", data);
LOG.debug("------ End ------");
}
}
Modified: camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java (original)
+++ camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java Fri Jun 10 06:02:06 2011
@@ -103,9 +103,9 @@ public class CacheBasedTokenReplacerTest
if (LOG.isDebugEnabled()) {
LOG.debug("------- Payload Replacement Results ---------");
LOG.debug("The following Payload was replaced from Cache: TestCache1");
- LOG.debug("key = " + key);
- LOG.debug("Before Value = " + quote);
- LOG.debug("After value = " + data);
+ LOG.debug("key = {}", key);
+ LOG.debug("Before Value = {}", quote);
+ LOG.debug("After value = {}", data);
LOG.debug("------ End ------");
}
}
Modified: camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java (original)
+++ camel/trunk/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java Fri Jun 10 06:02:06 2011
@@ -105,9 +105,9 @@ public class CacheBasedXPathElementRepla
if (LOG.isDebugEnabled()) {
LOG.debug("------- Payload Replacement Results ---------");
LOG.debug("The following Payload was replaced from Cache: TestCache1");
- LOG.debug("key = " + key);
- LOG.debug("Before Value = " + xmlFragment);
- LOG.debug("After value = " + data);
+ LOG.debug("key = {}", key);
+ LOG.debug("Before Value = {}", xmlFragment);
+ LOG.debug("After value = {}", data);
LOG.debug("------ End ------");
}
}
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=1134198&r1=1134197&r2=1134198&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 Fri Jun 10 06:02:06 2011
@@ -94,9 +94,7 @@ public class LocalContextComponent exten
}
protected void logUsingEndpoint(String uri, Endpoint endpoint) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Mapping the URI: " + uri + " to local endpoint: " + endpoint);
- }
+ LOG.debug("Mapping the URI: {} to local endpoint: {}", uri, endpoint);
}
}
Modified: camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/QualifiedContextComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/QualifiedContextComponent.java?rev=1134198&r1=1134197&r2=1134198&view=diff
==============================================================================
--- camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/QualifiedContextComponent.java (original)
+++ camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/QualifiedContextComponent.java Fri Jun 10 06:02:06 2011
@@ -42,9 +42,7 @@ public class QualifiedContextComponent e
String localEndpoint = splitURI[1];
Component component = getCamelContext().getComponent(contextId);
if (component != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Attempting to create local endpoint: " + localEndpoint + " inside the component: " + component);
- }
+ LOG.debug("Attempting to create local endpoint: {} inside the component: {}", localEndpoint, component);
return component.createEndpoint(localEndpoint);
}
}