You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/01/23 05:08:41 UTC
[camel] branch master updated (b37be5d -> 78fab1d)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from b37be5d Minor cleanup for camel-test-spring documentation (#3507)
new c256b7f CAMEL-14421: optimize core - ServiceSupport should not have instance logger. Use static logger instead.
new 2ae0cd8 CAMEL-14421: optimize core - ServiceSupport should not have instance logger. Use static logger instead.
new 0c96966 CAMEL-14421: optimize core - ServiceSupport should not have instance logger. Use static logger instead.
new a409da0 CAMEL-14421: optimize core - ServiceSupport should not have instance logger. Use static logger instead.
new 78fab1d Upgrade groovy
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/component/ahc/ws/WsEndpoint.java | 26 +--
.../apache/camel/component/ahc/ws/WsProducer.java | 7 +-
.../apache/camel/component/ahc/AhcComponent.java | 10 +-
.../apache/camel/component/ahc/AhcProducer.java | 25 +--
.../apache/camel/component/as2/AS2Component.java | 8 +-
.../apache/camel/component/as2/AS2Consumer.java | 6 +-
.../camel/component/asterisk/AsteriskProducer.java | 6 +-
.../camel/component/atmos/AtmosEndpoint.java | 5 -
.../atmosphere/websocket/WebsocketProducer.java | 10 +-
.../client/AbstractAtomixClientProducer.java | 11 +-
.../atomix/client/map/AtomixMapConsumer.java | 8 +-
.../client/messaging/AtomixMessagingConsumer.java | 7 +-
.../atomix/client/queue/AtomixQueueConsumer.java | 6 +-
.../atomix/client/set/AtomixSetConsumer.java | 6 +-
.../atomix/client/value/AtomixValueConsumer.java | 6 +-
.../atomix/cluster/AtomixClusterService.java | 14 +-
.../atomix/cluster/AtomixClusterView.java | 22 ++-
.../apache/camel/component/aws/cw/CwProducer.java | 6 +-
.../camel/component/aws/ddb/DdbEndpoint.java | 20 ++-
.../component/aws/ddbstream/DdbStreamConsumer.java | 10 +-
.../camel/component/aws/ec2/EC2Producer.java | 46 +++---
.../camel/component/aws/ecs/ECSProducer.java | 12 +-
.../camel/component/aws/eks/EKSProducer.java | 11 +-
.../camel/component/aws/iam/IAMProducer.java | 29 ++--
.../aws/firehose/KinesisFirehoseProducer.java | 8 +-
.../component/aws/kinesis/KinesisConsumer.java | 17 +-
.../camel/component/aws/kms/KMSProducer.java | 16 +-
.../camel/component/aws/lambda/LambdaProducer.java | 40 +++--
.../apache/camel/component/aws/mq/MQProducer.java | 16 +-
.../camel/component/aws/msk/MSKProducer.java | 12 +-
.../apache/camel/component/aws/s3/S3Consumer.java | 34 ++--
.../apache/camel/component/aws/s3/S3Producer.java | 2 +-
.../camel/component/aws/ses/SesProducer.java | 16 +-
.../camel/component/aws/sns/SnsEndpoint.java | 16 +-
.../camel/component/aws/sns/SnsProducer.java | 10 +-
.../camel/component/aws/sqs/SqsConsumer.java | 42 ++---
.../camel/component/aws/sqs/SqsEndpoint.java | 22 ++-
.../camel/component/aws/sqs/SqsProducer.java | 22 ++-
.../component/aws/swf/SWFActivityProducer.java | 4 +-
.../component/aws/swf/SWFWorkflowProducer.java | 4 +-
.../component/aws/translate/TranslateProducer.java | 6 +-
.../camel/component/aws/xray/XRayTracer.java | 45 ++---
.../aws2/translate/Translate2Producer.java | 5 +-
.../component/azure/blob/BlobServiceConsumer.java | 1 -
.../component/azure/blob/BlobServiceEndpoint.java | 2 -
.../component/azure/blob/BlobServiceProducer.java | 28 ++--
.../azure/queue/QueueServiceConsumer.java | 1 -
.../azure/queue/QueueServiceEndpoint.java | 2 -
.../azure/queue/QueueServiceProducer.java | 14 +-
.../dataformat/barcode/BarcodeDataFormat.java | 14 +-
.../component/bean/AbstractBeanProcessor.java | 8 +-
.../apache/camel/component/bean/BeanComponent.java | 8 +-
.../component/beanstalk/BeanstalkConsumer.java | 16 +-
.../camel/blueprint/BlueprintCamelContext.java | 34 ++--
.../apache/camel/component/box/BoxConsumer.java | 8 +-
.../aggregate/CaffeineAggregationRepository.java | 16 +-
.../camel/component/cbor/CBORDataFormat.java | 13 +-
.../cdi/transaction/TransactionErrorHandler.java | 54 +++---
.../org/apache/camel/component/cm/CMComponent.java | 1 -
.../org/apache/camel/component/cm/CMProducer.java | 23 +--
.../apache/camel/component/cmis/CMISConsumer.java | 6 +-
.../apache/camel/component/cmis/CMISProducer.java | 10 +-
.../component/controlbus/ControlBusProducer.java | 20 ++-
.../component/couchbase/CouchbaseConsumer.java | 41 +++--
.../component/couchbase/CouchbaseProducer.java | 14 +-
.../camel/component/couchdb/CouchDbConsumer.java | 8 +-
.../camel/component/couchdb/CouchDbProducer.java | 16 +-
.../component/crypto/cms/CryptoCmsComponent.java | 8 +-
.../camel/component/cxf/CxfBlueprintEndpoint.java | 6 +-
.../apache/camel/component/cxf/CxfComponent.java | 6 +-
.../apache/camel/component/cxf/CxfConsumer.java | 26 +--
.../apache/camel/component/cxf/CxfEndpoint.java | 26 +--
.../apache/camel/component/cxf/CxfProducer.java | 32 ++--
.../component/dataset/DataSetTestEndpoint.java | 10 +-
.../camel/component/direct/DirectProducer.java | 8 +-
.../directvm/DirectVmBlockingProducer.java | 8 +-
.../component/directvm/DirectVmProcessor.java | 12 +-
.../camel/component/directvm/DirectVmProducer.java | 6 +-
.../component/disruptor/DisruptorProducer.java | 22 ++-
.../docker/consumer/DockerEventsConsumer.java | 10 +-
.../docker/producer/AsyncDockerProducer.java | 63 ++-----
.../camel/component/dozer/DozerEndpoint.java | 6 +-
.../camel/component/dozer/DozerProducer.java | 12 +-
.../camel/component/drill/DrillProducer.java | 8 +-
.../integration/producer/DropboxDelProducer.java | 1 -
.../integration/producer/DropboxMoveProducer.java | 2 -
.../aggregate/EhcacheAggregationRepository.java | 16 +-
.../elasticsearch/ElasticsearchProducer.java | 11 +-
.../camel/component/elsql/ElsqlEndpoint.java | 6 +-
.../camel/component/elsql/ElsqlProducer.java | 12 +-
.../component/eventadmin/EventAdminConsumer.java | 6 +-
.../camel/component/facebook/FacebookConsumer.java | 11 +-
.../camel/component/facebook/FacebookEndpoint.java | 9 +-
.../component/file/watch/FileWatchConsumer.java | 10 +-
.../apache/camel/component/file/FileConsumer.java | 31 ++--
.../apache/camel/component/file/FileEndpoint.java | 16 +-
.../camel/component/file/GenericFileConsumer.java | 52 +++---
.../camel/component/file/GenericFileEndpoint.java | 24 +--
.../component/file/GenericFileOnCompletion.java | 14 +-
.../component/file/GenericFilePollingConsumer.java | 32 ++--
.../camel/component/file/GenericFileProducer.java | 37 +++--
...dempotentChangedRepositoryReadLockStrategy.java | 20 ++-
...IdempotentRenameRepositoryReadLockStrategy.java | 7 +-
.../FileIdempotentRepositoryReadLockStrategy.java | 15 +-
.../strategy/GenericFileDeleteProcessStrategy.java | 6 +-
.../GenericFileProcessStrategySupport.java | 9 +-
.../camel/component/file/remote/FtpConsumer.java | 26 +--
.../camel/component/file/remote/FtpEndpoint.java | 11 +-
.../camel/component/file/remote/FtpsEndpoint.java | 13 +-
.../component/file/remote/RemoteFileConsumer.java | 49 +++---
.../component/file/remote/RemoteFileEndpoint.java | 12 +-
.../component/file/remote/RemoteFileProducer.java | 29 ++--
.../camel/component/file/remote/SftpConsumer.java | 24 +--
.../camel/component/ganglia/GangliaProducer.java | 12 +-
.../git/consumer/AbstractGitConsumer.java | 6 +-
.../camel/component/git/producer/GitProducer.java | 54 +++---
.../google/bigquery/GoogleBigQueryProducer.java | 18 +-
.../bigquery/sql/GoogleBigQuerySQLProducer.java | 14 +-
.../stream/GoogleCalendarStreamConsumer.java | 7 +-
.../apache/camel/component/gora/GoraConsumer.java | 2 -
.../apache/camel/component/grpc/GrpcConsumer.java | 14 +-
.../apache/camel/component/grpc/GrpcProducer.java | 12 +-
.../guava/eventbus/GuavaEventBusConsumer.java | 6 +-
.../guava/eventbus/GuavaEventBusProducer.java | 8 +-
.../hazelcast/queue/HazelcastQueueConsumer.java | 5 +-
.../hazelcast/seda/HazelcastSedaConsumer.java | 18 +-
.../camel/component/hbase/HBaseConsumer.java | 8 +-
.../idempotent/HBaseIdempotentRepository.java | 12 +-
.../apache/camel/component/hdfs/HdfsConsumer.java | 26 +--
.../apache/camel/component/hdfs/HdfsProducer.java | 37 +++--
.../camel/component/hipchat/HipchatComponent.java | 6 +-
.../camel/component/hipchat/HipchatConsumer.java | 11 +-
.../camel/component/hipchat/HipchatProducer.java | 13 +-
.../apache/camel/component/http/HttpComponent.java | 10 +-
.../apache/camel/component/http/HttpEndpoint.java | 8 +-
.../apache/camel/component/http/HttpProducer.java | 17 +-
.../hystrix/metrics/HystrixEventStreamService.java | 12 +-
.../component/iec60870/AbstractIecComponent.java | 17 +-
.../component/iec60870/client/ClientComponent.java | 2 -
.../component/iec60870/client/ClientConsumer.java | 8 +-
.../component/iec60870/server/ServerComponent.java | 2 -
.../component/iec60870/server/ServerConsumer.java | 6 +-
.../cache/IgniteCacheContinuousQueryConsumer.java | 16 +-
.../ignite/events/IgniteEventsConsumer.java | 14 +-
.../ignite/events/IgniteEventsEndpoint.java | 10 +-
.../ignite/idgen/IgniteIdGenEndpoint.java | 6 +-
.../ignite/messaging/IgniteMessagingConsumer.java | 14 +-
.../component/infinispan/InfinispanComponent.java | 7 +-
.../component/infinispan/InfinispanConsumer.java | 4 +-
.../camel/component/influxdb/InfluxDbEndpoint.java | 6 +-
.../camel/component/influxdb/InfluxDbProducer.java | 10 +-
.../apache/camel/component/irc/IrcComponent.java | 24 +--
.../apache/camel/component/irc/IrcConsumer.java | 10 +-
.../apache/camel/component/irc/IrcEndpoint.java | 16 +-
.../apache/camel/component/irc/IrcProducer.java | 14 +-
.../camel/component/ironmq/IronMQConsumer.java | 22 ++-
.../camel/component/ironmq/IronMQEndpoint.java | 6 +-
.../camel/component/ironmq/IronMQProducer.java | 8 +-
.../camel/component/jackson/JacksonDataFormat.java | 24 +--
.../component/jacksonxml/JacksonXMLDataFormat.java | 14 +-
.../camel/converter/jaxb/JaxbDataFormat.java | 22 ++-
.../camel/component/jcache/JCacheConsumer.java | 4 +-
.../aggregate/JCacheAggregationRepository.java | 22 ++-
.../jclouds/JcloudsBlobStoreConsumer.java | 1 -
.../jclouds/JcloudsBlobStoreProducer.java | 8 +-
.../apache/camel/component/jcr/JcrConsumer.java | 26 +--
.../apache/camel/component/jdbc/JdbcComponent.java | 6 +-
.../apache/camel/component/jdbc/JdbcProducer.java | 18 +-
.../camel/component/jetty/JettyHttpComponent.java | 17 +-
.../component/jetty/async/MyAsyncProducer.java | 13 +-
.../jgroups/raft/JGroupsRaftProducer.java | 12 +-
.../camel/component/jgroups/JGroupsConsumer.java | 8 +-
.../camel/component/jgroups/JGroupsEndpoint.java | 10 +-
.../camel/component/jgroups/JGroupsProducer.java | 12 +-
.../apache/camel/component/jms/JmsComponent.java | 9 +-
.../apache/camel/component/jms/JmsConsumer.java | 19 ++-
.../apache/camel/component/jms/JmsEndpoint.java | 20 ++-
.../apache/camel/component/jms/JmsProducer.java | 54 +++---
.../camel/component/jms/async/MyAsyncProducer.java | 14 +-
.../apache/camel/component/jmx/JMXConsumer.java | 22 ++-
.../apache/camel/component/jpa/JpaComponent.java | 26 +--
.../apache/camel/component/jpa/JpaConsumer.java | 30 ++--
.../camel/component/jpa/JpaPollingConsumer.java | 10 +-
.../apache/camel/component/jpa/JpaProducer.java | 10 +-
.../idempotent/jpa/JpaMessageIdRepository.java | 20 ++-
.../apache/camel/component/scp/ScpEndpoint.java | 2 +-
.../component/jt400/Jt400DataQueueConsumer.java | 12 +-
.../camel/component/kafka/KafkaConsumer.java | 68 ++++----
.../camel/component/kafka/KafkaEndpoint.java | 6 +-
.../camel/component/kafka/KafkaProducer.java | 24 +--
.../config_maps/KubernetesConfigMapsConsumer.java | 8 +-
.../config_maps/KubernetesConfigMapsProducer.java | 16 +-
.../deployments/KubernetesDeploymentsConsumer.java | 8 +-
.../deployments/KubernetesDeploymentsProducer.java | 22 ++-
.../kubernetes/hpa/KubernetesHPAConsumer.java | 8 +-
.../kubernetes/hpa/KubernetesHPAProducer.java | 20 ++-
.../kubernetes/job/KubernetesJobProducer.java | 20 ++-
.../namespaces/KubernetesNamespacesConsumer.java | 8 +-
.../kubernetes/nodes/KubernetesNodesConsumer.java | 8 +-
.../kubernetes/nodes/KubernetesNodesProducer.java | 12 +-
.../kubernetes/pods/KubernetesPodsConsumer.java | 8 +-
.../KubernetesReplicationControllersConsumer.java | 8 +-
.../services/KubernetesServicesConsumer.java | 8 +-
.../OpenshiftBuildConfigsProducer.java | 8 +-
.../openshift/builds/OpenshiftBuildsProducer.java | 8 +-
.../camel/component/language/LanguageProducer.java | 6 +-
.../apache/camel/component/ldap/LdapProducer.java | 17 +-
.../apache/camel/component/ldif/LdifProducer.java | 37 +++--
.../leveldb/LevelDBAggregationRepository.java | 46 +++---
.../apache/camel/component/log/LogComponent.java | 7 +-
.../apache/camel/component/mail/MailConsumer.java | 82 ++++-----
.../apache/camel/component/mail/MailProducer.java | 8 +-
.../camel/component/master/MasterConsumer.java | 8 +-
.../camel/component/metrics/GaugeProducer.java | 9 +-
.../camel/component/metrics/HistogramProducer.java | 7 +-
.../camel/component/metrics/MetricsComponent.java | 14 +-
.../camel/component/metrics/TimerProducer.java | 11 +-
.../component/micrometer/MicrometerComponent.java | 6 +-
.../camel/component/micrometer/TimerProducer.java | 9 +-
.../component/milo/client/MiloClientComponent.java | 8 +-
.../component/milo/client/MiloClientConsumer.java | 9 +-
.../component/milo/client/MiloClientProducer.java | 2 -
.../component/milo/server/MiloServerComponent.java | 15 +-
.../component/milo/server/MiloServerProducer.java | 6 +-
.../apache/camel/component/mllp/MllpEndpoint.java | 2 -
.../apache/camel/component/mock/MockEndpoint.java | 40 +++--
.../component/mongodb/gridfs/GridFsEndpoint.java | 10 +-
.../camel/component/mongodb/MongoDbEndpoint.java | 15 +-
.../camel/component/mongodb/MongoDbProducer.java | 16 +-
.../component/mybatis/MyBatisBeanProducer.java | 18 +-
.../camel/component/mybatis/MyBatisConsumer.java | 10 +-
.../component/nagios/NagiosEventNotifier.java | 13 +-
.../camel/component/nagios/NagiosProducer.java | 11 +-
.../apache/camel/component/nats/NatsConsumer.java | 18 +-
.../apache/camel/component/nats/NatsProducer.java | 19 ++-
.../component/netty/http/NettyHttpComponent.java | 10 +-
.../component/netty/http/NettyHttpEndpoint.java | 10 +-
.../component/netty/http/NettyHttpProducer.java | 8 +-
.../camel/component/netty/NettyComponent.java | 6 +-
.../camel/component/netty/NettyConsumer.java | 12 +-
.../camel/component/netty/NettyProducer.java | 78 ++++-----
.../camel/opentracing/OpenTracingTracer.java | 31 ++--
.../component/optaplanner/OptaPlannerConsumer.java | 4 +-
.../apache/camel/component/paho/PahoConsumer.java | 22 ++-
.../apache/camel/component/paho/PahoProducer.java | 10 +-
.../component/paxlogging/PaxLoggingConsumer.java | 8 +-
.../apache/camel/component/pdf/PdfProducer.java | 11 +-
.../slot/PgReplicationSlotConsumer.java | 12 +-
.../slot/PgReplicationSlotEndpoint.java | 6 +-
.../camel/component/pgevent/PgEventConsumer.java | 8 +-
.../camel/component/pgevent/PgEventEndpoint.java | 14 +-
.../camel/component/printer/PrinterProducer.java | 9 +-
.../camel/component/pubnub/PubNubConsumer.java | 9 +-
.../camel/component/pubnub/PubNubProducer.java | 22 ++-
.../camel/component/pulsar/PulsarProducer.java | 8 +-
.../camel/component/quartz/QuartzComponent.java | 36 ++--
.../camel/component/quartz/QuartzEndpoint.java | 29 ++--
.../QuartzScheduledPollConsumerScheduler.java | 22 ++-
.../component/quickfixj/QuickfixjComponent.java | 8 +-
.../component/quickfixj/QuickfixjConsumer.java | 6 +-
.../component/quickfixj/QuickfixjEndpoint.java | 8 +-
.../camel/component/quickfixj/QuickfixjEngine.java | 12 +-
.../component/quickfixj/QuickfixjProducer.java | 8 +-
.../examples/trading/TradeExecutorComponent.java | 2 +-
.../camel/component/rabbitmq/RabbitConsumer.java | 40 ++---
.../component/rabbitmq/RabbitMQComponent.java | 12 +-
.../camel/component/rabbitmq/RabbitMQConsumer.java | 21 ++-
.../camel/component/rabbitmq/RabbitMQProducer.java | 35 ++--
.../rabbitmq/reply/ReplyManagerSupport.java | 39 ++---
.../rabbitmq/reply/TemporaryQueueReplyManager.java | 14 +-
.../reactive/streams/ReactiveStreamsConsumer.java | 6 +-
.../apache/camel/component/rest/RestEndpoint.java | 15 +-
.../component/salesforce/SalesforceComponent.java | 15 +-
.../component/salesforce/SalesforceConsumer.java | 16 +-
.../component/salesforce/SalesforceEndpoint.java | 12 +-
.../component/salesforce/SalesforceProducer.java | 6 +-
.../component/sap/netweaver/NetWeaverProducer.java | 11 +-
.../camel/component/xquery/XQueryEndpoint.java | 6 +-
.../component/scheduler/SchedulerConsumer.java | 8 +-
.../component/schematron/SchematronEndpoint.java | 15 +-
.../component/schematron/SchematronProducer.java | 20 +--
.../apache/camel/component/seda/SedaConsumer.java | 36 ++--
.../apache/camel/component/seda/SedaEndpoint.java | 16 +-
.../apache/camel/component/seda/SedaProducer.java | 33 ++--
.../camel/component/service/ServiceConsumer.java | 4 +-
.../camel/component/servlet/ServletComponent.java | 6 +-
.../apache/camel/component/sjms/SjmsConsumer.java | 10 +-
.../apache/camel/component/sjms/SjmsProducer.java | 34 ++--
.../component/sjms/batch/SjmsBatchConsumer.java | 14 +-
.../component/sjms/producer/InOutProducer.java | 22 ++-
.../camel/component/slack/SlackConsumer.java | 8 +-
.../apache/camel/component/smpp/SmppConsumer.java | 24 +--
.../apache/camel/component/smpp/SmppProducer.java | 24 +--
.../apache/camel/component/snmp/SnmpEndpoint.java | 7 +-
.../apache/camel/component/snmp/SnmpOIDPoller.java | 26 +--
.../apache/camel/component/snmp/SnmpProducer.java | 12 +-
.../camel/component/snmp/SnmpTrapConsumer.java | 32 ++--
.../camel/component/snmp/SnmpTrapProducer.java | 16 +-
.../camel/dataformat/soap/SoapJaxbDataFormat.java | 12 +-
.../apache/camel/component/solr/SolrComponent.java | 12 +-
.../component/SoroushBotAbstractConsumer.java | 32 ++--
.../component/SoroushBotDownloadFileProducer.java | 3 -
.../component/SoroushBotMultiThreadConsumer.java | 13 +-
.../component/SoroushBotSendMessageProducer.java | 10 +-
.../component/SoroushBotSingleThreadConsumer.java | 15 +-
.../camel/component/sparkrest/SparkConsumer.java | 8 +-
.../camel/component/splunk/SplunkConsumer.java | 12 +-
.../camel/component/splunk/SplunkEndpoint.java | 6 +-
.../spring/batch/SpringBatchProducer.java | 6 +-
.../integration/SpringIntegrationConsumer.java | 7 +-
.../integration/SpringIntegrationProducer.java | 11 +-
.../spring/ws/SpringWebserviceComponent.java | 8 +-
.../spring/ws/SpringWebserviceProducer.java | 10 +-
.../spring/spi/SpringManagementMBeanAssembler.java | 10 +-
.../camel/spring/spi/TransactionErrorHandler.java | 52 +++---
.../camel/spring/StartAndStopEventNotifier.java | 8 +-
.../apache/camel/component/sql/SqlComponent.java | 6 +-
.../apache/camel/component/sql/SqlConsumer.java | 14 +-
.../apache/camel/component/sql/SqlProducer.java | 11 +-
.../camel/component/stream/StreamConsumer.java | 18 +-
.../camel/component/stream/StreamEndpoint.java | 6 +-
.../camel/component/stream/StreamProducer.java | 22 ++-
.../camel/component/telegram/TelegramConsumer.java | 14 +-
.../camel/component/telegram/TelegramProducer.java | 14 +-
.../apache/camel/test/junit4/CamelTestSupport.java | 38 ++---
.../camel/test/junit4/LanguageTestSupport.java | 6 +-
.../camel/component/thrift/ThriftConsumer.java | 20 ++-
.../camel/component/thrift/ThriftProducer.java | 20 ++-
.../camel/component/timer/TimerConsumer.java | 13 +-
.../directmessage/DirectMessageProducer.java | 6 +-
.../component/twitter/search/SearchProducer.java | 8 +-
.../component/twitter/timeline/UserProducer.java | 12 +-
.../camel/component/undertow/UndertowConsumer.java | 9 +-
.../camel/component/undertow/UndertowEndpoint.java | 6 +-
.../camel/component/undertow/UndertowProducer.java | 12 +-
.../camel/component/vertx/VertxComponent.java | 20 ++-
.../camel/component/vertx/VertxConsumer.java | 18 +-
.../camel/component/vertx/VertxProducer.java | 10 +-
.../camel/component/weather/WeatherConsumer.java | 10 +-
.../camel/component/weather/WeatherProducer.java | 8 +-
.../camel/component/webhook/WebhookEndpoint.java | 8 +-
.../component/websocket/WebsocketProducer.java | 16 +-
.../apache/camel/component/xmpp/XmppComponent.java | 8 +-
.../apache/camel/component/xmpp/XmppConsumer.java | 28 ++--
.../apache/camel/component/xmpp/XmppEndpoint.java | 18 +-
.../component/xslt/saxon/XsltSaxonEndpoint.java | 11 +-
.../apache/camel/component/xslt/XsltComponent.java | 6 +-
.../apache/camel/component/xslt/XsltEndpoint.java | 15 +-
.../zookeepermaster/policy/MasterRoutePolicy.java | 14 +-
.../component/zookeeper/ZooKeeperConsumer.java | 24 +--
.../component/zookeeper/ZooKeeperProducer.java | 56 ++++---
.../camel/support/service/ServiceSupport.java | 93 +++++------
.../component/properties/PropertiesComponent.java | 8 +-
.../impl/converter/BaseTypeConverterRegistry.java | 48 +++---
.../camel/impl/converter/DefaultTypeConverter.java | 10 +-
.../camel/impl/engine/AbstractCamelContext.java | 183 +++++++++++----------
.../apache/camel/impl/engine/BaseRouteService.java | 7 -
.../engine/DefaultAsyncProcessorAwaitManager.java | 24 +--
.../camel/impl/engine/DefaultConsumerCache.java | 15 +-
.../camel/impl/engine/DefaultConsumerTemplate.java | 9 +-
.../impl/engine/DefaultInflightRepository.java | 8 +-
.../impl/engine/DefaultManagementStrategy.java | 6 +-
.../camel/impl/engine/DefaultProducerCache.java | 10 +-
.../engine/DefaultRuntimeEndpointRegistry.java | 9 +-
.../camel/impl/engine/DefaultShutdownStrategy.java | 70 ++++----
.../impl/engine/DefaultStreamCachingStrategy.java | 42 ++---
.../camel/impl/engine/DurationRoutePolicy.java | 14 +-
.../camel/impl/engine/FileStateRepository.java | 27 +--
.../engine/InterceptSendToEndpointProcessor.java | 15 +-
.../impl/transformer/DataFormatTransformer.java | 12 +-
.../impl/transformer/ProcessorTransformer.java | 10 +-
.../camel/processor/CamelInternalProcessor.java | 21 ++-
.../org/apache/camel/processor/CatchProcessor.java | 12 +-
.../apache/camel/processor/ChoiceProcessor.java | 7 +-
.../camel/processor/ClaimCheckProcessor.java | 16 +-
.../camel/processor/DelayProcessorSupport.java | 20 ++-
.../java/org/apache/camel/processor/Enricher.java | 15 +-
.../camel/processor/EventNotifierProducer.java | 6 +-
.../camel/processor/FatalFallbackErrorHandler.java | 14 +-
.../apache/camel/processor/FilterProcessor.java | 6 +-
.../apache/camel/processor/FinallyProcessor.java | 6 +-
.../org/apache/camel/processor/LogProcessor.java | 10 +-
.../org/apache/camel/processor/LoopProcessor.java | 13 +-
.../apache/camel/processor/MulticastProcessor.java | 13 +-
.../camel/processor/OnCompletionProcessor.java | 19 ++-
.../java/org/apache/camel/processor/Pipeline.java | 19 ++-
.../org/apache/camel/processor/PollEnricher.java | 21 ++-
.../org/apache/camel/processor/RecipientList.java | 7 +-
.../camel/processor/RecipientListProcessor.java | 4 +-
.../org/apache/camel/processor/Resequencer.java | 24 +--
.../org/apache/camel/processor/RoutingSlip.java | 33 ++--
.../apache/camel/processor/SamplingThrottler.java | 12 +-
.../camel/processor/SendDynamicProcessor.java | 28 ++--
.../org/apache/camel/processor/SendProcessor.java | 9 +-
.../org/apache/camel/processor/StepProcessor.java | 6 +-
.../apache/camel/processor/StreamResequencer.java | 7 +-
.../apache/camel/processor/ThreadsProcessor.java | 12 +-
.../java/org/apache/camel/processor/Throttler.java | 44 ++---
.../org/apache/camel/processor/TryProcessor.java | 10 +-
.../apache/camel/processor/WireTapProcessor.java | 8 +-
.../processor/aggregate/AggregateProcessor.java | 132 ++++++++-------
.../camel/processor/channel/DefaultChannel.java | 8 +-
.../errorhandler/RedeliveryErrorHandler.java | 98 +++++------
.../processor/idempotent/IdempotentConsumer.java | 7 +-
.../processor/interceptor/BacklogDebugger.java | 6 +-
.../camel/processor/interceptor/BacklogTracer.java | 3 -
.../processor/interceptor/DefaultDebugger.java | 6 +-
.../loadbalancer/FailOverLoadBalancer.java | 23 ++-
.../throttling/ThrottlingExceptionRoutePolicy.java | 36 ++--
.../throttling/ThrottlingInflightRoutePolicy.java | 14 +-
.../impl/cloud/DefaultServiceCallProcessor.java | 7 +-
.../camel/impl/AbstractModelCamelContext.java | 12 +-
.../org/apache/camel/impl/DefaultCamelContext.java | 9 +-
.../camel/impl/cluster/ClusteredRoutePolicy.java | 21 ++-
.../camel/core/osgi/OsgiCamelContextPublisher.java | 16 +-
.../org/apache/camel/impl/CustomIdFactoryTest.java | 2 +-
.../impl/transformer/TransformerRouteTest.java | 8 +-
.../camel/impl/validator/ValidatorRouteTest.java | 4 +-
.../camel/processor/MyLoggingSentEventNotifer.java | 6 +-
.../processor/validation/ValidatingProcessor.java | 10 +-
.../org/apache/camel/main/BaseMainSupport.java | 2 +-
.../DefaultInstrumentationProcessor.java | 9 +-
.../management/JmxManagementLifecycleStrategy.java | 71 ++++----
.../camel/management/JmxManagementStrategy.java | 10 +-
.../camel/management/PublishEventNotifier.java | 8 +-
...StacksNeededDuringRoutingSendProcessorTest.java | 8 +-
.../apache/camel/support/ChildServiceSupport.java | 36 ++--
.../org/apache/camel/support/DefaultComponent.java | 40 +++--
.../org/apache/camel/support/DefaultConsumer.java | 10 +-
.../org/apache/camel/support/DefaultEndpoint.java | 10 +-
.../org/apache/camel/support/DefaultProducer.java | 12 +-
.../support/DefaultScheduledPollConsumer.java | 7 +-
.../DefaultScheduledPollConsumerScheduler.java | 14 +-
.../camel/support/EventDrivenPollingConsumer.java | 12 +-
.../apache/camel/support/RoutePolicySupport.java | 18 +-
.../support/ScheduledBatchPollingConsumer.java | 8 +-
.../camel/support/ScheduledPollConsumer.java | 60 +++----
.../cluster/AbstractCamelClusterService.java | 22 ++-
.../DefaultManagementMBeanAssembler.java | 8 +-
.../camel/support/processor/CamelLogProcessor.java | 10 +-
.../camel/support/processor/ThroughputLogger.java | 8 +-
.../idempotent/FileIdempotentRepository.java | 36 ++--
.../modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 21 +++
pom.xml | 2 +-
444 files changed, 4391 insertions(+), 2887 deletions(-)
[camel] 03/05: CAMEL-14421: optimize core - ServiceSupport should
not have instance logger. Use static logger instead.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0c9696654e2da96c4b69bc21bed0e2e818ceb9d3
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 23 05:41:48 2020 +0100
CAMEL-14421: optimize core - ServiceSupport should not have instance logger. Use static logger instead.
---
.../camel/support/service/ServiceSupport.java | 35 ++++++++++++++++++++++
.../apache/camel/support/ChildServiceSupport.java | 20 +++++++++++++
2 files changed, 55 insertions(+)
diff --git a/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceSupport.java b/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceSupport.java
index 0cce39a..7b2f780 100644
--- a/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceSupport.java
+++ b/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceSupport.java
@@ -19,6 +19,8 @@ package org.apache.camel.support.service;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.ServiceStatus;
import org.apache.camel.StatefulService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A useful base class which ensures that a service is only initialized once and
@@ -47,6 +49,8 @@ public abstract class ServiceSupport implements StatefulService {
protected static final byte SHUTDOWN = 10;
protected static final byte FAILED = 11;
+ private static final Logger LOG = LoggerFactory.getLogger(ServiceSupport.class);
+
protected final Object lock = new Object();
protected volatile byte status = NEW;
@@ -55,12 +59,14 @@ public abstract class ServiceSupport implements StatefulService {
if (status == NEW) {
synchronized (lock) {
if (status == NEW) {
+ LOG.trace("Building service: {}", this);
try {
doBuild();
} catch (Exception e) {
throw RuntimeCamelException.wrapRuntimeException(e);
}
status = BUILDED;
+ LOG.trace("Built service: {}", this);
}
}
}
@@ -71,12 +77,14 @@ public abstract class ServiceSupport implements StatefulService {
if (status <= BUILDED) {
synchronized (lock) {
if (status <= BUILDED) {
+ LOG.trace("Initializing service: {}", this);
try {
doInit();
} catch (Exception e) {
throw RuntimeCamelException.wrapRuntimeException(e);
}
status = INITIALIZED;
+ LOG.trace("Initialized service: {}", this);
}
}
}
@@ -92,29 +100,36 @@ public abstract class ServiceSupport implements StatefulService {
public void start() {
synchronized (lock) {
if (status == STARTED) {
+ LOG.trace("Service: {} already started", this);
return;
}
if (status == STARTING) {
+ LOG.trace("Service: {} already starting", this);
return;
}
try {
init();
} catch (Exception e) {
status = FAILED;
+ LOG.trace("Error while initializing service: " + this, e);
throw e;
}
try {
status = STARTING;
+ LOG.trace("Starting service: {}", this);
doStart();
status = STARTED;
+ LOG.trace("Started service: {}", this);
} catch (Exception e) {
// need to stop as some resources may have been started during startup
try {
stop();
} catch (Exception e2) {
// ignore
+ LOG.trace("Error while stopping service after it failed to start: " + this + ". This exception is ignored", e);
}
status = FAILED;
+ LOG.trace("Error while starting service: " + this, e);
throw RuntimeCamelException.wrapRuntimeException(e);
}
}
@@ -130,20 +145,26 @@ public abstract class ServiceSupport implements StatefulService {
public void stop() {
synchronized (lock) {
if (status == FAILED) {
+ LOG.trace("Service: {} failed and regarded as already stopped", this);
return;
}
if (status == STOPPED || status == SHUTTINGDOWN || status == SHUTDOWN) {
+ LOG.trace("Service: {} already stopped", this);
return;
}
if (status == STOPPING) {
+ LOG.trace("Service: {} already stopping", this);
return;
}
status = STOPPING;
+ LOG.trace("Stopping service: {}", this);
try {
doStop();
status = STOPPED;
+ LOG.trace("Stopped: {} service", this);
} catch (Exception e) {
status = FAILED;
+ LOG.trace("Error while stopping service: " + this, e);
throw RuntimeCamelException.wrapRuntimeException(e);
}
}
@@ -159,17 +180,22 @@ public abstract class ServiceSupport implements StatefulService {
public void suspend() {
synchronized (lock) {
if (status == SUSPENDED) {
+ LOG.trace("Service: {} already suspended", this);
return;
}
if (status == SUSPENDING) {
+ LOG.trace("Service: {} already suspending", this);
return;
}
status = SUSPENDING;
+ LOG.trace("Suspending service: {}", this);
try {
doSuspend();
status = SUSPENDED;
+ LOG.trace("Suspended service: {}", this);
} catch (Exception e) {
status = FAILED;
+ LOG.trace("Error while suspending service: " + this, e);
throw RuntimeCamelException.wrapRuntimeException(e);
}
}
@@ -185,14 +211,18 @@ public abstract class ServiceSupport implements StatefulService {
public void resume() {
synchronized (lock) {
if (status != SUSPENDED) {
+ LOG.trace("Service is not suspended: {}", this);
return;
}
status = STARTING;
+ LOG.trace("Resuming service: {}", this);
try {
doResume();
status = STARTED;
+ LOG.trace("Resumed service: {}", this);
} catch (Exception e) {
status = FAILED;
+ LOG.trace("Error while resuming service: " + this, e);
throw RuntimeCamelException.wrapRuntimeException(e);
}
}
@@ -208,18 +238,23 @@ public abstract class ServiceSupport implements StatefulService {
public void shutdown() {
synchronized (lock) {
if (status == SHUTDOWN) {
+ LOG.trace("Service: {} already shutdown", this);
return;
}
if (status == SHUTTINGDOWN) {
+ LOG.trace("Service: {} already shutting down", this);
return;
}
stop();
status = SHUTDOWN;
+ LOG.trace("Shutting down service: {}", this);
try {
doShutdown();
+ LOG.trace("Shutdown service: {}", this);
status = SHUTDOWN;
} catch (Exception e) {
status = FAILED;
+ LOG.trace("Error shutting down service: " + this, e);
throw RuntimeCamelException.wrapRuntimeException(e);
}
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ChildServiceSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/ChildServiceSupport.java
index f5577f9..bf1a820 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ChildServiceSupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ChildServiceSupport.java
@@ -23,36 +23,46 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.Service;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.support.service.ServiceSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Base class to control lifecycle for a set of child {@link org.apache.camel.Service}s.
*/
public abstract class ChildServiceSupport extends ServiceSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(ChildServiceSupport.class);
+
protected volatile List<Service> childServices;
@Override
public void start() {
synchronized (lock) {
if (status == STARTED) {
+ LOG.trace("Service: {} already started", this);
return;
}
if (status == STARTING) {
+ LOG.trace("Service: {} already starting", this);
return;
}
try {
initService(childServices);
} catch (Exception e) {
status = FAILED;
+ LOG.trace("Error while initializing service: " + this, e);
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
try {
status = STARTING;
+ LOG.trace("Starting service: {}", this);
ServiceHelper.startService(childServices);
doStart();
status = STARTED;
+ LOG.trace("Service: {} started", this);
} catch (Exception e) {
status = FAILED;
+ LOG.trace("Error while starting service: " + this, e);
ServiceHelper.stopService(childServices);
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
@@ -63,18 +73,23 @@ public abstract class ChildServiceSupport extends ServiceSupport {
public void stop() {
synchronized (lock) {
if (status == STOPPED || status == SHUTTINGDOWN || status == SHUTDOWN) {
+ LOG.trace("Service: {} already stopped", this);
return;
}
if (status == STOPPING) {
+ LOG.trace("Service: {} already stopping", this);
return;
}
status = STOPPING;
+ LOG.trace("Stopping service: {}", this);
try {
doStop();
ServiceHelper.stopService(childServices);
status = STOPPED;
+ LOG.trace("Service: {} stopped service", this);
} catch (Exception e) {
status = FAILED;
+ LOG.trace("Error while stopping service: " + this, e);
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
}
@@ -84,19 +99,24 @@ public abstract class ChildServiceSupport extends ServiceSupport {
public void shutdown() {
synchronized (lock) {
if (status == SHUTDOWN) {
+ LOG.trace("Service: {} already shut down", this);
return;
}
if (status == SHUTTINGDOWN) {
+ LOG.trace("Service: {} already shutting down", this);
return;
}
stop();
status = SHUTDOWN;
+ LOG.trace("Shutting down service: {}", this);
try {
doShutdown();
ServiceHelper.stopAndShutdownServices(childServices);
+ LOG.trace("Service: {} shut down", this);
status = SHUTDOWN;
} catch (Exception e) {
status = FAILED;
+ LOG.trace("Error shutting down service: " + this, e);
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
}
[camel] 01/05: CAMEL-14421: optimize core - ServiceSupport should
not have instance logger. Use static logger instead.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c256b7f0ba2bae06cb1985e23b1b8d9c3be6bee7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jan 22 11:25:48 2020 +0100
CAMEL-14421: optimize core - ServiceSupport should not have instance logger. Use static logger instead.
---
.../camel/support/service/ServiceSupport.java | 62 ++-----
.../component/properties/PropertiesComponent.java | 8 +-
.../impl/converter/BaseTypeConverterRegistry.java | 48 +++---
.../camel/impl/converter/DefaultTypeConverter.java | 10 +-
.../camel/impl/engine/AbstractCamelContext.java | 183 +++++++++++----------
.../apache/camel/impl/engine/BaseRouteService.java | 7 -
.../engine/DefaultAsyncProcessorAwaitManager.java | 24 +--
.../camel/impl/engine/DefaultConsumerCache.java | 15 +-
.../camel/impl/engine/DefaultConsumerTemplate.java | 9 +-
.../impl/engine/DefaultInflightRepository.java | 8 +-
.../impl/engine/DefaultManagementStrategy.java | 6 +-
.../camel/impl/engine/DefaultProducerCache.java | 10 +-
.../engine/DefaultRuntimeEndpointRegistry.java | 9 +-
.../camel/impl/engine/DefaultShutdownStrategy.java | 70 ++++----
.../impl/engine/DefaultStreamCachingStrategy.java | 42 ++---
.../camel/impl/engine/DurationRoutePolicy.java | 14 +-
.../camel/impl/engine/FileStateRepository.java | 27 +--
.../engine/InterceptSendToEndpointProcessor.java | 15 +-
.../impl/transformer/DataFormatTransformer.java | 12 +-
.../impl/transformer/ProcessorTransformer.java | 10 +-
.../camel/processor/CamelInternalProcessor.java | 21 ++-
.../org/apache/camel/processor/CatchProcessor.java | 12 +-
.../apache/camel/processor/ChoiceProcessor.java | 7 +-
.../camel/processor/ClaimCheckProcessor.java | 16 +-
.../camel/processor/DelayProcessorSupport.java | 20 ++-
.../java/org/apache/camel/processor/Enricher.java | 15 +-
.../camel/processor/EventNotifierProducer.java | 6 +-
.../camel/processor/FatalFallbackErrorHandler.java | 14 +-
.../apache/camel/processor/FilterProcessor.java | 6 +-
.../apache/camel/processor/FinallyProcessor.java | 6 +-
.../org/apache/camel/processor/LogProcessor.java | 10 +-
.../org/apache/camel/processor/LoopProcessor.java | 13 +-
.../apache/camel/processor/MulticastProcessor.java | 13 +-
.../camel/processor/OnCompletionProcessor.java | 19 ++-
.../java/org/apache/camel/processor/Pipeline.java | 19 ++-
.../org/apache/camel/processor/PollEnricher.java | 21 ++-
.../org/apache/camel/processor/RecipientList.java | 7 +-
.../camel/processor/RecipientListProcessor.java | 4 +-
.../org/apache/camel/processor/Resequencer.java | 24 +--
.../org/apache/camel/processor/RoutingSlip.java | 33 ++--
.../apache/camel/processor/SamplingThrottler.java | 12 +-
.../camel/processor/SendDynamicProcessor.java | 28 ++--
.../org/apache/camel/processor/SendProcessor.java | 9 +-
.../org/apache/camel/processor/StepProcessor.java | 6 +-
.../apache/camel/processor/StreamResequencer.java | 7 +-
.../apache/camel/processor/ThreadsProcessor.java | 12 +-
.../java/org/apache/camel/processor/Throttler.java | 44 ++---
.../org/apache/camel/processor/TryProcessor.java | 10 +-
.../apache/camel/processor/WireTapProcessor.java | 8 +-
.../processor/aggregate/AggregateProcessor.java | 132 ++++++++-------
.../camel/processor/channel/DefaultChannel.java | 8 +-
.../errorhandler/RedeliveryErrorHandler.java | 98 +++++------
.../processor/idempotent/IdempotentConsumer.java | 7 +-
.../processor/interceptor/BacklogDebugger.java | 6 +-
.../camel/processor/interceptor/BacklogTracer.java | 3 -
.../processor/interceptor/DefaultDebugger.java | 6 +-
.../loadbalancer/FailOverLoadBalancer.java | 23 ++-
.../throttling/ThrottlingExceptionRoutePolicy.java | 36 ++--
.../throttling/ThrottlingInflightRoutePolicy.java | 14 +-
.../impl/cloud/DefaultServiceCallProcessor.java | 7 +-
.../camel/impl/AbstractModelCamelContext.java | 12 +-
.../org/apache/camel/impl/DefaultCamelContext.java | 9 +-
.../camel/impl/cluster/ClusteredRoutePolicy.java | 21 ++-
.../camel/core/osgi/OsgiCamelContextPublisher.java | 16 +-
.../org/apache/camel/impl/CustomIdFactoryTest.java | 2 +-
.../impl/transformer/TransformerRouteTest.java | 8 +-
.../camel/impl/validator/ValidatorRouteTest.java | 4 +-
.../camel/processor/MyLoggingSentEventNotifer.java | 6 +-
.../processor/validation/ValidatingProcessor.java | 10 +-
.../org/apache/camel/main/BaseMainSupport.java | 2 +-
.../DefaultInstrumentationProcessor.java | 9 +-
.../management/JmxManagementLifecycleStrategy.java | 71 ++++----
.../camel/management/JmxManagementStrategy.java | 10 +-
.../camel/management/PublishEventNotifier.java | 8 +-
...StacksNeededDuringRoutingSendProcessorTest.java | 8 +-
.../apache/camel/support/ChildServiceSupport.java | 16 --
.../org/apache/camel/support/DefaultComponent.java | 40 +++--
.../org/apache/camel/support/DefaultConsumer.java | 10 +-
.../org/apache/camel/support/DefaultEndpoint.java | 10 +-
.../org/apache/camel/support/DefaultProducer.java | 12 +-
.../support/DefaultScheduledPollConsumer.java | 7 +-
.../DefaultScheduledPollConsumerScheduler.java | 14 +-
.../camel/support/EventDrivenPollingConsumer.java | 12 +-
.../apache/camel/support/RoutePolicySupport.java | 18 +-
.../support/ScheduledBatchPollingConsumer.java | 8 +-
.../camel/support/ScheduledPollConsumer.java | 60 +++----
.../cluster/AbstractCamelClusterService.java | 22 ++-
.../DefaultManagementMBeanAssembler.java | 8 +-
.../camel/support/processor/CamelLogProcessor.java | 10 +-
.../camel/support/processor/ThroughputLogger.java | 8 +-
.../idempotent/FileIdempotentRepository.java | 36 ++--
91 files changed, 1042 insertions(+), 796 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceSupport.java b/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceSupport.java
index 6b499cf5..0cce39a 100644
--- a/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceSupport.java
+++ b/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceSupport.java
@@ -19,8 +19,6 @@ package org.apache.camel.support.service;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.ServiceStatus;
import org.apache.camel.StatefulService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A useful base class which ensures that a service is only initialized once and
@@ -36,36 +34,33 @@ import org.slf4j.LoggerFactory;
*/
public abstract class ServiceSupport implements StatefulService {
- protected static final int NEW = 0;
- protected static final int BUILDED = 1;
- protected static final int INITIALIZED = 2;
- protected static final int STARTING = 3;
- protected static final int STARTED = 4;
- protected static final int SUSPENDING = 5;
- protected static final int SUSPENDED = 6;
- protected static final int STOPPING = 7;
- protected static final int STOPPED = 8;
- protected static final int SHUTTINGDOWN = 9;
- protected static final int SHUTDOWN = 10;
- protected static final int FAILED = 11;
-
- protected final Logger log = LoggerFactory.getLogger(getClass());
+ protected static final byte NEW = 0;
+ protected static final byte BUILDED = 1;
+ protected static final byte INITIALIZED = 2;
+ protected static final byte STARTING = 3;
+ protected static final byte STARTED = 4;
+ protected static final byte SUSPENDING = 5;
+ protected static final byte SUSPENDED = 6;
+ protected static final byte STOPPING = 7;
+ protected static final byte STOPPED = 8;
+ protected static final byte SHUTTINGDOWN = 9;
+ protected static final byte SHUTDOWN = 10;
+ protected static final byte FAILED = 11;
+
protected final Object lock = new Object();
- protected volatile int status = NEW;
+ protected volatile byte status = NEW;
@Override
public void build() {
if (status == NEW) {
synchronized (lock) {
if (status == NEW) {
- log.trace("Building service: {}", this);
try {
doBuild();
} catch (Exception e) {
throw RuntimeCamelException.wrapRuntimeException(e);
}
status = BUILDED;
- log.trace("Built service: {}", this);
}
}
}
@@ -76,14 +71,12 @@ public abstract class ServiceSupport implements StatefulService {
if (status <= BUILDED) {
synchronized (lock) {
if (status <= BUILDED) {
- log.trace("Initializing service: {}", this);
try {
doInit();
} catch (Exception e) {
throw RuntimeCamelException.wrapRuntimeException(e);
}
status = INITIALIZED;
- log.trace("Initialized service: {}", this);
}
}
}
@@ -99,36 +92,29 @@ public abstract class ServiceSupport implements StatefulService {
public void start() {
synchronized (lock) {
if (status == STARTED) {
- log.trace("Service: {} already started", this);
return;
}
if (status == STARTING) {
- log.trace("Service: {} already starting", this);
return;
}
try {
init();
} catch (Exception e) {
status = FAILED;
- log.trace("Error while initializing service: " + this, e);
throw e;
}
try {
status = STARTING;
- log.trace("Starting service: {}", this);
doStart();
status = STARTED;
- log.trace("Started service: {}", this);
} catch (Exception e) {
// need to stop as some resources may have been started during startup
try {
stop();
} catch (Exception e2) {
// ignore
- log.trace("Error while stopping service after it failed to start: " + this + ". This exception is ignored", e);
}
status = FAILED;
- log.trace("Error while starting service: " + this, e);
throw RuntimeCamelException.wrapRuntimeException(e);
}
}
@@ -144,26 +130,20 @@ public abstract class ServiceSupport implements StatefulService {
public void stop() {
synchronized (lock) {
if (status == FAILED) {
- log.trace("Service: {} failed and regarded as already stopped", this);
return;
}
if (status == STOPPED || status == SHUTTINGDOWN || status == SHUTDOWN) {
- log.trace("Service: {} already stopped", this);
return;
}
if (status == STOPPING) {
- log.trace("Service: {} already stopping", this);
return;
}
status = STOPPING;
- log.trace("Stopping service: {}", this);
try {
doStop();
status = STOPPED;
- log.trace("Stopped: {} service", this);
} catch (Exception e) {
status = FAILED;
- log.trace("Error while stopping service: " + this, e);
throw RuntimeCamelException.wrapRuntimeException(e);
}
}
@@ -179,22 +159,17 @@ public abstract class ServiceSupport implements StatefulService {
public void suspend() {
synchronized (lock) {
if (status == SUSPENDED) {
- log.trace("Service: {} already suspended", this);
return;
}
if (status == SUSPENDING) {
- log.trace("Service: {} already suspending", this);
return;
}
status = SUSPENDING;
- log.trace("Suspending service: {}", this);
try {
doSuspend();
status = SUSPENDED;
- log.trace("Suspended service: {}", this);
} catch (Exception e) {
status = FAILED;
- log.trace("Error while suspending service: " + this, e);
throw RuntimeCamelException.wrapRuntimeException(e);
}
}
@@ -210,18 +185,14 @@ public abstract class ServiceSupport implements StatefulService {
public void resume() {
synchronized (lock) {
if (status != SUSPENDED) {
- log.trace("Service is not suspended: {}", this);
return;
}
status = STARTING;
- log.trace("Resuming service: {}", this);
try {
doResume();
status = STARTED;
- log.trace("Resumed service: {}", this);
} catch (Exception e) {
status = FAILED;
- log.trace("Error while resuming service: " + this, e);
throw RuntimeCamelException.wrapRuntimeException(e);
}
}
@@ -237,23 +208,18 @@ public abstract class ServiceSupport implements StatefulService {
public void shutdown() {
synchronized (lock) {
if (status == SHUTDOWN) {
- log.trace("Service: {} already shutdown", this);
return;
}
if (status == SHUTTINGDOWN) {
- log.trace("Service: {} already shutting down", this);
return;
}
stop();
status = SHUTDOWN;
- log.trace("Shutting down service: {}", this);
try {
doShutdown();
- log.trace("Shutdown service: {}", this);
status = SHUTDOWN;
} catch (Exception e) {
status = FAILED;
- log.trace("Error shutting down service: " + this, e);
throw RuntimeCamelException.wrapRuntimeException(e);
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
index a98af2d..c971694 100644
--- a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
@@ -246,7 +246,7 @@ public class PropertiesComponent extends ServiceSupport implements org.apache.ca
uri = uri + SUFFIX_TOKEN;
}
- log.trace("Parsing uri {}", uri);
+ LOG.trace("Parsing uri {}", uri);
return propertiesParser.parseUri(uri, properties, defaultFallbackEnabled);
}
@@ -598,11 +598,11 @@ public class PropertiesComponent extends ServiceSupport implements org.apache.ca
List<PropertiesLocation> answer = new ArrayList<>();
for (PropertiesLocation location : locations) {
- log.trace("Parsing location: {}", location);
+ LOG.trace("Parsing location: {}", location);
try {
String path = FilePathResolver.resolvePath(location.getPath());
- log.debug("Parsed location: {}", path);
+ LOG.debug("Parsed location: {}", path);
if (ObjectHelper.isNotEmpty(path)) {
answer.add(new PropertiesLocation(
location.getResolver(),
@@ -614,7 +614,7 @@ public class PropertiesComponent extends ServiceSupport implements org.apache.ca
if (!ignoreMissingLocation && !location.isOptional()) {
throw e;
} else {
- log.debug("Ignored missing location: {}", location);
+ LOG.debug("Ignored missing location: {}", location);
}
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
index 37fa497..a6fea6e 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
@@ -60,6 +60,8 @@ import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.DoubleMap;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Base implementation of a type converter registry used for
@@ -67,6 +69,8 @@ import org.apache.camel.util.ObjectHelper;
*/
public abstract class BaseTypeConverterRegistry extends ServiceSupport implements TypeConverter, TypeConverterRegistry {
+ private static final Logger LOG = LoggerFactory.getLogger(BaseTypeConverterRegistry.class);
+
public static final String META_INF_SERVICES_TYPE_CONVERTER_LOADER = "META-INF/services/org/apache/camel/TypeConverterLoader";
public static final String META_INF_SERVICES_FALLBACK_TYPE_CONVERTER = "META-INF/services/org/apache/camel/FallbackTypeConverter";
@@ -189,11 +193,11 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
}
protected Object doConvertTo(final Class<?> type, final Exchange exchange, final Object value, final boolean tryConvert) throws Exception {
- boolean trace = log.isTraceEnabled();
+ boolean trace = LOG.isTraceEnabled();
boolean statisticsEnabled = statistics.isStatisticsEnabled();
if (trace) {
- log.trace("Finding type converter to convert {} -> {} with value: {}",
+ LOG.trace("Finding type converter to convert {} -> {} with value: {}",
value == null ? "null" : value.getClass().getCanonicalName(),
type.getCanonicalName(), value);
}
@@ -252,7 +256,7 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
TypeConverter converter = getOrFindTypeConverter(type, value.getClass());
if (converter != null) {
if (trace) {
- log.trace("Using converter: {} to convert [{}=>{}]", converter, value.getClass(), type);
+ LOG.trace("Using converter: {} to convert [{}=>{}]", converter, value.getClass(), type);
}
Object rc;
if (tryConvert) {
@@ -313,15 +317,15 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
// if fallback can promote then let it be promoted to a first class type converter
if (fallback.isCanPromote()) {
// add it as a known type converter since we found a fallback that could do it
- if (log.isDebugEnabled()) {
- log.debug("Promoting fallback type converter as a known type converter to convert from: {} to: {} for the fallback converter: {}",
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Promoting fallback type converter as a known type converter to convert from: {} to: {} for the fallback converter: {}",
type.getCanonicalName(), value.getClass().getCanonicalName(), fallback.getFallbackTypeConverter());
}
addTypeConverter(type, value.getClass(), fallback.getFallbackTypeConverter());
}
- if (log.isTraceEnabled()) {
- log.trace("Fallback type converter {} converted type from: {} to: {}",
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Fallback type converter {} converted type from: {} to: {}",
fallback.getFallbackTypeConverter(), type.getCanonicalName(), value.getClass().getCanonicalName());
}
@@ -342,7 +346,7 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
@Override
public void addTypeConverter(Class<?> toType, Class<?> fromType, TypeConverter typeConverter) {
- log.trace("Adding type converter: {}", typeConverter);
+ LOG.trace("Adding type converter: {}", typeConverter);
TypeConverter converter = typeMappings.get(toType, fromType);
// only override it if its different
// as race conditions can lead to many threads trying to promote the same fallback converter
@@ -355,10 +359,10 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
// if converter is not null then a duplicate exists
if (converter != null) {
if (typeConverterExists == TypeConverterExists.Override) {
- CamelLogger logger = new CamelLogger(log, typeConverterExistsLoggingLevel);
+ CamelLogger logger = new CamelLogger(LOG, typeConverterExistsLoggingLevel);
logger.log("Overriding type converter from: " + converter + " to: " + typeConverter);
} else if (typeConverterExists == TypeConverterExists.Ignore) {
- CamelLogger logger = new CamelLogger(log, typeConverterExistsLoggingLevel);
+ CamelLogger logger = new CamelLogger(LOG, typeConverterExistsLoggingLevel);
logger.log("Ignoring duplicate type converter from: " + converter + " to: " + typeConverter);
add = false;
} else {
@@ -375,7 +379,7 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
@Override
public void addTypeConverters(TypeConverters typeConverters) {
- log.trace("Adding type converters: {}", typeConverters);
+ LOG.trace("Adding type converters: {}", typeConverters);
try {
// scan the class for @Converter and load them into this registry
TypeConvertersLoader loader = new TypeConvertersLoader(typeConverters);
@@ -387,13 +391,13 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
@Override
public boolean removeTypeConverter(Class<?> toType, Class<?> fromType) {
- log.trace("Removing type converter from: {} to: {}", fromType, toType);
+ LOG.trace("Removing type converter from: {} to: {}", fromType, toType);
return typeMappings.remove(toType, fromType);
}
@Override
public void addFallbackTypeConverter(TypeConverter typeConverter, boolean canPromote) {
- log.trace("Adding fallback type converter: {} which can promote: {}", typeConverter, canPromote);
+ LOG.trace("Adding fallback type converter: {} which can promote: {}", typeConverter, canPromote);
// add in top of fallback as the toString() fallback will nearly always be able to convert
// the last one which is add to the FallbackTypeConverter will be called at the first place
@@ -408,7 +412,7 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
}
private void addCoreFallbackTypeConverterToList(TypeConverter typeConverter, boolean canPromote, List<FallbackTypeConverter> converters) {
- log.trace("Adding core fallback type converter: {} which can promote: {}", typeConverter, canPromote);
+ LOG.trace("Adding core fallback type converter: {} which can promote: {}", typeConverter, canPromote);
// add in top of fallback as the toString() fallback will nearly always be able to convert
// the last one which is add to the FallbackTypeConverter will be called at the first place
@@ -523,7 +527,7 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
public void loadCoreAndFastTypeConverters() throws Exception {
Collection<String> names = findTypeConverterLoaderClasses();
for (String name : names) {
- log.debug("Resolving TypeConverterLoader: {}", name);
+ LOG.debug("Resolving TypeConverterLoader: {}", name);
Class clazz = null;
for (ClassLoader loader : getResolver().getClassLoaders()) {
try {
@@ -541,7 +545,7 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
Object obj = getInjector().newInstance(clazz, false);
if (obj instanceof TypeConverterLoader) {
TypeConverterLoader loader = (TypeConverterLoader) obj;
- log.debug("TypeConverterLoader: {} loading converters", name);
+ LOG.debug("TypeConverterLoader: {} loading converters", name);
loader.load(this);
}
}
@@ -555,7 +559,7 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
Set<String> loaders = new LinkedHashSet<>();
Collection<URL> loaderResources = getLoaderUrls();
for (URL url : loaderResources) {
- log.debug("Loading file {} to retrieve list of type converters, from url: {}", META_INF_SERVICES_TYPE_CONVERTER_LOADER, url);
+ LOG.debug("Loading file {} to retrieve list of type converters, from url: {}", META_INF_SERVICES_TYPE_CONVERTER_LOADER, url);
BufferedReader reader = IOHelper.buffered(new InputStreamReader(url.openStream(), StandardCharsets.UTF_8));
String line;
do {
@@ -605,7 +609,7 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
Set<String> loaders = new LinkedHashSet<>();
Collection<URL> loaderResources = getFallbackUrls();
for (URL url : loaderResources) {
- log.debug("Loading file {} to retrieve list of fallback type converters, from url: {}", META_INF_SERVICES_FALLBACK_TYPE_CONVERTER, url);
+ LOG.debug("Loading file {} to retrieve list of fallback type converters, from url: {}", META_INF_SERVICES_FALLBACK_TYPE_CONVERTER, url);
BufferedReader reader = IOHelper.buffered(new InputStreamReader(url.openStream(), StandardCharsets.UTF_8));
try {
reader.lines()
@@ -614,7 +618,7 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
.filter(l -> !l.startsWith("#"))
.forEach(loaders::add);
} finally {
- IOHelper.close(reader, url.toString(), log);
+ IOHelper.close(reader, url.toString(), LOG);
}
}
return loaders;
@@ -635,7 +639,7 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
protected void loadFallbackTypeConverters() throws IOException, ClassNotFoundException {
Collection<String> names = findFallbackTypeConverterClasses();
for (String name : names) {
- log.debug("Resolving FallbackTypeConverter: {}", name);
+ LOG.debug("Resolving FallbackTypeConverter: {}", name);
Class clazz = getResolver().getClassLoaders().stream()
.map(cl -> ObjectHelper.loadClass(name, cl))
.filter(Objects::nonNull)
@@ -643,7 +647,7 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
Object obj = getInjector().newInstance(clazz, false);
if (obj instanceof TypeConverter) {
TypeConverter fb = (TypeConverter) obj;
- log.debug("Adding loaded FallbackTypeConverter: {}", name);
+ LOG.debug("Adding loaded FallbackTypeConverter: {}", name);
addFallbackTypeConverter(fb, false);
}
}
@@ -747,7 +751,7 @@ public abstract class BaseTypeConverterRegistry extends ServiceSupport implement
}
});
info += String.format(" mappings[total=%s, misses=%s]", typeMappings.size(), misses);
- log.info(info);
+ LOG.info(info);
}
typeMappings.clear();
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
index 31ab1f8..982ed75 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
@@ -22,6 +22,8 @@ import org.apache.camel.spi.Injector;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.TimeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default implementation of a type converter registry used for
@@ -31,6 +33,8 @@ import org.apache.camel.util.TimeUtils;
*/
public class DefaultTypeConverter extends BaseTypeConverterRegistry {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultTypeConverter.class);
+
private final boolean loadTypeConverters;
public DefaultTypeConverter(PackageScanClassResolver resolver, Injector injector,
@@ -78,8 +82,8 @@ public class DefaultTypeConverter extends BaseTypeConverterRegistry {
// report how many type converters we have loaded
if (additional > 0) {
- log.info("Type converters loaded (fast: {}, scanned: {})", fast, additional);
- log.warn("Annotation scanning mode loaded {} type converters. Its recommended to migrate to @Converter(loader = true) for fast type converter mode.", additional);
+ LOG.info("Type converters loaded (fast: {}, scanned: {})", fast, additional);
+ LOG.warn("Annotation scanning mode loaded {} type converters. Its recommended to migrate to @Converter(loader = true) for fast type converter mode.", additional);
}
// lets clear the cache from the resolver as its often only used during startup
@@ -89,7 +93,7 @@ public class DefaultTypeConverter extends BaseTypeConverterRegistry {
}
String time = TimeUtils.printDuration(watch.taken());
- log.debug("Loaded {} type converters in {}", typeMappings.size(), time);
+ LOG.debug("Loaded {} type converters in {}", typeMappings.size(), time);
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index b76fafa..5b26704 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -154,8 +154,11 @@ import org.apache.camel.util.StringHelper;
import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.URISupport;
import org.apache.camel.util.function.ThrowingRunnable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
+
import static org.apache.camel.spi.UnitOfWork.MDC_CAMEL_CONTEXT_ID;
/**
@@ -163,6 +166,8 @@ import static org.apache.camel.spi.UnitOfWork.MDC_CAMEL_CONTEXT_ID;
*/
public abstract class AbstractCamelContext extends ServiceSupport implements ExtendedCamelContext, Suspendable {
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractCamelContext.class);
+
public enum Initialization {
Eager, Default, Lazy
}
@@ -518,8 +523,8 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
Component component = null;
if (autoCreateComponents) {
try {
- if (log.isDebugEnabled()) {
- log.debug("Using ComponentResolver: {} to resolve component with name: {}", getComponentResolver(), name);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Using ComponentResolver: {} to resolve component with name: {}", getComponentResolver(), name);
}
// Mark the component as being created so we can detect circular
@@ -605,7 +610,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
try {
stopServices(oldComponent);
} catch (Exception e) {
- log.warn("Error stopping component " + oldComponent + ". This exception will be ignored.", e);
+ LOG.warn("Error stopping component " + oldComponent + ". This exception will be ignored.", e);
}
for (LifecycleStrategy strategy : lifecycleStrategies) {
strategy.onComponentRemove(componentName, oldComponent);
@@ -677,7 +682,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
try {
stopServices(oldEndpoint);
} catch (Exception e) {
- log.warn("Error stopping endpoint " + oldEndpoint + ". This exception will be ignored.", e);
+ LOG.warn("Error stopping endpoint " + oldEndpoint + ". This exception will be ignored.", e);
}
answer.add(oldEndpoint);
endpoints.remove(entry.getKey());
@@ -702,7 +707,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
StringHelper.notEmpty(uri, "uri");
- log.trace("Getting endpoint with uri: {}", uri);
+ LOG.trace("Getting endpoint with uri: {}", uri);
// in case path has property placeholders then try to let property
// component resolve those
@@ -718,7 +723,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
// parameters is not in the same order
uri = normalizeEndpointUri(uri);
- log.trace("Getting endpoint with raw uri: {}, normalized uri: {}", rawUri, uri);
+ LOG.trace("Getting endpoint with raw uri: {}, normalized uri: {}", rawUri, uri);
Endpoint answer;
String scheme = null;
@@ -731,12 +736,12 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
String[] splitURI = StringHelper.splitOnCharacter(uri, ":", 2);
if (splitURI[1] != null) {
scheme = splitURI[0];
- log.trace("Endpoint uri: {} is from component with name: {}", uri, scheme);
+ LOG.trace("Endpoint uri: {} is from component with name: {}", uri, scheme);
Component component = getComponent(scheme);
// Ask the component to resolve the endpoint.
if (component != null) {
- log.trace("Creating endpoint from uri: {} using component: {}", uri, component);
+ LOG.trace("Creating endpoint from uri: {} using component: {}", uri, component);
// Have the component create the endpoint if it can.
if (component.useRawUri()) {
@@ -745,8 +750,8 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
answer = component.createEndpoint(uri);
}
- if (answer != null && log.isDebugEnabled()) {
- log.debug("{} converted to endpoint: {} by component: {}", URISupport.sanitizeUri(uri), answer, component);
+ if (answer != null && LOG.isDebugEnabled()) {
+ LOG.debug("{} converted to endpoint: {} by component: {}", URISupport.sanitizeUri(uri), answer, component);
}
}
}
@@ -754,7 +759,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
if (answer == null) {
// no component then try in registry and elsewhere
answer = createEndpoint(uri);
- log.trace("No component to create endpoint from uri: {} fallback lookup in registry -> {}", uri, answer);
+ LOG.trace("No component to create endpoint from uri: {} fallback lookup in registry -> {}", uri, answer);
}
if (answer == null && splitURI[1] == null) {
@@ -769,7 +774,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
// Ask the component to resolve the endpoint.
if (component != null) {
- log.trace("Creating endpoint from uri: {} using component: {}", uri, component);
+ LOG.trace("Creating endpoint from uri: {} using component: {}", uri, component);
// Have the component create the endpoint if it can.
if (component.useRawUri()) {
@@ -778,8 +783,8 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
answer = component.createEndpoint(uri);
}
- if (answer != null && log.isDebugEnabled()) {
- log.debug("{} converted to endpoint: {} by component: {}", URISupport.sanitizeUri(uri), answer, component);
+ if (answer != null && LOG.isDebugEnabled()) {
+ LOG.debug("{} converted to endpoint: {} by component: {}", URISupport.sanitizeUri(uri), answer, component);
}
}
@@ -808,7 +813,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
StringHelper.notEmpty(uri, "uri");
- log.trace("Getting endpoint with uri: {} and parameters: {}", uri, parameters);
+ LOG.trace("Getting endpoint with uri: {} and parameters: {}", uri, parameters);
// in case path has property placeholders then try to let property
// component resolve those
@@ -824,7 +829,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
// parameters is not in the same order
uri = normalizeEndpointUri(uri);
- log.trace("Getting endpoint with raw uri: {}, normalized uri: {}", rawUri, uri);
+ LOG.trace("Getting endpoint with raw uri: {}, normalized uri: {}", rawUri, uri);
Endpoint answer;
String scheme = null;
@@ -837,12 +842,12 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
String[] splitURI = StringHelper.splitOnCharacter(uri, ":", 2);
if (splitURI[1] != null) {
scheme = splitURI[0];
- log.trace("Endpoint uri: {} is from component with name: {}", uri, scheme);
+ LOG.trace("Endpoint uri: {} is from component with name: {}", uri, scheme);
Component component = getComponent(scheme);
// Ask the component to resolve the endpoint.
if (component != null) {
- log.trace("Creating endpoint from uri: {} using component: {}", uri, component);
+ LOG.trace("Creating endpoint from uri: {} using component: {}", uri, component);
// Have the component create the endpoint if it can.
if (component.useRawUri()) {
@@ -851,8 +856,8 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
answer = component.createEndpoint(uri, parameters);
}
- if (answer != null && log.isDebugEnabled()) {
- log.debug("{} converted to endpoint: {} by component: {}", URISupport.sanitizeUri(uri), answer, component);
+ if (answer != null && LOG.isDebugEnabled()) {
+ LOG.debug("{} converted to endpoint: {} by component: {}", URISupport.sanitizeUri(uri), answer, component);
}
}
}
@@ -860,7 +865,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
if (answer == null) {
// no component then try in registry and elsewhere
answer = createEndpoint(uri);
- log.trace("No component to create endpoint from uri: {} fallback lookup in registry -> {}", uri, answer);
+ LOG.trace("No component to create endpoint from uri: {} fallback lookup in registry -> {}", uri, answer);
}
if (answer == null && splitURI[1] == null) {
@@ -875,7 +880,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
// Ask the component to resolve the endpoint.
if (component != null) {
- log.trace("Creating endpoint from uri: {} using component: {}", uri, component);
+ LOG.trace("Creating endpoint from uri: {} using component: {}", uri, component);
// Have the component create the endpoint if it can.
if (component.useRawUri()) {
@@ -884,8 +889,8 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
answer = component.createEndpoint(uri, parameters);
}
- if (answer != null && log.isDebugEnabled()) {
- log.debug("{} converted to endpoint: {} by component: {}", URISupport.sanitizeUri(uri), answer, component);
+ if (answer != null && LOG.isDebugEnabled()) {
+ LOG.debug("{} converted to endpoint: {} by component: {}", URISupport.sanitizeUri(uri), answer, component);
}
}
@@ -1107,7 +1112,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
@Override
public void addRoutes(final RoutesBuilder builder) throws Exception {
init();
- log.debug("Adding routes from builder: {}", builder);
+ LOG.debug("Adding routes from builder: {}", builder);
doWithDefinedClassLoader(() -> builder.addRoutesToCamelContext(AbstractCamelContext.this));
}
@@ -1277,7 +1282,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
}
}
for (Endpoint endpoint : toRemove) {
- log.debug("Removing: {} which was only in use by route: {}", endpoint, routeId);
+ LOG.debug("Removing: {} which was only in use by route: {}", endpoint, routeId);
removeEndpoint(endpoint);
}
} catch (Exception e) {
@@ -1516,7 +1521,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
ClassResolver resolver = getClassResolver();
InputStream inputStream = resolver.loadResourceAsStream(path);
- log.debug("Loading component JSON Schema for: {} using class resolver: {} -> {}", componentName, resolver, inputStream);
+ LOG.debug("Loading component JSON Schema for: {} using class resolver: {} -> {}", componentName, resolver, inputStream);
if (inputStream != null) {
try {
return IOHelper.loadText(inputStream);
@@ -1548,7 +1553,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
ClassResolver resolver = getClassResolver();
InputStream inputStream = resolver.loadResourceAsStream(path);
- log.debug("Loading dataformat JSON Schema for: {} using class resolver: {} -> {}", dataFormatName, resolver, inputStream);
+ LOG.debug("Loading dataformat JSON Schema for: {} using class resolver: {} -> {}", dataFormatName, resolver, inputStream);
if (inputStream != null) {
try {
return IOHelper.loadText(inputStream);
@@ -1575,7 +1580,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
ClassResolver resolver = getClassResolver();
InputStream inputStream = resolver.loadResourceAsStream(path);
- log.debug("Loading language JSON Schema for: {} using class resolver: {} -> {}", languageName, resolver, inputStream);
+ LOG.debug("Loading language JSON Schema for: {} using class resolver: {} -> {}", languageName, resolver, inputStream);
if (inputStream != null) {
try {
return IOHelper.loadText(inputStream);
@@ -1595,7 +1600,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
ClassResolver resolver = getClassResolver();
InputStream inputStream = resolver.loadResourceAsStream(path);
if (inputStream != null) {
- log.debug("Loading eip JSON Schema for: {} using class resolver: {} -> {}", eipName, resolver, inputStream);
+ LOG.debug("Loading eip JSON Schema for: {} using class resolver: {} -> {}", eipName, resolver, inputStream);
try {
return IOHelper.loadText(inputStream);
} finally {
@@ -1652,7 +1657,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
if (text != null && text.contains(PropertiesComponent.PREFIX_TOKEN)) {
// the parser will throw exception if property key was not found
String answer = getPropertiesComponent().parseUri(text);
- log.debug("Resolved text: {} -> {}", text, answer);
+ LOG.debug("Resolved text: {} -> {}", text, answer);
return answer;
}
@@ -2200,7 +2205,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
protected void doSuspend() throws Exception {
EventHelper.notifyCamelContextSuspending(this);
- log.info("Apache Camel {} (CamelContext: {}) is suspending", getVersion(), getName());
+ LOG.info("Apache Camel {} (CamelContext: {}) is suspending", getVersion(), getName());
StopWatch watch = new StopWatch();
// update list of started routes to be suspended
@@ -2240,8 +2245,8 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
}
watch.taken();
- if (log.isInfoEnabled()) {
- log.info("Apache Camel {} (CamelContext: {}) is suspended in {}", getVersion(), getName(), TimeUtils.printDuration(watch.taken()));
+ if (LOG.isInfoEnabled()) {
+ LOG.info("Apache Camel {} (CamelContext: {}) is suspended in {}", getVersion(), getName(), TimeUtils.printDuration(watch.taken()));
}
EventHelper.notifyCamelContextSuspended(this);
@@ -2252,7 +2257,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
try {
EventHelper.notifyCamelContextResuming(this);
- log.info("Apache Camel {} (CamelContext: {}) is resuming", getVersion(), getName());
+ LOG.info("Apache Camel {} (CamelContext: {}) is resuming", getVersion(), getName());
StopWatch watch = new StopWatch();
// start the suspended routes (do not check for route clashes, and
@@ -2269,9 +2274,9 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
}
}
- if (log.isInfoEnabled()) {
- log.info("Resumed {} routes", suspendedRouteServices.size());
- log.info("Apache Camel {} (CamelContext: {}) resumed in {}", getVersion(), getName(), TimeUtils.printDuration(watch.taken()));
+ if (LOG.isInfoEnabled()) {
+ LOG.info("Resumed {} routes", suspendedRouteServices.size());
+ LOG.info("Apache Camel {} (CamelContext: {}) resumed in {}", getVersion(), getName(), TimeUtils.printDuration(watch.taken()));
}
// and clear the list as they have been resumed
@@ -2291,7 +2296,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
init();
vetoStarted.set(false);
stopWatch.restart();
- log.info("Apache Camel {} (CamelContext: {}) is starting", getVersion(), getName());
+ LOG.info("Apache Camel {} (CamelContext: {}) is starting", getVersion(), getName());
// Start the route controller
ServiceHelper.startService(this.routeController);
@@ -2324,19 +2329,19 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
if (veto.isRethrowException()) {
throw e;
} else {
- log.info("CamelContext ({}) vetoed to not start due {}", getName(), e.getMessage());
+ LOG.info("CamelContext ({}) vetoed to not start due {}", getName(), e.getMessage());
// swallow exception and change state of this camel context
// to stopped
stop();
return;
}
} else {
- log.error("Error starting CamelContext (" + getName() + ") due to exception thrown: " + e.getMessage(), e);
+ LOG.error("Error starting CamelContext (" + getName() + ") due to exception thrown: " + e.getMessage(), e);
throw RuntimeCamelException.wrapRuntimeException(e);
}
}
- if (log.isInfoEnabled()) {
+ if (LOG.isInfoEnabled()) {
// count how many routes are actually started
int started = 0;
for (Route route : getRoutes()) {
@@ -2348,12 +2353,12 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
final Collection<Route> controlledRoutes = getRouteController().getControlledRoutes();
if (controlledRoutes.isEmpty()) {
- log.info("Total {} routes, of which {} are started", getRoutes().size(), started);
+ LOG.info("Total {} routes, of which {} are started", getRoutes().size(), started);
} else {
- log.info("Total {} routes, of which {} are started, and {} are managed by RouteController: {}", getRoutes().size(), started, controlledRoutes.size(),
+ LOG.info("Total {} routes, of which {} are started, and {} are managed by RouteController: {}", getRoutes().size(), started, controlledRoutes.size(),
getRouteController().getClass().getName());
}
- log.info("Apache Camel {} (CamelContext: {}) started in {}", getVersion(), getName(), TimeUtils.printDuration(stopWatch.taken()));
+ LOG.info("Apache Camel {} (CamelContext: {}) started in {}", getVersion(), getName(), TimeUtils.printDuration(stopWatch.taken()));
}
// okay the routes has been started so emit event that CamelContext
@@ -2442,8 +2447,8 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
if (value != null) {
String replaced = resolvePropertyPlaceholders(value);
if (!value.equals(replaced)) {
- if (log.isDebugEnabled()) {
- log.debug("Camel property with key {} replaced value from {} -> {}", key, value, replaced);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Camel property with key {} replaced value from {} -> {}", key, value, replaced);
}
entry.setValue(replaced);
}
@@ -2451,36 +2456,36 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
}
}
- if (log.isDebugEnabled()) {
- log.debug("Using ClassResolver={}, PackageScanClassResolver={}, ApplicationContextClassLoader={}, RouteController={}", getClassResolver(),
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Using ClassResolver={}, PackageScanClassResolver={}, ApplicationContextClassLoader={}, RouteController={}", getClassResolver(),
getPackageScanClassResolver(), getApplicationContextClassLoader(), getRouteController());
}
if (isStreamCaching()) {
- log.info("StreamCaching is enabled on CamelContext: {}", getName());
+ LOG.info("StreamCaching is enabled on CamelContext: {}", getName());
}
if (isBacklogTracing()) {
// tracing is added in the DefaultChannel so we can enable it on the fly
- log.info("Backlog Tracing is enabled on CamelContext: {}", getName());
+ LOG.info("Backlog Tracing is enabled on CamelContext: {}", getName());
}
if (isTracing()) {
// tracing is added in the DefaultChannel so we can enable it on the fly
- log.info("Tracing is enabled on CamelContext: {}", getName());
+ LOG.info("Tracing is enabled on CamelContext: {}", getName());
}
if (isUseMDCLogging()) {
// log if MDC has been enabled
String pattern = getMDCLoggingKeysPattern();
if (pattern != null) {
- log.info("MDC logging (keys-pattern: {}) is enabled on CamelContext: {}", pattern, getName());
+ LOG.info("MDC logging (keys-pattern: {}) is enabled on CamelContext: {}", pattern, getName());
} else {
- log.info("MDC logging is enabled on CamelContext: {}", getName());
+ LOG.info("MDC logging is enabled on CamelContext: {}", getName());
}
}
if (getDelayer() != null && getDelayer() > 0) {
- log.info("Delayer is enabled with: {} ms. on CamelContext: {}", getDelayer(), getName());
+ LOG.info("Delayer is enabled with: {} ms. on CamelContext: {}", getDelayer(), getName());
}
// start management strategy before lifecycles are started
@@ -2496,10 +2501,10 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
strategy.onContextStart(this);
} catch (VetoCamelContextStartException e) {
// okay we should not start Camel since it was vetoed
- log.warn("Lifecycle strategy vetoed starting CamelContext ({}) due: {}", getName(), e.getMessage());
+ LOG.warn("Lifecycle strategy vetoed starting CamelContext ({}) due: {}", getName(), e.getMessage());
throw e;
} catch (Exception e) {
- log.warn("Lifecycle strategy " + strategy + " failed starting CamelContext ({}) due: {}", getName(), e.getMessage());
+ LOG.warn("Lifecycle strategy " + strategy + " failed starting CamelContext ({}) due: {}", getName(), e.getMessage());
throw e;
}
}
@@ -2560,7 +2565,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
if (isUseDataType()) {
// log if DataType has been enabled
- log.info("Message DataType is enabled on CamelContext: {}", getName());
+ LOG.info("Message DataType is enabled on CamelContext: {}", getName());
}
// is there any stream caching enabled then log an info about this and
@@ -2571,30 +2576,30 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
} else {
// log if stream caching is not in use as this can help people to
// enable it if they use streams
- log.info("StreamCaching is not in use. If using streams then its recommended to enable stream caching."
+ LOG.info("StreamCaching is not in use. If using streams then its recommended to enable stream caching."
+ " See more details at http://camel.apache.org/stream-caching.html");
}
if (isAllowUseOriginalMessage()) {
- log.debug("AllowUseOriginalMessage enabled because UseOriginalMessage is in use");
+ LOG.debug("AllowUseOriginalMessage enabled because UseOriginalMessage is in use");
}
- log.debug("Using HeadersMapFactory: {}", getHeadersMapFactory());
+ LOG.debug("Using HeadersMapFactory: {}", getHeadersMapFactory());
if (!getHeadersMapFactory().isCaseInsensitive()) {
- log.info("HeadersMapFactory: {} is case-sensitive which can cause problems for protocols such as HTTP based, which rely on case-insensitive headers.",
+ LOG.info("HeadersMapFactory: {} is case-sensitive which can cause problems for protocols such as HTTP based, which rely on case-insensitive headers.",
getHeadersMapFactory());
}
// lets log at INFO level if we are not using the default reactive executor
if (!getReactiveExecutor().getClass().getSimpleName().equals("DefaultReactiveExecutor")) {
- log.info("Using ReactiveExecutor: {}", getReactiveExecutor());
+ LOG.info("Using ReactiveExecutor: {}", getReactiveExecutor());
} else {
- log.debug("Using ReactiveExecutor: {}", getReactiveExecutor());
+ LOG.debug("Using ReactiveExecutor: {}", getReactiveExecutor());
}
// start routes
if (doNotStartRoutesOnFirstStart) {
- log.debug("Skip starting routes as CamelContext has been configured with autoStartup=false");
+ LOG.debug("Skip starting routes as CamelContext has been configured with autoStartup=false");
}
// invoke this logic to warmup the routes and if possible also start the routes
@@ -2604,12 +2609,12 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
long cacheCounter = beanIntrospection != null ? beanIntrospection.getCachedClassesCounter() : 0;
if (cacheCounter > 0) {
- log.debug("Clearing BeanIntrospection cache with {} objects using during starting Camel", cacheCounter);
+ LOG.debug("Clearing BeanIntrospection cache with {} objects using during starting Camel", cacheCounter);
beanIntrospection.clearCache();
}
long invokedCounter = beanIntrospection != null ? beanIntrospection.getInvokedCounter() : 0;
if (invokedCounter > 0) {
- log.debug("BeanIntrospection invoked {} times during starting Camel", invokedCounter);
+ LOG.debug("BeanIntrospection invoked {} times during starting Camel", invokedCounter);
}
// starting will continue in the start method
@@ -2628,7 +2633,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
@Override
protected synchronized void doStop() throws Exception {
stopWatch.restart();
- log.info("Apache Camel {} (CamelContext: {}) is shutting down", getVersion(), getName());
+ LOG.info("Apache Camel {} (CamelContext: {}) is shutting down", getVersion(), getName());
EventHelper.notifyCamelContextStopping(this);
EventHelper.notifyCamelContextRoutesStopping(this);
@@ -2643,7 +2648,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
shutdownStrategy.shutdownForced(this, getRouteStartupOrder());
}
} catch (Throwable e) {
- log.warn("Error occurred while shutting down routes. This exception will be ignored.", e);
+ LOG.warn("Error occurred while shutting down routes. This exception will be ignored.", e);
}
// shutdown await manager to trigger interrupt of blocked threads to
@@ -2654,7 +2659,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
for (BaseRouteService routeService : routeServices.values()) {
boolean found = routeStartupOrder.stream().anyMatch(o -> o.getRoute().getId().equals(routeService.getId()));
if (!found) {
- log.debug("Route: {} which failed to startup will be stopped", routeService.getId());
+ LOG.debug("Route: {} which failed to startup will be stopped", routeService.getId());
routeStartupOrder.add(doPrepareRouteToBeStarted(routeService));
}
}
@@ -2712,7 +2717,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
strategy.onContextStop(this);
}
} catch (Throwable e) {
- log.warn("Error occurred while stopping lifecycle strategies. This exception will be ignored.", e);
+ LOG.warn("Error occurred while stopping lifecycle strategies. This exception will be ignored.", e);
}
// shutdown services as late as possible (except type converters as they may be needed during the remainder of the stopping)
@@ -2743,9 +2748,9 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
// stop the lazy created so they can be re-created on restart
forceStopLazyInitialization();
- if (log.isInfoEnabled()) {
- log.info("Apache Camel " + getVersion() + " (CamelContext: " + getName() + ") uptime {}", getUptime());
- log.info("Apache Camel {} (CamelContext: {}) is shutdown in {}", getVersion(), getName(), TimeUtils.printDuration(stopWatch.taken()));
+ if (LOG.isInfoEnabled()) {
+ LOG.info("Apache Camel " + getVersion() + " (CamelContext: " + getName() + ") uptime {}", getUptime());
+ LOG.info("Apache Camel {} (CamelContext: {}) is shutdown in {}", getVersion(), getName(), TimeUtils.printDuration(stopWatch.taken()));
}
// and clear start date
@@ -2826,7 +2831,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
ServiceHelper.stopAndShutdownServices((Collection<?>)service);
}
} catch (Throwable e) {
- log.warn("Error occurred while shutting down service: " + service + ". This exception will be ignored.", e);
+ LOG.warn("Error occurred while shutting down service: " + service + ". This exception will be ignored.", e);
// fire event
EventHelper.notifyServiceStopFailure(this, service, e);
}
@@ -2950,13 +2955,13 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
}
protected void logRouteState(Route route, String state) {
- if (log.isInfoEnabled()) {
+ if (LOG.isInfoEnabled()) {
if (route.getConsumer() != null) {
// use basic endpoint uri to not log verbose details or potential sensitive data
String uri = route.getEndpoint().getEndpointBaseUri();
- log.info("Route: {} is {}, was consuming from: {}", route.getId(), state, uri);
+ LOG.info("Route: {} is {}, was consuming from: {}", route.getId(), state, uri);
} else {
- log.info("Route: {} is {}.", route.getId(), state);
+ LOG.info("Route: {} is {}.", route.getId(), state);
}
}
}
@@ -3117,7 +3122,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
// consume messages to be routed
BaseRouteService routeService = entry.getValue().getRouteService();
try {
- log.debug("Warming up route id: {} having autoStartup={}", routeService.getId(), autoStartup);
+ LOG.debug("Warming up route id: {} having autoStartup={}", routeService.getId(), autoStartup);
setupRoute.set(routeService.getRoute());
routeService.warmUp();
} finally {
@@ -3146,7 +3151,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
// to not be auto started
boolean autoStartup = routeService.isAutoStartup();
if (addingRoute && !autoStartup) {
- log.info("Skipping starting of route {} as its configured with autoStartup=false", routeService.getId());
+ LOG.info("Skipping starting of route {} as its configured with autoStartup=false", routeService.getId());
continue;
}
@@ -3180,11 +3185,11 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
}
// start the consumer on the route
- log.debug("Route: {} >>> {}", route.getId(), route);
+ LOG.debug("Route: {} >>> {}", route.getId(), route);
if (resumeOnly) {
- log.debug("Resuming consumer (order: {}) on route: {}", order, route.getId());
+ LOG.debug("Resuming consumer (order: {}) on route: {}", order, route.getId());
} else {
- log.debug("Starting consumer (order: {}) on route: {}", order, route.getId());
+ LOG.debug("Starting consumer (order: {}) on route: {}", order, route.getId());
}
if (resumeOnly && route.supportsSuspension()) {
@@ -3192,7 +3197,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
ServiceHelper.resumeService(consumer);
// use basic endpoint uri to not log verbose details or potential sensitive data
String uri = endpoint.getEndpointBaseUri();
- log.info("Route: {} resumed and consuming from: {}", route.getId(), uri);
+ LOG.info("Route: {} resumed and consuming from: {}", route.getId(), uri);
} else {
// when starting we should invoke the lifecycle strategies
for (LifecycleStrategy strategy : lifecycleStrategies) {
@@ -3208,7 +3213,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
// use basic endpoint uri to not log verbose details or potential sensitive data
String uri = endpoint.getEndpointBaseUri();
- log.info("Route: {} started and consuming from: {}", route.getId(), uri);
+ LOG.info("Route: {} started and consuming from: {}", route.getId(), uri);
}
routeInputs.add(endpoint);
@@ -3551,7 +3556,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
@Override
public void setupManagement(Map<String, Object> options) {
- log.trace("Setting up management");
+ LOG.trace("Setting up management");
ManagementStrategyFactory factory = null;
if (!isJMXDisabled()) {
@@ -3564,13 +3569,13 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
}
}
} catch (Exception e) {
- log.warn("Cannot create JmxManagementStrategyFactory. Will fallback and disable JMX.", e);
+ LOG.warn("Cannot create JmxManagementStrategyFactory. Will fallback and disable JMX.", e);
}
}
if (factory == null) {
factory = new DefaultManagementStrategyFactory();
}
- log.debug("Setting up management with factory: {}", factory);
+ LOG.debug("Setting up management with factory: {}", factory);
// preserve any existing event notifiers that may have been already added
List<EventNotifier> notifiers = null;
@@ -3586,7 +3591,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
LifecycleStrategy lifecycle = factory.createLifecycle(this);
factory.setupManagement(this, strategy, lifecycle);
} catch (Exception e) {
- log.warn("Error setting up management due " + e.getMessage());
+ LOG.warn("Error setting up management due " + e.getMessage());
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/BaseRouteService.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/BaseRouteService.java
index 51b99b4..a6017c5 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/BaseRouteService.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/BaseRouteService.java
@@ -151,7 +151,6 @@ public abstract class BaseRouteService extends ChildServiceSupport {
// warm up the route first
route.warmUp();
- log.debug("Starting services on route: {}", route.getId());
List<Service> services = route.getServices();
// callback that we are staring these services
@@ -235,8 +234,6 @@ public abstract class BaseRouteService extends ChildServiceSupport {
}
try (MDCHelper mdcHelper = new MDCHelper(route.getId())) {
- log.debug("Stopping services on route: {}", route.getId());
-
// gather list of services to stop as we need to start child services as well
Set<Service> services = gatherChildServices();
@@ -266,8 +263,6 @@ public abstract class BaseRouteService extends ChildServiceSupport {
@Override
protected void doShutdown() {
try (MDCHelper mdcHelper = new MDCHelper(route.getId())) {
- log.debug("Shutting down services on route: {}", route.getId());
-
// gather list of services to stop as we need to start child services as well
Set<Service> services = gatherChildServices();
@@ -333,7 +328,6 @@ public abstract class BaseRouteService extends ChildServiceSupport {
protected void startChildService(Route route, List<Service> services) {
for (Service service : services) {
- log.debug("Starting child service on route: {} -> {}", route.getId(), service);
for (LifecycleStrategy strategy : camelContext.getLifecycleStrategies()) {
strategy.onServiceAdd(camelContext, service, route);
}
@@ -344,7 +338,6 @@ public abstract class BaseRouteService extends ChildServiceSupport {
protected void stopChildService(Route route, Set<Service> services, boolean shutdown) {
for (Service service : services) {
- log.debug("{} child service on route: {} -> {}", shutdown ? "Shutting down" : "Stopping", route.getId(), service);
if (service instanceof ErrorHandler) {
// special for error handlers
for (LifecycleStrategy strategy : camelContext.getLifecycleStrategies()) {
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java
index cdcaad3..665d779 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java
@@ -36,9 +36,13 @@ import org.apache.camel.spi.UnitOfWork;
import org.apache.camel.support.MessageHelper;
import org.apache.camel.support.processor.DefaultExchangeFormatter;
import org.apache.camel.support.service.ServiceSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DefaultAsyncProcessorAwaitManager extends ServiceSupport implements AsyncProcessorAwaitManager, StaticService {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultAsyncProcessorAwaitManager.class);
+
private final AsyncProcessorAwaitManager.Statistics statistics = new UtilizationStatistics();
private final AtomicLong blockedCounter = new AtomicLong();
private final AtomicLong interruptedCounter = new AtomicLong();
@@ -88,7 +92,7 @@ public class DefaultAsyncProcessorAwaitManager extends ServiceSupport implements
return;
}
} while (exchange.getContext().getReactiveExecutor().executeFromQueue());
- log.trace("Waiting for asynchronous callback before continuing for exchangeId: {} -> {}",
+ LOG.trace("Waiting for asynchronous callback before continuing for exchangeId: {} -> {}",
exchange.getExchangeId(), exchange);
try {
if (statistics.isStatisticsEnabled()) {
@@ -96,11 +100,11 @@ public class DefaultAsyncProcessorAwaitManager extends ServiceSupport implements
}
inflight.put(exchange, new AwaitThreadEntry(Thread.currentThread(), exchange, latch));
latch.await();
- log.trace("Asynchronous callback received, will continue routing exchangeId: {} -> {}",
+ LOG.trace("Asynchronous callback received, will continue routing exchangeId: {} -> {}",
exchange.getExchangeId(), exchange);
} catch (InterruptedException e) {
- log.trace("Interrupted while waiting for callback, will continue routing exchangeId: {} -> {}",
+ LOG.trace("Interrupted while waiting for callback, will continue routing exchangeId: {} -> {}",
exchange.getExchangeId(), exchange);
exchange.setException(e);
} finally {
@@ -126,7 +130,7 @@ public class DefaultAsyncProcessorAwaitManager extends ServiceSupport implements
}
public void countDown(Exchange exchange, CountDownLatch latch) {
- log.trace("Asynchronous callback received for exchangeId: {}", exchange.getExchangeId());
+ LOG.trace("Asynchronous callback received for exchangeId: {}", exchange.getExchangeId());
latch.countDown();
}
@@ -174,7 +178,7 @@ public class DefaultAsyncProcessorAwaitManager extends ServiceSupport implements
if (routeStackTrace != null) {
sb.append(routeStackTrace);
}
- log.warn(sb.toString());
+ LOG.warn(sb.toString());
} catch (Exception e) {
throw RuntimeCamelException.wrapRuntimeCamelException(e);
@@ -214,7 +218,7 @@ public class DefaultAsyncProcessorAwaitManager extends ServiceSupport implements
Collection<AwaitThread> threads = browse();
int count = threads.size();
if (count > 0) {
- log.warn("Shutting down while there are still {} inflight threads currently blocked.", count);
+ LOG.warn("Shutting down while there are still {} inflight threads currently blocked.", count);
StringBuilder sb = new StringBuilder();
for (AwaitThread entry : threads) {
@@ -222,19 +226,19 @@ public class DefaultAsyncProcessorAwaitManager extends ServiceSupport implements
}
if (isInterruptThreadsWhileStopping()) {
- log.warn("The following threads are blocked and will be interrupted so the threads are released:\n{}", sb);
+ LOG.warn("The following threads are blocked and will be interrupted so the threads are released:\n{}", sb);
for (AwaitThread entry : threads) {
try {
interrupt(entry.getExchange());
} catch (Throwable e) {
- log.warn("Error while interrupting thread: " + entry.getBlockedThread().getName() + ". This exception is ignored.", e);
+ LOG.warn("Error while interrupting thread: " + entry.getBlockedThread().getName() + ". This exception is ignored.", e);
}
}
} else {
- log.warn("The following threads are blocked, and may reside in the JVM:\n{}", sb);
+ LOG.warn("The following threads are blocked, and may reside in the JVM:\n{}", sb);
}
} else {
- log.debug("Shutting down with no inflight threads.");
+ LOG.debug("Shutting down with no inflight threads.");
}
inflight.clear();
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerCache.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerCache.java
index a3346e7..e77656f 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerCache.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerCache.java
@@ -24,18 +24,21 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.FailedToCreateConsumerException;
import org.apache.camel.PollingConsumer;
-import org.apache.camel.Producer;
import org.apache.camel.spi.ConsumerCache;
import org.apache.camel.spi.EndpointUtilizationStatistics;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.support.service.ServiceSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Cache containing created {@link org.apache.camel.Consumer}.
*/
public class DefaultConsumerCache extends ServiceSupport implements ConsumerCache {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultConsumerCache.class);
+
private final CamelContext camelContext;
private final PollingConsumerServicePool consumers;
private final Object source;
@@ -109,7 +112,7 @@ public class DefaultConsumerCache extends ServiceSupport implements ConsumerCach
throw new RejectedExecutionException("CamelContext is stopped");
}
- log.debug("<<<< {}", endpoint);
+ LOG.debug("<<<< {}", endpoint);
PollingConsumer consumer = null;
try {
consumer = acquirePollingConsumer(endpoint);
@@ -127,7 +130,7 @@ public class DefaultConsumerCache extends ServiceSupport implements ConsumerCach
throw new RejectedExecutionException("CamelContext is stopped");
}
- log.debug("<<<< {}", endpoint);
+ LOG.debug("<<<< {}", endpoint);
PollingConsumer consumer = null;
try {
consumer = acquirePollingConsumer(endpoint);
@@ -145,7 +148,7 @@ public class DefaultConsumerCache extends ServiceSupport implements ConsumerCach
throw new RejectedExecutionException("CamelContext is stopped");
}
- log.debug("<<<< {}", endpoint);
+ LOG.debug("<<<< {}", endpoint);
PollingConsumer consumer = null;
try {
consumer = acquirePollingConsumer(endpoint);
@@ -189,7 +192,7 @@ public class DefaultConsumerCache extends ServiceSupport implements ConsumerCach
@Override
public int size() {
int size = consumers.size();
- log.trace("size = {}", size);
+ LOG.trace("size = {}", size);
return size;
}
@@ -202,7 +205,7 @@ public class DefaultConsumerCache extends ServiceSupport implements ConsumerCach
consumers.stop();
consumers.start();
} catch (Exception e) {
- log.debug("Error restarting consumer pool", e);
+ LOG.debug("Error restarting consumer pool", e);
}
if (statistics != null) {
statistics.clear();
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
index 430db05..0424399 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
@@ -29,6 +29,9 @@ import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.UnitOfWorkHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.support.service.ServiceSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.RuntimeCamelException.wrapRuntimeCamelException;
@@ -37,6 +40,8 @@ import static org.apache.camel.RuntimeCamelException.wrapRuntimeCamelException;
*/
public class DefaultConsumerTemplate extends ServiceSupport implements ConsumerTemplate {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultConsumerTemplate.class);
+
private final CamelContext camelContext;
private ConsumerCache consumerCache;
private int maximumCacheSize;
@@ -216,13 +221,13 @@ public class DefaultConsumerTemplate extends ServiceSupport implements ConsumerT
if (exchange.getUnitOfWork() == null) {
// handover completions and done them manually to ensure they are being executed
List<Synchronization> synchronizations = exchange.adapt(ExtendedExchange.class).handoverCompletions();
- UnitOfWorkHelper.doneSynchronizations(exchange, synchronizations, log);
+ UnitOfWorkHelper.doneSynchronizations(exchange, synchronizations, LOG);
} else {
// done the unit of work
exchange.getUnitOfWork().done(exchange);
}
} catch (Throwable e) {
- log.warn("Exception occurred during done UnitOfWork for Exchange: " + exchange
+ LOG.warn("Exception occurred during done UnitOfWork for Exchange: " + exchange
+ ". This exception will be ignored.", e);
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java
index 3126dcf..4215e64 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java
@@ -34,12 +34,16 @@ import org.apache.camel.spi.InflightRepository;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.spi.UnitOfWork;
import org.apache.camel.support.service.ServiceSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default {@link org.apache.camel.spi.InflightRepository}.
*/
public class DefaultInflightRepository extends ServiceSupport implements InflightRepository {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultInflightRepository.class);
+
private final ConcurrentMap<String, Exchange> inflight = new ConcurrentHashMap<>();
private final ConcurrentMap<String, AtomicInteger> routeCount = new ConcurrentHashMap<>();
@@ -174,9 +178,9 @@ public class DefaultInflightRepository extends ServiceSupport implements Infligh
protected void doStop() throws Exception {
int count = size();
if (count > 0) {
- log.warn("Shutting down while there are still {} inflight exchanges.", count);
+ LOG.warn("Shutting down while there are still {} inflight exchanges.", count);
} else {
- log.debug("Shutting down with no inflight exchanges.");
+ LOG.debug("Shutting down with no inflight exchanges.");
}
routeCount.clear();
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategy.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategy.java
index 760c9ff..d1daa7a 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategy.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultManagementStrategy.java
@@ -33,6 +33,8 @@ import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A default management strategy that does <b>not</b> manage.
@@ -48,6 +50,8 @@ import org.apache.camel.util.ObjectHelper;
*/
public class DefaultManagementStrategy extends ServiceSupport implements ManagementStrategy, CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultManagementStrategy.class);
+
private final List<EventNotifier> eventNotifiers = new CopyOnWriteArrayList<>();
private EventFactory eventFactory = new DefaultEventFactory();
private ManagementObjectNameStrategy managementObjectNameStrategy;
@@ -178,7 +182,7 @@ public class DefaultManagementStrategy extends ServiceSupport implements Managem
@Override
protected void doStart() throws Exception {
- log.info("JMX is disabled");
+ LOG.info("JMX is disabled");
doStartManagementStrategy();
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java
index edf61e9..7dd8f9a 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultProducerCache.java
@@ -160,7 +160,7 @@ public class DefaultProducerCache extends ServiceSupport implements ProducerCach
AsyncProducer producer = acquireProducer(endpoint);
try {
// now lets dispatch
- log.debug(">>>> {} {}", endpoint, exchange);
+ LOG.debug(">>>> {} {}", endpoint, exchange);
// set property which endpoint we send to
exchange.setProperty(Exchange.TO_ENDPOINT, endpoint.getEndpointUri());
@@ -270,7 +270,7 @@ public class DefaultProducerCache extends ServiceSupport implements ProducerCach
if (producer == null) {
if (isStopped()) {
- log.warn("Ignoring exchange sent after processor is stopped: {}", exchange);
+ LOG.warn("Ignoring exchange sent after processor is stopped: {}", exchange);
callback.done(true);
return true;
} else {
@@ -327,7 +327,7 @@ public class DefaultProducerCache extends ServiceSupport implements ProducerCach
protected boolean asyncDispatchExchange(Endpoint endpoint, AsyncProducer producer,
Processor resultProcessor, Exchange exchange, AsyncCallback callback) {
// now lets dispatch
- log.debug(">>>> {} {}", endpoint, exchange);
+ LOG.debug(">>>> {} {}", endpoint, exchange);
// set property which endpoint we send to
exchange.setProperty(Exchange.TO_ENDPOINT, endpoint.getEndpointUri());
@@ -371,7 +371,7 @@ public class DefaultProducerCache extends ServiceSupport implements ProducerCach
public int size() {
int size = producers.size();
- log.trace("size = {}", size);
+ LOG.trace("size = {}", size);
return size;
}
@@ -386,7 +386,7 @@ public class DefaultProducerCache extends ServiceSupport implements ProducerCach
producers.stop();
producers.start();
} catch (Exception e) {
- log.debug("Error restarting producers", e);
+ LOG.debug("Error restarting producers", e);
}
if (statistics != null) {
statistics.clear();
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRuntimeEndpointRegistry.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRuntimeEndpointRegistry.java
index ef6c077..b796d8d 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRuntimeEndpointRegistry.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRuntimeEndpointRegistry.java
@@ -37,13 +37,18 @@ import org.apache.camel.spi.EndpointUtilizationStatistics;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.spi.RuntimeEndpointRegistry;
import org.apache.camel.spi.UnitOfWork;
+import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.support.EventNotifierSupport;
import org.apache.camel.support.LRUCacheFactory;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport implements CamelContextAware, RuntimeEndpointRegistry {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultRuntimeEndpointRegistry.class);
+
private CamelContext camelContext;
// route id -> endpoint urls
@@ -201,9 +206,9 @@ public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport impleme
outputUtilization = new DefaultEndpointUtilizationStatistics(limit);
}
if (extended) {
- log.info("Runtime endpoint registry is in extended mode gathering usage statistics of all incoming and outgoing endpoints (cache limit: {})", limit);
+ LOG.info("Runtime endpoint registry is in extended mode gathering usage statistics of all incoming and outgoing endpoints (cache limit: {})", limit);
} else {
- log.info("Runtime endpoint registry is in normal mode gathering information of all incoming and outgoing endpoints (cache limit: {})", limit);
+ LOG.info("Runtime endpoint registry is in normal mode gathering information of all incoming and outgoing endpoints (cache limit: {})", limit);
}
ServiceHelper.startService(inputUtilization, outputUtilization);
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
index f7a715a..7f54bce 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
@@ -53,6 +53,8 @@ import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.CollectionStringBuffer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StopWatch;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default {@link org.apache.camel.spi.ShutdownStrategy} which uses graceful shutdown.
@@ -112,6 +114,8 @@ import org.apache.camel.util.StopWatch;
*/
public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownStrategy, CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultShutdownStrategy.class);
+
private CamelContext camelContext;
private ExecutorService executor;
private long timeout = 45;
@@ -187,9 +191,9 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
routesOrdered.sort(comparator);
if (suspendOnly) {
- log.info("Starting to graceful suspend {} routes (timeout {} {})", routesOrdered.size(), timeout, timeUnit.toString().toLowerCase(Locale.ENGLISH));
+ LOG.info("Starting to graceful suspend {} routes (timeout {} {})", routesOrdered.size(), timeout, timeUnit.toString().toLowerCase(Locale.ENGLISH));
} else {
- log.info("Starting to graceful shutdown {} routes (timeout {} {})", routesOrdered.size(), timeout, timeUnit.toString().toLowerCase(Locale.ENGLISH));
+ LOG.info("Starting to graceful shutdown {} routes (timeout {} {})", routesOrdered.size(), timeout, timeUnit.toString().toLowerCase(Locale.ENGLISH));
}
// use another thread to perform the shutdowns so we can support timeout
@@ -216,7 +220,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
// if set, stop processing and return false to indicate that the shutdown is aborting
if (!forceShutdown && abortAfterTimeout) {
- log.warn("Timeout occurred during graceful shutdown. Aborting the shutdown now."
+ LOG.warn("Timeout occurred during graceful shutdown. Aborting the shutdown now."
+ " Notice: some resources may still be running as graceful shutdown did not complete successfully.");
// we attempt to force shutdown so lets log the current inflight exchanges which are affected
@@ -225,7 +229,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
return false;
} else {
if (forceShutdown || shutdownNowOnTimeout) {
- log.warn("Timeout occurred during graceful shutdown. Forcing the routes to be shutdown now."
+ LOG.warn("Timeout occurred during graceful shutdown. Forcing the routes to be shutdown now."
+ " Notice: some resources may still be running as graceful shutdown did not complete successfully.");
// we attempt to force shutdown so lets log the current inflight exchanges which are affected
@@ -241,7 +245,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
}
}
} else {
- log.warn("Timeout occurred during graceful shutdown. Will ignore shutting down the remainder routes."
+ LOG.warn("Timeout occurred during graceful shutdown. Will ignore shutting down the remainder routes."
+ " Notice: some resources may still be running as graceful shutdown did not complete successfully.");
logInflightExchanges(context, routes, isLogInflightExchangesOnTimeout());
@@ -254,7 +258,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
// convert to seconds as its easier to read than a big milli seconds number
long seconds = TimeUnit.SECONDS.convert(watch.taken(), TimeUnit.MILLISECONDS);
- log.info("Graceful shutdown of {} routes completed in {} seconds", routesOrdered.size(), seconds);
+ LOG.info("Graceful shutdown of {} routes completed in {} seconds", routesOrdered.size(), seconds);
return true;
}
@@ -357,7 +361,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
// it has completed its current task
ShutdownRunningTask current = order.getRoute().getRouteContext().getShutdownRunningTask();
if (current != ShutdownRunningTask.CompleteCurrentTaskOnly) {
- log.debug("Changing shutdownRunningTask from {} to " + ShutdownRunningTask.CompleteCurrentTaskOnly
+ LOG.debug("Changing shutdownRunningTask from {} to " + ShutdownRunningTask.CompleteCurrentTaskOnly
+ " on route {} to shutdown faster", current, order.getRoute().getId());
order.getRoute().getRouteContext().setShutdownRunningTask(ShutdownRunningTask.CompleteCurrentTaskOnly);
}
@@ -387,18 +391,18 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
* @param consumer the consumer to shutdown
*/
protected void shutdownNow(String routeId, Consumer consumer) {
- log.trace("Shutting down: {}", consumer);
+ LOG.trace("Shutting down: {}", consumer);
// allow us to do custom work before delegating to service helper
try {
ServiceHelper.stopService(consumer);
} catch (Throwable e) {
- log.warn("Error occurred while shutting down route: " + routeId + ". This exception will be ignored.", e);
+ LOG.warn("Error occurred while shutting down route: " + routeId + ". This exception will be ignored.", e);
// fire event
EventHelper.notifyServiceStopFailure(consumer.getEndpoint().getCamelContext(), consumer, e);
}
- log.trace("Shutdown complete for: {}", consumer);
+ LOG.trace("Shutdown complete for: {}", consumer);
}
/**
@@ -408,18 +412,18 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
* @param consumer the consumer to suspend
*/
protected void suspendNow(String routeId, Consumer consumer) {
- log.trace("Suspending: {}", consumer);
+ LOG.trace("Suspending: {}", consumer);
// allow us to do custom work before delegating to service helper
try {
ServiceHelper.suspendService(consumer);
} catch (Throwable e) {
- log.warn("Error occurred while suspending route: " + routeId + ". This exception will be ignored.", e);
+ LOG.warn("Error occurred while suspending route: " + routeId + ". This exception will be ignored.", e);
// fire event
EventHelper.notifyServiceStopFailure(consumer.getEndpoint().getCamelContext(), consumer, e);
}
- log.trace("Suspend complete for: {}", consumer);
+ LOG.trace("Suspend complete for: {}", consumer);
}
private ExecutorService getExecutorService() {
@@ -474,13 +478,13 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
for (Service child : list) {
if (child instanceof ShutdownPrepared) {
try {
- log.trace("Preparing (forced: {}) shutdown on: {}", forced, child);
+ LOG.trace("Preparing (forced: {}) shutdown on: {}", forced, child);
((ShutdownPrepared) child).prepareShutdown(suspendOnly, forced);
} catch (Exception e) {
if (suppressLogging) {
- log.trace("Error during prepare shutdown on " + child + ". This exception will be ignored.", e);
+ LOG.trace("Error during prepare shutdown on " + child + ". This exception will be ignored.", e);
} else {
- log.warn("Error during prepare shutdown on " + child + ". This exception will be ignored.", e);
+ LOG.warn("Error during prepare shutdown on " + child + ". This exception will be ignored.", e);
}
}
}
@@ -543,7 +547,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
// 2) wait until all inflight and pending exchanges has been completed
// 3) shutdown the deferred routes
- log.debug("There are {} routes to {}", routes.size(), suspendOnly ? "suspend" : "shutdown");
+ LOG.debug("There are {} routes to {}", routes.size(), suspendOnly ? "suspend" : "shutdown");
// list of deferred consumers to shutdown when all exchanges has been completed routed
// and thus there are no more inflight exchanges so they can be safely shutdown at that time
@@ -553,8 +557,8 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
ShutdownRoute shutdownRoute = order.getRoute().getRouteContext().getShutdownRoute();
ShutdownRunningTask shutdownRunningTask = order.getRoute().getRouteContext().getShutdownRunningTask();
- if (log.isTraceEnabled()) {
- log.trace("{}{} with options [{},{}]",
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("{}{} with options [{},{}]",
suspendOnly ? "Suspending route: " : "Shutting down route: ",
order.getRoute().getId(), shutdownRoute, shutdownRunningTask);
}
@@ -589,17 +593,17 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
deferredConsumers.add(new ShutdownDeferredConsumer(order.getRoute(), consumer));
// use basic endpoint uri to not log verbose details or potential sensitive data
String uri = order.getRoute().getEndpoint().getEndpointBaseUri();
- log.debug("Route: {} suspended and shutdown deferred, was consuming from: {}", order.getRoute().getId(), uri);
+ LOG.debug("Route: {} suspended and shutdown deferred, was consuming from: {}", order.getRoute().getId(), uri);
} else if (shutdown) {
shutdownNow(order.getRoute().getId(), consumer);
// use basic endpoint uri to not log verbose details or potential sensitive data
String uri = order.getRoute().getEndpoint().getEndpointBaseUri();
- log.info("Route: {} shutdown complete, was consuming from: {}", order.getRoute().getId(), uri);
+ LOG.info("Route: {} shutdown complete, was consuming from: {}", order.getRoute().getId(), uri);
} else {
// we will stop it later, but for now it must run to be able to help all inflight messages
// be safely completed
deferredConsumers.add(new ShutdownDeferredConsumer(order.getRoute(), consumer));
- log.debug("Route: " + order.getRoute().getId() + (suspendOnly ? " shutdown deferred." : " suspension deferred."));
+ LOG.debug("Route: " + order.getRoute().getId() + (suspendOnly ? " shutdown deferred." : " suspension deferred."));
}
}
}
@@ -631,7 +635,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
String routeId = order.getRoute().getId();
routeInflight.put(routeId, inflight);
size += inflight;
- log.trace("{} inflight and pending exchanges for route: {}", inflight, routeId);
+ LOG.trace("{} inflight and pending exchanges for route: {}", inflight, routeId);
}
}
if (size > 0) {
@@ -647,7 +651,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
+ (TimeUnit.SECONDS.convert(timeout, timeUnit) - (loopCount++ * loopDelaySeconds)) + " seconds.";
msg += " Inflights per route: [" + csb.toString() + "]";
- log.info(msg);
+ LOG.info(msg);
// log verbose if DEBUG logging is enabled
logInflightExchanges(context, routes, logInflightExchangesOnTimeout);
@@ -655,10 +659,10 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
Thread.sleep(loopDelaySeconds * 1000);
} catch (InterruptedException e) {
if (abortAfterTimeout) {
- log.warn("Interrupted while waiting during graceful shutdown, will abort.");
+ LOG.warn("Interrupted while waiting during graceful shutdown, will abort.");
return;
} else {
- log.warn("Interrupted while waiting during graceful shutdown, will force shutdown now.");
+ LOG.warn("Interrupted while waiting during graceful shutdown, will force shutdown now.");
break;
}
}
@@ -671,11 +675,11 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
for (ShutdownDeferredConsumer deferred : deferredConsumers) {
Consumer consumer = deferred.getConsumer();
if (consumer instanceof ShutdownAware) {
- log.trace("Route: {} preparing to shutdown.", deferred.getRoute().getId());
+ LOG.trace("Route: {} preparing to shutdown.", deferred.getRoute().getId());
boolean forced = context.getShutdownStrategy().forceShutdown(consumer);
boolean suppress = context.getShutdownStrategy().isSuppressLoggingOnTimeout();
prepareShutdown(consumer, suspendOnly, forced, false, suppress);
- log.debug("Route: {} preparing to shutdown complete.", deferred.getRoute().getId());
+ LOG.debug("Route: {} preparing to shutdown complete.", deferred.getRoute().getId());
}
}
@@ -686,12 +690,12 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
suspendNow(deferred.getRoute().getId(), consumer);
// use basic endpoint uri to not log verbose details or potential sensitive data
String uri = deferred.getRoute().getEndpoint().getEndpointBaseUri();
- log.info("Route: {} suspend complete, was consuming from: {}", deferred.getRoute().getId(), uri);
+ LOG.info("Route: {} suspend complete, was consuming from: {}", deferred.getRoute().getId(), uri);
} else {
shutdownNow(deferred.getRoute().getId(), consumer);
// use basic endpoint uri to not log verbose details or potential sensitive data
String uri = deferred.getRoute().getEndpoint().getEndpointBaseUri();
- log.info("Route: {} shutdown complete, was consuming from: {}", deferred.getRoute().getId(), uri);
+ LOG.info("Route: {} shutdown complete, was consuming from: {}", deferred.getRoute().getId(), uri);
}
}
@@ -738,7 +742,7 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
*/
protected void logInflightExchanges(CamelContext camelContext, List<RouteStartupOrder> routes, boolean infoLevel) {
// check if we need to log
- if (!infoLevel && !log.isDebugEnabled()) {
+ if (!infoLevel && !LOG.isDebugEnabled()) {
return;
}
@@ -778,9 +782,9 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
}
if (infoLevel) {
- log.info(sb.toString());
+ LOG.info(sb.toString());
} else {
- log.debug(sb.toString());
+ LOG.debug(sb.toString());
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java
index 8fd7663..44d88bb 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java
@@ -34,12 +34,16 @@ import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.FilePathResolver;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default implementation of {@link StreamCachingStrategy}
*/
public class DefaultStreamCachingStrategy extends ServiceSupport implements CamelContextAware, StreamCachingStrategy {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultStreamCachingStrategy.class);
+
private CamelContext camelContext;
private boolean enabled;
private File spoolDirectory;
@@ -190,7 +194,7 @@ public class DefaultStreamCachingStrategy extends ServiceSupport implements Came
}
boolean answer = anySpoolRules ? any : all;
- log.debug("Should spool cache {} -> {}", length, answer);
+ LOG.debug("Should spool cache {} -> {}", length, answer);
return answer;
}
@@ -204,8 +208,8 @@ public class DefaultStreamCachingStrategy extends ServiceSupport implements Came
Message message = exchange.getMessage();
StreamCache cache = message.getBody(StreamCache.class);
if (cache != null) {
- if (log.isTraceEnabled()) {
- log.trace("Cached stream to {} -> {}", cache.inMemory() ? "memory" : "spool", cache);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Cached stream to {} -> {}", cache.inMemory() ? "memory" : "spool", cache);
}
if (statistics.isStatisticsEnabled()) {
try {
@@ -215,7 +219,7 @@ public class DefaultStreamCachingStrategy extends ServiceSupport implements Came
statistics.updateSpool(cache.length());
}
} catch (Exception e) {
- log.debug("Error updating cache statistics. This exception is ignored.", e);
+ LOG.debug("Error updating cache statistics. This exception is ignored.", e);
}
}
}
@@ -262,7 +266,7 @@ public class DefaultStreamCachingStrategy extends ServiceSupport implements Came
@Override
protected void doStart() throws Exception {
if (!enabled) {
- log.debug("StreamCaching is not enabled");
+ LOG.debug("StreamCaching is not enabled");
return;
}
@@ -289,16 +293,16 @@ public class DefaultStreamCachingStrategy extends ServiceSupport implements Came
if (spoolDirectory.exists()) {
if (spoolDirectory.isDirectory()) {
- log.debug("Using spool directory: {}", spoolDirectory);
+ LOG.debug("Using spool directory: {}", spoolDirectory);
} else {
- log.warn("Spool directory: {} is not a directory. This may cause problems spooling to disk for the stream caching!", spoolDirectory);
+ LOG.warn("Spool directory: {} is not a directory. This may cause problems spooling to disk for the stream caching!", spoolDirectory);
}
} else {
boolean created = spoolDirectory.mkdirs();
if (!created) {
- log.warn("Cannot create spool directory: {}. This may cause problems spooling to disk for the stream caching!", spoolDirectory);
+ LOG.warn("Cannot create spool directory: {}. This may cause problems spooling to disk for the stream caching!", spoolDirectory);
} else {
- log.debug("Created spool directory: {}", spoolDirectory);
+ LOG.debug("Created spool directory: {}", spoolDirectory);
}
}
@@ -315,24 +319,24 @@ public class DefaultStreamCachingStrategy extends ServiceSupport implements Came
}
}
- log.debug("StreamCaching configuration {}", this);
+ LOG.debug("StreamCaching configuration {}", this);
if (spoolDirectory != null) {
- log.info("StreamCaching in use with spool directory: {} and rules: {}", spoolDirectory.getPath(), spoolRules);
+ LOG.info("StreamCaching in use with spool directory: {} and rules: {}", spoolDirectory.getPath(), spoolRules);
} else {
- log.info("StreamCaching in use with rules: {}", spoolRules);
+ LOG.info("StreamCaching in use with rules: {}", spoolRules);
}
}
@Override
protected void doStop() throws Exception {
if (spoolThreshold > 0 & spoolDirectory != null && isRemoveSpoolDirectoryWhenStopping()) {
- log.debug("Removing spool directory: {}", spoolDirectory);
+ LOG.debug("Removing spool directory: {}", spoolDirectory);
FileUtil.removeDir(spoolDirectory);
}
- if (log.isDebugEnabled() && statistics.isStatisticsEnabled()) {
- log.debug("Stopping StreamCachingStrategy with statistics: {}", statistics);
+ if (LOG.isDebugEnabled() && statistics.isStatisticsEnabled()) {
+ LOG.debug("Stopping StreamCachingStrategy with statistics: {}", statistics);
}
statistics.reset();
@@ -354,7 +358,7 @@ public class DefaultStreamCachingStrategy extends ServiceSupport implements Came
@Override
public boolean shouldSpoolCache(long length) {
if (spoolThreshold > 0 && length > spoolThreshold) {
- log.trace("Should spool cache fixed threshold {} > {} -> true", length, spoolThreshold);
+ LOG.trace("Should spool cache fixed threshold {} > {} -> true", length, spoolThreshold);
return true;
}
return false;
@@ -390,15 +394,15 @@ public class DefaultStreamCachingStrategy extends ServiceSupport implements Came
double calc = (used / upper) * 100;
int percentage = (int) calc;
- if (log.isTraceEnabled()) {
+ if (LOG.isTraceEnabled()) {
long u = heapUsage.getHeapMemoryUsage().getUsed();
long c = heapUsage.getHeapMemoryUsage().getCommitted();
long m = heapUsage.getHeapMemoryUsage().getMax();
- log.trace("Heap memory: [used={}M ({}%), committed={}M, max={}M]", u >> 20, percentage, c >> 20, m >> 20);
+ LOG.trace("Heap memory: [used={}M ({}%), committed={}M, max={}M]", u >> 20, percentage, c >> 20, m >> 20);
}
if (percentage > spoolUsedHeapMemoryThreshold) {
- log.trace("Should spool cache heap memory threshold {} > {} -> true", percentage, spoolUsedHeapMemoryThreshold);
+ LOG.trace("Should spool cache heap memory threshold {} > {} -> true", percentage, spoolUsedHeapMemoryThreshold);
return true;
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java
index 3a6386b..ee208cf 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java
@@ -26,6 +26,8 @@ import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
import org.apache.camel.Route;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* {@link org.apache.camel.spi.RoutePolicy} which executes for a duration and then triggers an action.
@@ -34,6 +36,8 @@ import org.apache.camel.util.ObjectHelper;
*/
public class DurationRoutePolicy extends org.apache.camel.support.RoutePolicySupport implements CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(DurationRoutePolicy.class);
+
enum Action {
STOP_CAMEL_CONTEXT, STOP_ROUTE, SUSPEND_ROUTE, SUSPEND_ALL_ROUTES
}
@@ -168,20 +172,20 @@ public class DurationRoutePolicy extends org.apache.camel.support.RoutePolicySup
}
if (action == Action.STOP_CAMEL_CONTEXT) {
- log.info("Stopping CamelContext {}", tail);
+ LOG.info("Stopping CamelContext {}", tail);
camelContext.stop();
} else if (action == Action.STOP_ROUTE) {
- log.info("Stopping route: {}{}", routeId, tail);
+ LOG.info("Stopping route: {}{}", routeId, tail);
camelContext.getRouteController().stopRoute(routeId);
} else if (action == Action.SUSPEND_ROUTE) {
- log.info("Suspending route: {}{}", routeId, tail);
+ LOG.info("Suspending route: {}{}", routeId, tail);
camelContext.getRouteController().suspendRoute(routeId);
} else if (action == Action.SUSPEND_ALL_ROUTES) {
- log.info("Suspending all routes {}", tail);
+ LOG.info("Suspending all routes {}", tail);
camelContext.suspend();
}
} catch (Throwable e) {
- log.warn("Error performing action: {}", action, e);
+ LOG.warn("Error performing action: {}", action, e);
}
};
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java
index ac20f8a..c7e1dc8 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java
@@ -28,11 +28,14 @@ import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedOperation;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.spi.StateRepository;
+import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.Scanner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This {@link FileStateRepository} class is a file-based implementation of a {@link StateRepository}.
@@ -40,6 +43,8 @@ import org.apache.camel.util.Scanner;
@ManagedResource(description = "File based state repository")
public class FileStateRepository extends ServiceSupport implements StateRepository<String, String> {
+ private static final Logger LOG = LoggerFactory.getLogger(FileStateRepository.class);
+
private static final String STORE_DELIMITER = "\n";
private static final String KEY_VALUE_DELIMITER = "=";
private final AtomicBoolean init = new AtomicBoolean();
@@ -142,19 +147,19 @@ public class FileStateRepository extends ServiceSupport implements StateReposito
* @param key the state key
*/
private void appendToStore(String key, String value) {
- if (log.isDebugEnabled()) {
- log.debug("Appending {}={} to state filestore: {}", key, value, fileStore);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Appending {}={} to state filestore: {}", key, value, fileStore);
}
FileOutputStream fos = null;
try {
// create store parent directory if missing
File storeParentDirectory = fileStore.getParentFile();
if (storeParentDirectory != null && !storeParentDirectory.exists()) {
- log.info("Parent directory of file store {} doesn't exist. Creating.", fileStore);
+ LOG.info("Parent directory of file store {} doesn't exist. Creating.", fileStore);
if (fileStore.getParentFile().mkdirs()) {
- log.info("Parent directory of file store {} successfully created.", fileStore);
+ LOG.info("Parent directory of file store {} successfully created.", fileStore);
} else {
- log.warn("Parent directory of file store {} cannot be created.", fileStore);
+ LOG.warn("Parent directory of file store {} cannot be created.", fileStore);
}
}
// create store if missing
@@ -170,7 +175,7 @@ public class FileStateRepository extends ServiceSupport implements StateReposito
} catch (IOException e) {
throw RuntimeCamelException.wrapRuntimeCamelException(e);
} finally {
- IOHelper.close(fos, "Appending to file state repository", log);
+ IOHelper.close(fos, "Appending to file state repository", LOG);
}
}
@@ -179,7 +184,7 @@ public class FileStateRepository extends ServiceSupport implements StateReposito
* to the file store.
*/
protected void trunkStore() {
- log.info("Trunking state filestore: {}", fileStore);
+ LOG.info("Trunking state filestore: {}", fileStore);
FileOutputStream fos = null;
try {
fos = new FileOutputStream(fileStore);
@@ -192,7 +197,7 @@ public class FileStateRepository extends ServiceSupport implements StateReposito
} catch (IOException e) {
throw RuntimeCamelException.wrapRuntimeCamelException(e);
} finally {
- IOHelper.close(fos, "Trunking file state repository", log);
+ IOHelper.close(fos, "Trunking file state repository", LOG);
}
}
@@ -202,7 +207,7 @@ public class FileStateRepository extends ServiceSupport implements StateReposito
protected void loadStore() throws IOException {
// auto create starting directory if needed
if (!fileStore.exists()) {
- log.debug("Creating filestore: {}", fileStore);
+ LOG.debug("Creating filestore: {}", fileStore);
File parent = fileStore.getParentFile();
if (parent != null) {
parent.mkdirs();
@@ -213,7 +218,7 @@ public class FileStateRepository extends ServiceSupport implements StateReposito
}
}
- log.trace("Loading to 1st level cache from state filestore: {}", fileStore);
+ LOG.trace("Loading to 1st level cache from state filestore: {}", fileStore);
cache.clear();
try (Scanner scanner = new Scanner(fileStore, null, STORE_DELIMITER)) {
@@ -228,7 +233,7 @@ public class FileStateRepository extends ServiceSupport implements StateReposito
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
- log.debug("Loaded {} to the 1st level cache from state filestore: {}", cache.size(), fileStore);
+ LOG.debug("Loaded {} to the 1st level cache from state filestore: {}", cache.size(), fileStore);
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/InterceptSendToEndpointProcessor.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/InterceptSendToEndpointProcessor.java
index 9692bc9..aea4983 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/InterceptSendToEndpointProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/InterceptSendToEndpointProcessor.java
@@ -28,6 +28,9 @@ import org.apache.camel.support.AsyncProcessorConverterHelper;
import org.apache.camel.support.AsyncProcessorSupport;
import org.apache.camel.support.DefaultAsyncProducer;
import org.apache.camel.support.service.ServiceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.processor.PipelineHelper.continueProcessing;
@@ -37,6 +40,8 @@ import static org.apache.camel.processor.PipelineHelper.continueProcessing;
*/
public class InterceptSendToEndpointProcessor extends DefaultAsyncProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(InterceptSendToEndpointProcessor.class);
+
private final DefaultInterceptSendToEndpoint endpoint;
private final Endpoint delegate;
private final AsyncProducer producer;
@@ -58,8 +63,8 @@ public class InterceptSendToEndpointProcessor extends DefaultAsyncProducer {
@Override
public boolean process(Exchange exchange, AsyncCallback callback) {
// process the detour so we do the detour routing
- if (log.isDebugEnabled()) {
- log.debug("Sending to endpoint: {} is intercepted and detoured to: {} for exchange: {}", getEndpoint(), endpoint.getBefore(), exchange);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Sending to endpoint: {} is intercepted and detoured to: {} for exchange: {}", getEndpoint(), endpoint.getBefore(), exchange);
}
// add header with the real endpoint uri
exchange.getIn().setHeader(Exchange.INTERCEPTED_ENDPOINT, delegate.getEndpointUri());
@@ -90,7 +95,7 @@ public class InterceptSendToEndpointProcessor extends DefaultAsyncProducer {
private boolean callback(Exchange exchange, AsyncCallback callback, boolean doneSync) {
// Decide whether to continue or not; similar logic to the Pipeline
// check for error if so we should break out
- if (!continueProcessing(exchange, "skip sending to original intended destination: " + getEndpoint(), log)) {
+ if (!continueProcessing(exchange, "skip sending to original intended destination: " + getEndpoint(), LOG)) {
callback.done(doneSync);
return doneSync;
}
@@ -117,8 +122,8 @@ public class InterceptSendToEndpointProcessor extends DefaultAsyncProducer {
});
return doneSync && s;
} else {
- if (log.isDebugEnabled()) {
- log.debug("Stop() means skip sending exchange to original intended destination: {} for exchange: {}", getEndpoint(), exchange);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Stop() means skip sending exchange to original intended destination: {} for exchange: {}", getEndpoint(), exchange);
}
callback.done(doneSync);
return doneSync;
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java b/core/camel-base/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java
index 8fd01d6..b539162 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java
@@ -27,6 +27,8 @@ import org.apache.camel.spi.Transformer;
import org.apache.camel.support.builder.OutputStreamBuilder;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A {@link Transformer} implementation which leverages {@link DataFormat} to perform transformation.
@@ -35,6 +37,8 @@ import org.apache.camel.util.ObjectHelper;
*/
public class DataFormatTransformer extends Transformer {
+ private static final Logger LOG = LoggerFactory.getLogger(DataFormatTransformer.class);
+
private DataFormat dataFormat;
private String transformerString;
@@ -55,12 +59,12 @@ public class DataFormatTransformer extends Transformer {
// Unmarshaling into Java Object
if ((to == null || to.isJavaType()) && (from.equals(getFrom()) || from.getModel().equals(getModel()))) {
- log.debug("Unmarshaling with '{}'", dataFormat);
+ LOG.debug("Unmarshaling with: {}", dataFormat);
Object answer = dataFormat.unmarshal(exchange, message.getBody(InputStream.class));
if (to != null && to.getName() != null) {
Class<?> toClass = context.getClassResolver().resolveClass(to.getName());
if (!toClass.isAssignableFrom(answer.getClass())) {
- log.debug("Converting to '{}'", toClass.getName());
+ LOG.debug("Converting to: {}", toClass.getName());
answer = context.getTypeConverter().mandatoryConvertTo(toClass, answer);
}
}
@@ -72,12 +76,12 @@ public class DataFormatTransformer extends Transformer {
if (from != null && from.getName() != null) {
Class<?> fromClass = context.getClassResolver().resolveClass(from.getName());
if (!fromClass.isAssignableFrom(input.getClass())) {
- log.debug("Converting to '{}'", fromClass.getName());
+ LOG.debug("Converting to: {}", fromClass.getName());
input = context.getTypeConverter().mandatoryConvertTo(fromClass, input);
}
}
OutputStreamBuilder osb = OutputStreamBuilder.withExchange(exchange);
- log.debug("Marshaling with '{}'", dataFormat);
+ LOG.debug("Marshaling with: {}", dataFormat);
dataFormat.marshal(exchange, message.getBody(), osb);
message.setBody(osb.build());
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java b/core/camel-base/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java
index 4d1d80a..dde1770 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java
@@ -25,6 +25,8 @@ import org.apache.camel.spi.Transformer;
import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A {@link Transformer} implementation which leverages {@link Processor} to perform transformation.
@@ -33,6 +35,8 @@ import org.apache.camel.util.ObjectHelper;
*/
public class ProcessorTransformer extends Transformer {
+ private static final Logger LOG = LoggerFactory.getLogger(ProcessorTransformer.class);
+
private Processor processor;
private String transformerString;
@@ -54,13 +58,13 @@ public class ProcessorTransformer extends Transformer {
Object input = message.getBody();
Class<?> fromClass = context.getClassResolver().resolveClass(from.getName());
if (!fromClass.isAssignableFrom(input.getClass())) {
- log.debug("Converting to '{}'", fromClass.getName());
+ LOG.debug("Converting to: {}", fromClass.getName());
input = context.getTypeConverter().mandatoryConvertTo(fromClass, input);
message.setBody(input);
}
}
- log.debug("Sending to transform processor '{}'", processor);
+ LOG.debug("Sending to transform processor: {}", processor);
DefaultExchange transformExchange = new DefaultExchange(exchange);
transformExchange.setIn(message);
transformExchange.setProperties(exchange.getProperties());
@@ -71,7 +75,7 @@ public class ProcessorTransformer extends Transformer {
Object answerBody = answer.getBody();
Class<?> toClass = context.getClassResolver().resolveClass(to.getName());
if (!toClass.isAssignableFrom(answerBody.getClass())) {
- log.debug("Converting to '{}'", toClass.getName());
+ LOG.debug("Converting to: {}", toClass.getName());
answerBody = context.getTypeConverter().mandatoryConvertTo(toClass, answerBody);
answer.setBody(answerBody);
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 8da55df..0820b80 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -52,6 +52,7 @@ import org.apache.camel.spi.Transformer;
import org.apache.camel.spi.UnitOfWork;
import org.apache.camel.spi.UnitOfWorkFactory;
import org.apache.camel.support.CamelContextHelper;
+import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.support.MessageHelper;
import org.apache.camel.support.OrderedComparator;
import org.apache.camel.support.SynchronizationAdapter;
@@ -90,6 +91,8 @@ import org.slf4j.LoggerFactory;
*/
public class CamelInternalProcessor extends DelegateAsyncProcessor {
+ private static final Logger LOG = LoggerFactory.getLogger(CamelInternalProcessor.class);
+
private static final Object[] EMPTY_STATES = new Object[0];
private final List<CamelInternalProcessorAdvice<?>> advices = new ArrayList<>();
@@ -205,11 +208,11 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor {
if (exchange.isTransacted()) {
// must be synchronized for transacted exchanges
- if (log.isTraceEnabled()) {
+ if (LOG.isTraceEnabled()) {
if (exchange.isTransacted()) {
- log.trace("Transacted Exchange must be routed synchronously for exchangeId: {} -> {}", exchange.getExchangeId(), exchange);
+ LOG.trace("Transacted Exchange must be routed synchronously for exchangeId: {} -> {}", exchange.getExchangeId(), exchange);
} else {
- log.trace("Synchronous UnitOfWork Exchange must be routed synchronously for exchangeId: {} -> {}", exchange.getExchangeId(), exchange);
+ LOG.trace("Synchronous UnitOfWork Exchange must be routed synchronously for exchangeId: {} -> {}", exchange.getExchangeId(), exchange);
}
}
// ----------------------------------------------------------
@@ -239,8 +242,8 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor {
// ----------------------------------------------------------
// CAMEL END USER - DEBUG ME HERE +++ START +++
// ----------------------------------------------------------
- if (log.isTraceEnabled()) {
- log.trace("Processing exchange for exchangeId: {} -> {}", exchange.getExchangeId(), exchange);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Processing exchange for exchangeId: {} -> {}", exchange.getExchangeId(), exchange);
}
processor.process(exchange, async);
// ----------------------------------------------------------
@@ -255,8 +258,8 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor {
});
}
- if (log.isTraceEnabled()) {
- log.trace("Exchange processed and is continued routed asynchronously for exchangeId: {} -> {}",
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Exchange processed and is continued routed asynchronously for exchangeId: {} -> {}",
exchange.getExchangeId(), exchange);
}
// must return false
@@ -277,7 +280,7 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor {
if (stop != null) {
boolean doStop = exchange.getContext().getTypeConverter().convertTo(Boolean.class, stop);
if (doStop) {
- log.debug("Exchange is marked to stop routing: {}", exchange);
+ LOG.debug("Exchange is marked to stop routing: {}", exchange);
return false;
}
}
@@ -286,7 +289,7 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor {
boolean forceShutdown = exchange.getContext().getShutdownStrategy().forceShutdown(this);
if (forceShutdown) {
String msg = "Run not allowed as ShutdownStrategy is forcing shutting down, will reject executing exchange: " + exchange;
- log.debug(msg);
+ LOG.debug(msg);
if (exchange.getException() == null) {
exchange.setException(new RejectedExecutionException(msg));
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/CatchProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/CatchProcessor.java
index d8daf3a..b766fb9 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/CatchProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/CatchProcessor.java
@@ -29,12 +29,16 @@ import org.apache.camel.support.EventHelper;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.processor.DelegateAsyncProcessor;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A processor which catches exceptions.
*/
public class CatchProcessor extends DelegateAsyncProcessor implements Traceable, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(CatchProcessor.class);
+
private String id;
private String routeId;
private final List<Class<? extends Throwable>> exceptions;
@@ -85,8 +89,8 @@ public class CatchProcessor extends DelegateAsyncProcessor implements Traceable,
callback.done(true);
return true;
}
- if (log.isTraceEnabled()) {
- log.trace("This CatchProcessor catches the exception: {} caused by: {}", caught.getClass().getName(), e.getMessage());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("This CatchProcessor catches the exception: {} caused by: {}", caught.getClass().getName(), e.getMessage());
}
// store the last to endpoint as the failure endpoint
@@ -100,8 +104,8 @@ public class CatchProcessor extends DelegateAsyncProcessor implements Traceable,
// and we should not be regarded as exhausted as we are in a try .. catch block
exchange.removeProperty(Exchange.REDELIVERY_EXHAUSTED);
- if (log.isDebugEnabled()) {
- log.debug("The exception is handled for the exception: {} caused by: {}",
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("The exception is handled for the exception: {} caused by: {}",
new Object[]{e.getClass().getName(), e.getMessage()});
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/ChoiceProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
index a5e4f14..9222650 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
@@ -31,6 +31,9 @@ import org.apache.camel.spi.RouteIdAware;
import org.apache.camel.support.AsyncProcessorConverterHelper;
import org.apache.camel.support.AsyncProcessorSupport;
import org.apache.camel.support.service.ServiceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.processor.PipelineHelper.continueProcessing;
@@ -41,6 +44,8 @@ import static org.apache.camel.processor.PipelineHelper.continueProcessing;
*/
public class ChoiceProcessor extends AsyncProcessorSupport implements Navigate<Processor>, Traceable, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(ChoiceProcessor.class);
+
private String id;
private String routeId;
private final List<FilterProcessor> filters;
@@ -97,7 +102,7 @@ public class ChoiceProcessor extends AsyncProcessorSupport implements Navigate<P
}
// check for error if so we should break out
- if (!continueProcessing(exchange, "so breaking out of choice", log)) {
+ if (!continueProcessing(exchange, "so breaking out of choice", LOG)) {
break;
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java
index 772e74e..7574593 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java
@@ -31,6 +31,8 @@ import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.LanguageSupport;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* ClaimCheck EIP implementation.
@@ -42,6 +44,8 @@ import org.apache.camel.util.ObjectHelper;
*/
public class ClaimCheckProcessor extends AsyncProcessorSupport implements IdAware, RouteIdAware, CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(ClaimCheckProcessor.class);
+
private CamelContext camelContext;
private String id;
private String routeId;
@@ -130,13 +134,13 @@ public class ClaimCheckProcessor extends AsyncProcessorSupport implements IdAwar
Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange, false);
boolean addedNew = repo.add(claimKey, copy);
if (addedNew) {
- log.debug("Add: {} -> {}", claimKey, copy);
+ LOG.debug("Add: {} -> {}", claimKey, copy);
} else {
- log.debug("Override: {} -> {}", claimKey, copy);
+ LOG.debug("Override: {} -> {}", claimKey, copy);
}
} else if ("Get".equals(operation)) {
Exchange copy = repo.get(claimKey);
- log.debug("Get: {} -> {}", claimKey, exchange);
+ LOG.debug("Get: {} -> {}", claimKey, exchange);
if (copy != null) {
Exchange result = aggregationStrategy.aggregate(exchange, copy);
if (result != null) {
@@ -145,7 +149,7 @@ public class ClaimCheckProcessor extends AsyncProcessorSupport implements IdAwar
}
} else if ("GetAndRemove".equals(operation)) {
Exchange copy = repo.getAndRemove(claimKey);
- log.debug("GetAndRemove: {} -> {}", claimKey, exchange);
+ LOG.debug("GetAndRemove: {} -> {}", claimKey, exchange);
if (copy != null) {
// prepare the exchanges for aggregation
ExchangeHelper.prepareAggregation(exchange, copy);
@@ -157,11 +161,11 @@ public class ClaimCheckProcessor extends AsyncProcessorSupport implements IdAwar
} else if ("Push".equals(operation)) {
// copy exchange, and do not share the unit of work
Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange, false);
- log.debug("Push: {} -> {}", claimKey, copy);
+ LOG.debug("Push: {} -> {}", claimKey, copy);
repo.push(copy);
} else if ("Pop".equals(operation)) {
Exchange copy = repo.pop();
- log.debug("Pop: {} -> {}", claimKey, exchange);
+ LOG.debug("Pop: {} -> {}", claimKey, exchange);
if (copy != null) {
// prepare the exchanges for aggregation
ExchangeHelper.prepareAggregation(exchange, copy);
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java b/core/camel-base/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java
index cd9904a..42c6176 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java
@@ -29,6 +29,8 @@ import org.apache.camel.ShutdownRunningTask;
import org.apache.camel.spi.ShutdownAware;
import org.apache.camel.support.processor.DelegateAsyncProcessor;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A useful base class for any processor which provides some kind of throttling
@@ -38,6 +40,8 @@ import org.apache.camel.util.ObjectHelper;
*/
public abstract class DelayProcessorSupport extends DelegateAsyncProcessor implements ShutdownAware {
+ private static final Logger LOG = LoggerFactory.getLogger(DelayProcessorSupport.class);
+
private final CamelContext camelContext;
private final ScheduledExecutorService executorService;
private final boolean shutdownExecutorService;
@@ -61,7 +65,7 @@ public abstract class DelayProcessorSupport extends DelegateAsyncProcessor imple
// we are running now so decrement the counter
delayedCount.decrementAndGet();
- log.trace("Delayed task woke up and continues routing for exchangeId: {}", exchange.getExchangeId());
+ LOG.trace("Delayed task woke up and continues routing for exchangeId: {}", exchange.getExchangeId());
if (!isRunAllowed()) {
exchange.setException(new RejectedExecutionException("Run is not allowed"));
}
@@ -70,7 +74,7 @@ public abstract class DelayProcessorSupport extends DelegateAsyncProcessor imple
DelayProcessorSupport.this.processor.process(exchange, new AsyncCallback() {
@Override
public void done(boolean doneSync) {
- log.trace("Delayed task done for exchangeId: {}", exchange.getExchangeId());
+ LOG.trace("Delayed task done for exchangeId: {}", exchange.getExchangeId());
// we must done the callback from this async callback as well, to ensure callback is done correctly
// must invoke done on callback with false, as that is what the original caller would
// expect as we returned false in the process method
@@ -110,7 +114,7 @@ public abstract class DelayProcessorSupport extends DelegateAsyncProcessor imple
delayedCount.incrementAndGet();
ProcessCall call = new ProcessCall(exchange, callback);
try {
- log.trace("Scheduling delayed task to run in {} millis for exchangeId: {}",
+ LOG.trace("Scheduling delayed task to run in {} millis for exchangeId: {}",
delay, exchange.getExchangeId());
executorService.schedule(call, delay, TimeUnit.MILLISECONDS);
// tell Camel routing engine we continue routing asynchronous
@@ -122,7 +126,7 @@ public abstract class DelayProcessorSupport extends DelegateAsyncProcessor imple
if (!isRunAllowed()) {
exchange.setException(new RejectedExecutionException());
} else {
- log.debug("Scheduling rejected task, so letting caller run, delaying at first for {} millis for exchangeId: {}", delay, exchange.getExchangeId());
+ LOG.debug("Scheduling rejected task, so letting caller run, delaying at first for {} millis for exchangeId: {}", delay, exchange.getExchangeId());
// let caller run by processing
try {
delay(delay, exchange);
@@ -156,7 +160,7 @@ public abstract class DelayProcessorSupport extends DelegateAsyncProcessor imple
delay = calculateDelay(exchange);
if (delay <= 0) {
// no delay then continue routing
- log.trace("No delay for exchangeId: {}", exchange.getExchangeId());
+ LOG.trace("No delay for exchangeId: {}", exchange.getExchangeId());
return processor.process(exchange, callback);
}
} catch (Throwable e) {
@@ -226,8 +230,8 @@ public abstract class DelayProcessorSupport extends DelegateAsyncProcessor imple
* Called when a sleep is interrupted; allows derived classes to handle this case differently
*/
protected void handleSleepInterruptedException(InterruptedException e, Exchange exchange) throws InterruptedException {
- if (log.isDebugEnabled()) {
- log.debug("Sleep interrupted, are we stopping? {}", isStopping() || isStopped());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Sleep interrupted, are we stopping? {}", isStopping() || isStopped());
}
Thread.currentThread().interrupt();
throw e;
@@ -241,7 +245,7 @@ public abstract class DelayProcessorSupport extends DelegateAsyncProcessor imple
if (delay <= 0) {
return;
}
- log.trace("Sleeping for: {} millis", delay);
+ LOG.trace("Sleeping for: {} millis", delay);
Thread.sleep(delay);
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java b/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java
index 411b36a..a63a747 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java
@@ -40,6 +40,9 @@ import org.apache.camel.support.EventHelper;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.StopWatch;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.support.ExchangeHelper.copyResultsPreservePattern;
@@ -57,6 +60,8 @@ import static org.apache.camel.support.ExchangeHelper.copyResultsPreservePattern
*/
public class Enricher extends AsyncProcessorSupport implements IdAware, RouteIdAware, CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(Enricher.class);
+
private CamelContext camelContext;
private String id;
private String routeId;
@@ -177,8 +182,8 @@ public class Enricher extends AsyncProcessorSupport implements IdAware, RouteIdA
producer = producerCache.acquireProducer(endpoint);
} catch (Throwable e) {
if (isIgnoreInvalidEndpoint()) {
- if (log.isDebugEnabled()) {
- log.debug("Endpoint uri is invalid: " + recipient + ". This exception will be ignored.", e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Endpoint uri is invalid: " + recipient + ". This exception will be ignored.", e);
}
} else {
exchange.setException(e);
@@ -249,13 +254,13 @@ public class Enricher extends AsyncProcessorSupport implements IdAware, RouteIdA
});
if (!sync) {
- log.trace("Processing exchangeId: {} is continued being processed asynchronously", exchange.getExchangeId());
+ LOG.trace("Processing exchangeId: {} is continued being processed asynchronously", exchange.getExchangeId());
// the remainder of the routing slip will be completed async
// so we break out now, then the callback will be invoked which then continue routing from where we left here
return false;
}
- log.trace("Processing exchangeId: {} is continued being processed synchronously", exchange.getExchangeId());
+ LOG.trace("Processing exchangeId: {} is continued being processed synchronously", exchange.getExchangeId());
if (watch != null) {
// emit event that the exchange was sent to the endpoint
@@ -358,7 +363,7 @@ public class Enricher extends AsyncProcessorSupport implements IdAware, RouteIdA
if (producerCache == null) {
producerCache = new DefaultProducerCache(this, camelContext, cacheSize);
- log.debug("Enricher {} using ProducerCache with cacheSize={}", this, producerCache.getCapacity());
+ LOG.debug("Enricher {} using ProducerCache with cacheSize={}", this, producerCache.getCapacity());
}
ServiceHelper.startService(producerCache, aggregationStrategy);
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/EventNotifierProducer.java b/core/camel-base/src/main/java/org/apache/camel/processor/EventNotifierProducer.java
index 2764c85..e6654cf 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/EventNotifierProducer.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/EventNotifierProducer.java
@@ -26,6 +26,8 @@ import org.apache.camel.support.DefaultAsyncProducer;
import org.apache.camel.support.EventHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.StopWatch;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Ensures a {@link Producer} do send {@link org.apache.camel.spi.EventNotifier} notifications when
@@ -33,6 +35,8 @@ import org.apache.camel.util.StopWatch;
*/
public final class EventNotifierProducer extends DefaultAsyncProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(EventNotifierProducer.class);
+
private final AsyncProducer producer;
/**
@@ -63,7 +67,7 @@ public final class EventNotifierProducer extends DefaultAsyncProducer {
}
try {
- log.debug(">>>> {} {}", getEndpoint(), exchange);
+ LOG.debug(">>>> {} {}", getEndpoint(), exchange);
return producer.process(exchange, new AsyncCallback() {
@Override
public void done(boolean doneSync) {
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/FatalFallbackErrorHandler.java b/core/camel-base/src/main/java/org/apache/camel/processor/FatalFallbackErrorHandler.java
index ba8b206..b128fba 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/FatalFallbackErrorHandler.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/FatalFallbackErrorHandler.java
@@ -23,6 +23,8 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.support.processor.DelegateAsyncProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.camel.support.builder.ExpressionBuilder.routeIdExpression;
@@ -36,6 +38,8 @@ import static org.apache.camel.support.builder.ExpressionBuilder.routeIdExpressi
*/
public class FatalFallbackErrorHandler extends DelegateAsyncProcessor implements ErrorHandler {
+ private static final Logger LOG = LoggerFactory.getLogger(FatalFallbackErrorHandler.class);
+
private boolean deadLetterChannel;
public FatalFallbackErrorHandler(Processor processor) {
@@ -60,7 +64,7 @@ public class FatalFallbackErrorHandler extends DelegateAsyncProcessor implements
exchange.setProperty(Exchange.FATAL_FALLBACK_ERROR_HANDLER, fatals);
}
if (fatals.contains(id)) {
- log.warn("Circular error-handler detected at route: {} - breaking out processing Exchange: {}", id, exchange);
+ LOG.warn("Circular error-handler detected at route: {} - breaking out processing Exchange: {}", id, exchange);
// mark this exchange as already been error handler handled (just by having this property)
// the false value mean the caught exception will be kept on the exchange, causing the
// exception to be propagated back to the caller, and to break out routing
@@ -158,15 +162,15 @@ public class FatalFallbackErrorHandler extends DelegateAsyncProcessor implements
// when using dead letter channel we only want to log at WARN level
if (deadLetterChannel) {
if (t != null) {
- log.warn(message, t);
+ LOG.warn(message, t);
} else {
- log.warn(message);
+ LOG.warn(message);
}
} else {
if (t != null) {
- log.error(message, t);
+ LOG.error(message, t);
} else {
- log.error(message);
+ LOG.error(message);
}
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/FilterProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/FilterProcessor.java
index c5d50fe..637cc65 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/FilterProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/FilterProcessor.java
@@ -25,6 +25,8 @@ import org.apache.camel.spi.IdAware;
import org.apache.camel.spi.RouteIdAware;
import org.apache.camel.support.processor.DelegateAsyncProcessor;
import org.apache.camel.support.service.ServiceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The processor which implements the
@@ -32,6 +34,8 @@ import org.apache.camel.support.service.ServiceHelper;
*/
public class FilterProcessor extends DelegateAsyncProcessor implements Traceable, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(FilterProcessor.class);
+
private String id;
private String routeId;
private final Predicate predicate;
@@ -63,7 +67,7 @@ public class FilterProcessor extends DelegateAsyncProcessor implements Traceable
public boolean matches(Exchange exchange) {
boolean matches = predicate.matches(exchange);
- log.debug("Filter matches: {} for exchange: {}", matches, exchange);
+ LOG.debug("Filter matches: {} for exchange: {}", matches, exchange);
// set property whether the filter matches or not
exchange.setProperty(Exchange.FILTER_MATCHED, matches);
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/FinallyProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/FinallyProcessor.java
index 4231151..7a65995 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/FinallyProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/FinallyProcessor.java
@@ -24,12 +24,16 @@ import org.apache.camel.spi.IdAware;
import org.apache.camel.spi.RouteIdAware;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.processor.DelegateAsyncProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Processor to handle do finally supporting asynchronous routing engine
*/
public class FinallyProcessor extends DelegateAsyncProcessor implements Traceable, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(FinallyProcessor.class);
+
private String id;
private String routeId;
@@ -111,7 +115,7 @@ public class FinallyProcessor extends DelegateAsyncProcessor implements Traceabl
if (!doneSync) {
// signal callback to continue routing async
ExchangeHelper.prepareOutToIn(exchange);
- log.trace("Processing complete for exchangeId: {} >>> {}", exchange.getExchangeId(), exchange);
+ LOG.trace("Processing complete for exchangeId: {} >>> {}", exchange.getExchangeId(), exchange);
}
} finally {
// callback must always be called
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/LogProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/LogProcessor.java
index b443472..db3c548 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/LogProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/LogProcessor.java
@@ -28,12 +28,16 @@ import org.apache.camel.spi.LogListener;
import org.apache.camel.spi.MaskingFormatter;
import org.apache.camel.spi.RouteIdAware;
import org.apache.camel.support.AsyncProcessorSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A processor which evaluates an {@link Expression} and logs it.
*/
public class LogProcessor extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(LogProcessor.class);
+
private String id;
private String routeId;
private final Expression expression;
@@ -80,9 +84,9 @@ public class LogProcessor extends AsyncProcessorSupport implements Traceable, Id
String output = listener.onLog(exchange, logger, message);
message = output != null ? output : message;
} catch (Throwable t) {
- log.warn("Ignoring an exception thrown by {}: {}", listener.getClass().getName(), t.getMessage());
- if (log.isDebugEnabled()) {
- log.debug("", t);
+ LOG.warn("Ignoring an exception thrown by {}: {}", listener.getClass().getName(), t.getMessage());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("", t);
}
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/LoopProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/LoopProcessor.java
index 3989f52..aae38ee 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/LoopProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/LoopProcessor.java
@@ -27,6 +27,9 @@ import org.apache.camel.spi.IdAware;
import org.apache.camel.spi.RouteIdAware;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.processor.DelegateAsyncProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.processor.PipelineHelper.continueProcessing;
@@ -35,6 +38,8 @@ import static org.apache.camel.processor.PipelineHelper.continueProcessing;
*/
public class LoopProcessor extends DelegateAsyncProcessor implements Traceable, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(LoopProcessor.class);
+
private String id;
private String routeId;
private final Expression expression;
@@ -96,7 +101,7 @@ public class LoopProcessor extends DelegateAsyncProcessor implements Traceable,
public void run() {
try {
// check for error if so we should break out
- boolean cont = continueProcessing(current, "so breaking out of loop", log);
+ boolean cont = continueProcessing(current, "so breaking out of loop", LOG);
boolean doWhile = predicate == null || predicate.matches(current);
boolean doLoop = expression == null || index < count;
@@ -106,7 +111,7 @@ public class LoopProcessor extends DelegateAsyncProcessor implements Traceable,
current = prepareExchange(exchange, index);
// set current index as property
- log.debug("LoopProcessor: iteration #{}", index);
+ LOG.debug("LoopProcessor: iteration #{}", index);
current.setProperty(Exchange.LOOP_INDEX, index);
processor.process(current, doneSync -> {
@@ -117,11 +122,11 @@ public class LoopProcessor extends DelegateAsyncProcessor implements Traceable,
} else {
// we are done so prepare the result
ExchangeHelper.copyResults(exchange, current);
- log.trace("Processing complete for exchangeId: {} >>> {}", exchange.getExchangeId(), exchange);
+ LOG.trace("Processing complete for exchangeId: {} >>> {}", exchange.getExchangeId(), exchange);
callback.done(false);
}
} catch (Exception e) {
- log.trace("Processing failed for exchangeId: {} >>> {}", exchange.getExchangeId(), e.getMessage());
+ LOG.trace("Processing failed for exchangeId: {} >>> {}", exchange.getExchangeId(), e.getMessage());
exchange.setException(e);
callback.done(false);
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java
index 6a918ed..2f4b637 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java
@@ -63,6 +63,9 @@ import org.apache.camel.util.IOHelper;
import org.apache.camel.util.KeyValueHolder;
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.concurrent.AsyncCompletionService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.util.ObjectHelper.notNull;
@@ -74,6 +77,8 @@ import static org.apache.camel.util.ObjectHelper.notNull;
*/
public class MulticastProcessor extends AsyncProcessorSupport implements Navigate<Processor>, Traceable, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(MulticastProcessor.class);
+
/**
* Class that represent each step in the multicast route to do
*/
@@ -343,7 +348,7 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat
// Decide whether to continue with the multicast or not; similar logic to the Pipeline
// remember to test for stop on exception and aggregate before copying back results
- boolean continueProcessing = PipelineHelper.continueProcessing(exchange, "Multicast processing failed for number " + index, log);
+ boolean continueProcessing = PipelineHelper.continueProcessing(exchange, "Multicast processing failed for number " + index, LOG);
if (stopOnException && !continueProcessing) {
if (exchange.getException() != null) {
// wrap in exception to explain where it failed
@@ -503,7 +508,7 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat
// we are done so close the pairs iterator
if (pairs instanceof Closeable) {
- IOHelper.close((Closeable) pairs, "pairs", log);
+ IOHelper.close((Closeable) pairs, "pairs", LOG);
}
AggregationStrategy strategy = getAggregationStrategy(subExchange);
@@ -715,11 +720,11 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat
// lookup cached first to reuse and preserve memory
answer = errorHandlers.get(key);
if (answer != null) {
- log.trace("Using existing error handler for: {}", processor);
+ LOG.trace("Using existing error handler for: {}", processor);
return answer;
}
- log.trace("Creating error handler for: {}", processor);
+ LOG.trace("Creating error handler for: {}", processor);
ErrorHandlerFactory builder = routeContext.getErrorHandlerFactory();
// create error handler (create error handler directly to keep it light weight,
// instead of using ProcessorDefinition.wrapInErrorHandler)
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
index 64a5ead..6cdd4f6 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
@@ -35,6 +35,9 @@ import org.apache.camel.support.AsyncProcessorSupport;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.SynchronizationAdapter;
import org.apache.camel.support.service.ServiceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.util.ObjectHelper.notNull;
@@ -43,6 +46,8 @@ import static org.apache.camel.util.ObjectHelper.notNull;
*/
public class OnCompletionProcessor extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(OnCompletionProcessor.class);
+
private final CamelContext camelContext;
private String id;
private String routeId;
@@ -210,7 +215,7 @@ public class OnCompletionProcessor extends AsyncProcessorSupport implements Trac
}
if (useOriginalBody) {
- log.trace("Using the original IN message instead of current");
+ LOG.trace("Using the original IN message instead of current");
Message original = ExchangeHelper.getOriginalInMessage(exchange);
answer.setIn(original);
@@ -247,14 +252,14 @@ public class OnCompletionProcessor extends AsyncProcessorSupport implements Trac
if (executorService != null) {
executorService.submit(new Callable<Exchange>() {
public Exchange call() throws Exception {
- log.debug("Processing onComplete: {}", copy);
+ LOG.debug("Processing onComplete: {}", copy);
doProcess(processor, copy);
return copy;
}
});
} else {
// run without thread-pool
- log.debug("Processing onComplete: {}", copy);
+ LOG.debug("Processing onComplete: {}", copy);
doProcess(processor, copy);
}
}
@@ -281,7 +286,7 @@ public class OnCompletionProcessor extends AsyncProcessorSupport implements Trac
if (executorService != null) {
executorService.submit(new Callable<Exchange>() {
public Exchange call() throws Exception {
- log.debug("Processing onFailure: {}", copy);
+ LOG.debug("Processing onFailure: {}", copy);
doProcess(processor, copy);
// restore exception after processing
copy.setException(original);
@@ -290,7 +295,7 @@ public class OnCompletionProcessor extends AsyncProcessorSupport implements Trac
});
} else {
// run without thread-pool
- log.debug("Processing onFailure: {}", copy);
+ LOG.debug("Processing onFailure: {}", copy);
doProcess(processor, copy);
// restore exception after processing
copy.setException(original);
@@ -338,14 +343,14 @@ public class OnCompletionProcessor extends AsyncProcessorSupport implements Trac
if (executorService != null) {
executorService.submit(new Callable<Exchange>() {
public Exchange call() throws Exception {
- log.debug("Processing onAfterRoute: {}", copy);
+ LOG.debug("Processing onAfterRoute: {}", copy);
doProcess(processor, copy);
return copy;
}
});
} else {
// run without thread-pool
- log.debug("Processing onAfterRoute: {}", copy);
+ LOG.debug("Processing onAfterRoute: {}", copy);
doProcess(processor, copy);
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java b/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java
index 2f50e1b..a282ce6 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java
@@ -35,6 +35,9 @@ import org.apache.camel.support.AsyncProcessorConverterHelper;
import org.apache.camel.support.AsyncProcessorSupport;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.service.ServiceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.processor.PipelineHelper.continueProcessing;
@@ -44,6 +47,8 @@ import static org.apache.camel.processor.PipelineHelper.continueProcessing;
*/
public class Pipeline extends AsyncProcessorSupport implements Navigate<Processor>, Traceable, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(Pipeline.class);
+
private final CamelContext camelContext;
private List<AsyncProcessor> processors;
private String id;
@@ -92,7 +97,7 @@ public class Pipeline extends AsyncProcessorSupport implements Navigate<Processo
protected void doProcess(Exchange exchange, AsyncCallback callback, Iterator<AsyncProcessor> processors, boolean first) {
if (continueRouting(processors, exchange)
- && (first || continueProcessing(exchange, "so breaking out of pipeline", log))) {
+ && (first || continueProcessing(exchange, "so breaking out of pipeline", LOG))) {
// prepare for next run
ExchangeHelper.prepareOutToIn(exchange);
@@ -108,8 +113,8 @@ public class Pipeline extends AsyncProcessorSupport implements Navigate<Processo
// logging nextExchange as it contains the exchange that might have altered the payload and since
// we are logging the completion if will be confusing if we log the original instead
// we could also consider logging the original and the nextExchange then we have *before* and *after* snapshots
- if (log.isTraceEnabled()) {
- log.trace("Processing complete for exchangeId: {} >>> {}", exchange.getExchangeId(), exchange);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Processing complete for exchangeId: {} >>> {}", exchange.getExchangeId(), exchange);
}
camelContext.getReactiveExecutor().schedule(callback);
@@ -121,16 +126,16 @@ public class Pipeline extends AsyncProcessorSupport implements Navigate<Processo
if (stop != null) {
boolean doStop = exchange.getContext().getTypeConverter().convertTo(Boolean.class, stop);
if (doStop) {
- if (log.isDebugEnabled()) {
- log.debug("ExchangeId: {} is marked to stop routing: {}", exchange.getExchangeId(), exchange);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("ExchangeId: {} is marked to stop routing: {}", exchange.getExchangeId(), exchange);
}
return false;
}
}
// continue if there are more processors to route
boolean answer = it.hasNext();
- if (log.isTraceEnabled()) {
- log.trace("ExchangeId: {} should continue routing: {}", exchange.getExchangeId(), answer);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("ExchangeId: {} should continue routing: {}", exchange.getExchangeId(), answer);
}
return answer;
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java b/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java
index 828e3ef..1eeb601 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java
@@ -39,6 +39,9 @@ import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.support.EventDrivenPollingConsumer;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.service.ServiceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.support.ExchangeHelper.copyResultsPreservePattern;
@@ -56,6 +59,8 @@ import static org.apache.camel.support.ExchangeHelper.copyResultsPreservePattern
*/
public class PollEnricher extends AsyncProcessorSupport implements IdAware, RouteIdAware, CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(PollEnricher.class);
+
private CamelContext camelContext;
private ConsumerCache consumerCache;
private String id;
@@ -211,8 +216,8 @@ public class PollEnricher extends AsyncProcessorSupport implements IdAware, Rout
consumer = consumerCache.acquirePollingConsumer(endpoint);
} catch (Throwable e) {
if (isIgnoreInvalidEndpoint()) {
- if (log.isDebugEnabled()) {
- log.debug("Endpoint uri is invalid: " + recipient + ". This exception will be ignored.", e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Endpoint uri is invalid: " + recipient + ". This exception will be ignored.", e);
}
} else {
exchange.setException(e);
@@ -239,20 +244,20 @@ public class PollEnricher extends AsyncProcessorSupport implements IdAware, Rout
Exchange resourceExchange;
try {
if (timeout < 0) {
- log.debug("Consumer receive: {}", consumer);
+ LOG.debug("Consumer receive: {}", consumer);
resourceExchange = consumer.receive();
} else if (timeout == 0) {
- log.debug("Consumer receiveNoWait: {}", consumer);
+ LOG.debug("Consumer receiveNoWait: {}", consumer);
resourceExchange = consumer.receiveNoWait();
} else {
- log.debug("Consumer receive with timeout: {} ms. {}", timeout, consumer);
+ LOG.debug("Consumer receive with timeout: {} ms. {}", timeout, consumer);
resourceExchange = consumer.receive(timeout);
}
if (resourceExchange == null) {
- log.debug("Consumer received no exchange");
+ LOG.debug("Consumer received no exchange");
} else {
- log.debug("Consumer received: {}", resourceExchange);
+ LOG.debug("Consumer received: {}", resourceExchange);
}
} catch (Exception e) {
exchange.setException(new CamelExchangeException("Error during poll", exchange, e));
@@ -367,7 +372,7 @@ public class PollEnricher extends AsyncProcessorSupport implements IdAware, Rout
if (consumerCache == null) {
// create consumer cache if we use dynamic expressions for computing the endpoints to poll
consumerCache = new DefaultConsumerCache(this, camelContext, cacheSize);
- log.debug("PollEnrich {} using ConsumerCache with cacheSize={}", this, cacheSize);
+ LOG.debug("PollEnrich {} using ConsumerCache with cacheSize={}", this, cacheSize);
}
if (aggregationStrategy instanceof CamelContextAware) {
((CamelContextAware) aggregationStrategy).setCamelContext(camelContext);
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RecipientList.java b/core/camel-base/src/main/java/org/apache/camel/processor/RecipientList.java
index d8dc7ac..a0526d1 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RecipientList.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RecipientList.java
@@ -37,6 +37,9 @@ import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.ObjectHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.util.ObjectHelper.notNull;
@@ -48,6 +51,8 @@ import static org.apache.camel.util.ObjectHelper.notNull;
*/
public class RecipientList extends AsyncProcessorSupport implements IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(RecipientList.class);
+
private static final String IGNORE_DELIMITER_MARKER = "false";
private final CamelContext camelContext;
private String id;
@@ -193,7 +198,7 @@ public class RecipientList extends AsyncProcessorSupport implements IdAware, Rou
protected void doStart() throws Exception {
if (producerCache == null) {
producerCache = new DefaultProducerCache(this, camelContext, cacheSize);
- log.debug("RecipientList {} using ProducerCache with cacheSize={}", this, producerCache.getCapacity());
+ LOG.debug("RecipientList {} using ProducerCache with cacheSize={}", this, producerCache.getCapacity());
}
ServiceHelper.startService(aggregationStrategy, producerCache);
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RecipientListProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
index 7701ea9..820cbd3 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
@@ -192,8 +192,8 @@ public class RecipientListProcessor extends MulticastProcessor {
producer = producerCache.acquireProducer(endpoint);
} catch (Exception e) {
if (isIgnoreInvalidEndpoints()) {
- if (log.isDebugEnabled()) {
- log.debug("Endpoint uri is invalid: " + recipient + ". This exception will be ignored.", e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Endpoint uri is invalid: " + recipient + ". This exception will be ignored.", e);
}
continue;
} else {
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/Resequencer.java b/core/camel-base/src/main/java/org/apache/camel/processor/Resequencer.java
index a9b0e11..ed662d7 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/Resequencer.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/Resequencer.java
@@ -51,6 +51,8 @@ import org.apache.camel.support.ExpressionComparator;
import org.apache.camel.support.LoggingExceptionHandler;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An implementation of the <a href="http://camel.apache.org/resequencer.html">Resequencer</a>
@@ -58,6 +60,8 @@ import org.apache.camel.util.ObjectHelper;
*/
public class Resequencer extends AsyncProcessorSupport implements Navigate<Processor>, IdAware, RouteIdAware, Traceable {
+ private static final Logger LOG = LoggerFactory.getLogger(Resequencer.class);
+
public static final long DEFAULT_BATCH_TIMEOUT = 1000L;
public static final int DEFAULT_BATCH_SIZE = 100;
@@ -145,7 +149,7 @@ public class Resequencer extends AsyncProcessorSupport implements Navigate<Proce
// setting batch size to 0 or negative is like disabling it, so we set it as the max value
// as the code logic is dependent on a batch size having 1..n value
if (batchSize <= 0) {
- log.debug("Disabling batch size, will only be triggered by timeout");
+ LOG.debug("Disabling batch size, will only be triggered by timeout");
this.batchSize = Integer.MAX_VALUE;
} else {
this.batchSize = batchSize;
@@ -345,14 +349,14 @@ public class Resequencer extends AsyncProcessorSupport implements Navigate<Proce
int size = exchange.getProperty(Exchange.BATCH_SIZE, Integer.class);
if (batchSize != size) {
batchSize = size;
- log.trace("Using batch consumer completion, so setting batch size to: {}", batchSize);
+ LOG.trace("Using batch consumer completion, so setting batch size to: {}", batchSize);
}
}
// validate that the exchange can be used
if (!isValid(exchange)) {
if (isIgnoreInvalidExchanges()) {
- log.debug("Invalid Exchange. This Exchange will be ignored: {}", exchange);
+ LOG.debug("Invalid Exchange. This Exchange will be ignored: {}", exchange);
} else {
throw new CamelExchangeException("Exchange is not valid to be used by the BatchProcessor", exchange);
}
@@ -428,7 +432,7 @@ public class Resequencer extends AsyncProcessorSupport implements Navigate<Proce
do {
try {
if (!exchangeEnqueued.get()) {
- log.trace("Waiting for new exchange to arrive or batchTimeout to occur after {} ms.", batchTimeout);
+ LOG.trace("Waiting for new exchange to arrive or batchTimeout to occur after {} ms.", batchTimeout);
exchangeEnqueuedCondition.await(batchTimeout, TimeUnit.MILLISECONDS);
}
@@ -440,9 +444,9 @@ public class Resequencer extends AsyncProcessorSupport implements Navigate<Proce
if (id != null || !exchangeEnqueued.get()) {
if (id != null) {
- log.trace("Collecting exchanges to be aggregated triggered by completion predicate");
+ LOG.trace("Collecting exchanges to be aggregated triggered by completion predicate");
} else {
- log.trace("Collecting exchanges to be aggregated triggered by batch timeout");
+ LOG.trace("Collecting exchanges to be aggregated triggered by batch timeout");
}
drainQueueTo(collection, batchSize, id);
} else {
@@ -453,7 +457,7 @@ public class Resequencer extends AsyncProcessorSupport implements Navigate<Proce
drainQueueTo(collection, batchSize, id);
}
if (drained) {
- log.trace("Collecting exchanges to be aggregated triggered by new exchanges received");
+ LOG.trace("Collecting exchanges to be aggregated triggered by new exchanges received");
}
if (!isOutBatchCompleted()) {
@@ -513,14 +517,14 @@ public class Resequencer extends AsyncProcessorSupport implements Navigate<Proce
}
public void enqueueExchange(Exchange exchange) {
- log.debug("Received exchange to be batched: {}", exchange);
+ LOG.debug("Received exchange to be batched: {}", exchange);
queueLock.lock();
try {
// pre test whether the completion predicate matched
if (completionPredicate != null) {
boolean matches = completionPredicate.matches(exchange);
if (matches) {
- log.trace("Exchange matched completion predicate: {}", exchange);
+ LOG.trace("Exchange matched completion predicate: {}", exchange);
// add this exchange to the list of exchanges which marks the batch as complete
completionPredicateMatched.add(exchange.getExchangeId());
}
@@ -538,7 +542,7 @@ public class Resequencer extends AsyncProcessorSupport implements Navigate<Proce
while (iter.hasNext()) {
Exchange exchange = iter.next();
iter.remove();
- log.debug("Sending aggregated exchange: {}", exchange);
+ LOG.debug("Sending aggregated exchange: {}", exchange);
processExchange(exchange);
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RoutingSlip.java b/core/camel-base/src/main/java/org/apache/camel/processor/RoutingSlip.java
index 8162624..eec3a47 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RoutingSlip.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RoutingSlip.java
@@ -40,6 +40,9 @@ import org.apache.camel.support.MessageHelper;
import org.apache.camel.support.ObjectHelper;
import org.apache.camel.support.builder.ExpressionBuilder;
import org.apache.camel.support.service.ServiceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.processor.PipelineHelper.continueProcessing;
import static org.apache.camel.util.ObjectHelper.notNull;
@@ -55,6 +58,8 @@ import static org.apache.camel.util.ObjectHelper.notNull;
*/
public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(RoutingSlip.class);
+
protected String id;
protected String routeId;
protected ProducerCache producerCache;
@@ -253,20 +258,20 @@ public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdA
current = prepareExchangeForRoutingSlip(current, endpoint);
if (!sync) {
- log.trace("Processing exchangeId: {} is continued being processed asynchronously", exchange.getExchangeId());
+ LOG.trace("Processing exchangeId: {} is continued being processed asynchronously", exchange.getExchangeId());
// the remainder of the routing slip will be completed async
// so we break out now, then the callback will be invoked which then continue routing from where we left here
return false;
}
- log.trace("Processing exchangeId: {} is continued being processed synchronously", exchange.getExchangeId());
+ LOG.trace("Processing exchangeId: {} is continued being processed synchronously", exchange.getExchangeId());
// we ignore some kind of exceptions and allow us to continue
if (isIgnoreInvalidEndpoints()) {
FailedToCreateProducerException e = current.getException(FailedToCreateProducerException.class);
if (e != null) {
- if (log.isDebugEnabled()) {
- log.debug("Endpoint uri is invalid: " + endpoint + ". This exception will be ignored.", e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Endpoint uri is invalid: " + endpoint + ". This exception will be ignored.", e);
}
current.setException(null);
}
@@ -274,7 +279,7 @@ public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdA
// Decide whether to continue with the recipients or not; similar logic to the Pipeline
// check for error if so we should break out
- if (!continueProcessing(current, "so breaking out of the routing slip", log)) {
+ if (!continueProcessing(current, "so breaking out of the routing slip", LOG)) {
break;
}
}
@@ -282,7 +287,7 @@ public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdA
// logging nextExchange as it contains the exchange that might have altered the payload and since
// we are logging the completion if will be confusing if we log the original instead
// we could also consider logging the original and the nextExchange then we have *before* and *after* snapshots
- log.trace("Processing complete for exchangeId: {} >>> {}", exchange.getExchangeId(), current);
+ LOG.trace("Processing complete for exchangeId: {} >>> {}", exchange.getExchangeId(), current);
// copy results back to the original exchange
ExchangeHelper.copyResults(exchange, current);
@@ -300,7 +305,7 @@ public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdA
endpoint = ExchangeHelper.resolveEndpoint(exchange, nextRecipient);
} catch (Exception e) {
if (isIgnoreInvalidEndpoints()) {
- log.info("Endpoint uri is invalid: " + nextRecipient + ". This exception will be ignored.", e);
+ LOG.info("Endpoint uri is invalid: " + nextRecipient + ". This exception will be ignored.", e);
} else {
throw e;
}
@@ -345,7 +350,7 @@ public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdA
final AsyncCallback originalCallback, final RoutingSlipIterator iter) {
// this does the actual processing so log at trace level
- log.trace("Processing exchangeId: {} >>> {}", exchange.getExchangeId(), exchange);
+ LOG.trace("Processing exchangeId: {} >>> {}", exchange.getExchangeId(), exchange);
// routing slip callback which are used when
// - routing slip was routed asynchronously
@@ -388,8 +393,8 @@ public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdA
if (isIgnoreInvalidEndpoints()) {
FailedToCreateProducerException e = current.getException(FailedToCreateProducerException.class);
if (e != null) {
- if (log.isDebugEnabled()) {
- log.debug("Endpoint uri is invalid: " + endpoint + ". This exception will be ignored.", e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Endpoint uri is invalid: " + endpoint + ". This exception will be ignored.", e);
}
current.setException(null);
}
@@ -397,7 +402,7 @@ public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdA
// Decide whether to continue with the recipients or not; similar logic to the Pipeline
// check for error if so we should break out
- if (!continueProcessing(current, "so breaking out of the routing slip", log)) {
+ if (!continueProcessing(current, "so breaking out of the routing slip", LOG)) {
break;
}
@@ -419,7 +424,7 @@ public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdA
current = prepareExchangeForRoutingSlip(current, endpoint1);
if (!sync) {
- log.trace("Processing exchangeId: {} is continued being processed asynchronously", original.getExchangeId());
+ LOG.trace("Processing exchangeId: {} is continued being processed asynchronously", original.getExchangeId());
return;
}
}
@@ -427,7 +432,7 @@ public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdA
// logging nextExchange as it contains the exchange that might have altered the payload and since
// we are logging the completion if will be confusing if we log the original instead
// we could also consider logging the original and the nextExchange then we have *before* and *after* snapshots
- log.trace("Processing complete for exchangeId: {} >>> {}", original.getExchangeId(), current);
+ LOG.trace("Processing complete for exchangeId: {} >>> {}", original.getExchangeId(), current);
// copy results back to the original exchange
ExchangeHelper.copyResults(original, current);
@@ -447,7 +452,7 @@ public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdA
protected void doStart() throws Exception {
if (producerCache == null) {
producerCache = new DefaultProducerCache(this, camelContext, cacheSize);
- log.debug("RoutingSlip {} using ProducerCache with cacheSize={}", this, producerCache.getCapacity());
+ LOG.debug("RoutingSlip {} using ProducerCache with cacheSize={}", this, producerCache.getCapacity());
}
ServiceHelper.startService(producerCache, errorHandler);
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/SamplingThrottler.java b/core/camel-base/src/main/java/org/apache/camel/processor/SamplingThrottler.java
index 7ae1aed..d1e2e27 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/SamplingThrottler.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/SamplingThrottler.java
@@ -25,6 +25,8 @@ import org.apache.camel.Traceable;
import org.apache.camel.spi.IdAware;
import org.apache.camel.spi.RouteIdAware;
import org.apache.camel.support.AsyncProcessorSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A <code>SamplingThrottler</code> is a special kind of throttler. It also
@@ -39,6 +41,8 @@ import org.apache.camel.support.AsyncProcessorSupport;
*/
public class SamplingThrottler extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(SamplingThrottler.class);
+
private String id;
private String routeId;
private long messageFrequency;
@@ -131,13 +135,13 @@ public class SamplingThrottler extends AsyncProcessorSupport implements Traceabl
long now = System.currentTimeMillis();
if (now >= timeOfLastExchange + periodInMillis) {
doSend = true;
- if (log.isTraceEnabled()) {
- log.trace(sampled.sample());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace(sampled.sample());
}
timeOfLastExchange = now;
} else {
- if (log.isTraceEnabled()) {
- log.trace(sampled.drop());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace(sampled.drop());
}
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
index 5585117..849d4b9 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
@@ -37,6 +37,8 @@ import org.apache.camel.support.EndpointHelper;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Processor for forwarding exchanges to a dynamic endpoint destination.
@@ -45,6 +47,8 @@ import org.apache.camel.util.URISupport;
*/
public class SendDynamicProcessor extends AsyncProcessorSupport implements IdAware, RouteIdAware, CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(SendDynamicProcessor.class);
+
protected SendDynamicAware dynamicAware;
protected CamelContext camelContext;
protected final String uri;
@@ -122,8 +126,8 @@ public class SendDynamicProcessor extends AsyncProcessorSupport implements IdAwa
preAwareProcessor = dynamicAware.createPreProcessor(exchange, entry);
postAwareProcessor = dynamicAware.createPostProcessor(exchange, entry);
if (staticUri != null) {
- if (log.isDebugEnabled()) {
- log.debug("Optimising toD via SendDynamicAware component: {} to use static uri: {}", scheme, URISupport.sanitizeUri(staticUri));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Optimising toD via SendDynamicAware component: {} to use static uri: {}", scheme, URISupport.sanitizeUri(staticUri));
}
}
}
@@ -135,8 +139,8 @@ public class SendDynamicProcessor extends AsyncProcessorSupport implements IdAwa
endpoint = resolveEndpoint(exchange, recipient);
}
if (endpoint == null) {
- if (log.isDebugEnabled()) {
- log.debug("Send dynamic evaluated as null so cannot send to any endpoint");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Send dynamic evaluated as null so cannot send to any endpoint");
}
// no endpoint to send to, so ignore
callback.done(true);
@@ -145,8 +149,8 @@ public class SendDynamicProcessor extends AsyncProcessorSupport implements IdAwa
destinationExchangePattern = EndpointHelper.resolveExchangePatternFromUrl(endpoint.getEndpointUri());
} catch (Throwable e) {
if (isIgnoreInvalidEndpoint()) {
- if (log.isDebugEnabled()) {
- log.debug("Endpoint uri is invalid: " + recipient + ". This exception will be ignored.", e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Endpoint uri is invalid: " + recipient + ". This exception will be ignored.", e);
}
} else {
exchange.setException(e);
@@ -174,7 +178,7 @@ public class SendDynamicProcessor extends AsyncProcessorSupport implements IdAwa
c.done(true);
}
- log.debug(">>>> {} {}", endpoint, e);
+ LOG.debug(">>>> {} {}", endpoint, e);
return p.process(target, new AsyncCallback() {
public void done(boolean doneSync) {
// restore previous MEP
@@ -254,7 +258,7 @@ public class SendDynamicProcessor extends AsyncProcessorSupport implements IdAwa
protected void doStart() throws Exception {
if (producerCache == null) {
producerCache = new DefaultProducerCache(this, camelContext, cacheSize);
- log.debug("DynamicSendTo {} using ProducerCache with cacheSize={}", this, producerCache.getCapacity());
+ LOG.debug("DynamicSendTo {} using ProducerCache with cacheSize={}", this, producerCache.getCapacity());
}
if (isAllowOptimisedComponents() && uri != null) {
@@ -268,15 +272,15 @@ public class SendDynamicProcessor extends AsyncProcessorSupport implements IdAwa
SendDynamicAwareResolver resolver = new SendDynamicAwareResolver();
dynamicAware = resolver.resolve(camelContext, scheme);
if (dynamicAware != null) {
- if (log.isDebugEnabled()) {
- log.debug("Detected SendDynamicAware component: {} optimising toD: {}", scheme, URISupport.sanitizeUri(uri));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Detected SendDynamicAware component: {} optimising toD: {}", scheme, URISupport.sanitizeUri(uri));
}
}
}
} catch (Throwable e) {
// ignore
- if (log.isDebugEnabled()) {
- log.debug("Error creating optimised SendDynamicAwareResolver for uri: " + URISupport.sanitizeUri(uri)
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Error creating optimised SendDynamicAwareResolver for uri: " + URISupport.sanitizeUri(uri)
+ " due to " + e.getMessage() + ". This exception is ignored", e);
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java
index 6c20e6c..bb4f609 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java
@@ -32,12 +32,15 @@ import org.apache.camel.spi.IdAware;
import org.apache.camel.spi.ProducerCache;
import org.apache.camel.spi.RouteIdAware;
import org.apache.camel.support.AsyncProcessorSupport;
+import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.support.EndpointHelper;
import org.apache.camel.support.EventHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Processor for forwarding exchanges to a static endpoint destination.
@@ -46,6 +49,8 @@ import org.apache.camel.util.URISupport;
*/
public class SendProcessor extends AsyncProcessorSupport implements Traceable, EndpointAware, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(SendProcessor.class);
+
protected transient String traceLabelToString;
protected final CamelContext camelContext;
protected final ExchangePattern pattern;
@@ -159,7 +164,7 @@ public class SendProcessor extends AsyncProcessorSupport implements Traceable, E
};
}
try {
- log.debug(">>>> {} {}", destination, exchange);
+ LOG.debug(">>>> {} {}", destination, exchange);
return producer.process(exchange, ac);
} catch (Throwable throwable) {
exchange.setException(throwable);
@@ -169,7 +174,7 @@ public class SendProcessor extends AsyncProcessorSupport implements Traceable, E
return true;
} else {
configureExchange(exchange, pattern);
- log.debug(">>>> {} {}", destination, exchange);
+ LOG.debug(">>>> {} {}", destination, exchange);
// send the exchange to the destination using the producer cache for the non optimized producers
return producerCache.doInAsyncProducer(destination, exchange, callback, (producer, ex, cb) -> producer.process(ex, doneSync -> {
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/StepProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/StepProcessor.java
index 2d4c0f9..f1c0148 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/StepProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/StepProcessor.java
@@ -24,9 +24,13 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.support.EventHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class StepProcessor extends Pipeline {
+ private static final Logger LOG = LoggerFactory.getLogger(StepProcessor.class);
+
private final String stepId;
public StepProcessor(CamelContext camelContext, Collection<Processor> processors, String stepId) {
@@ -62,7 +66,7 @@ public class StepProcessor extends Pipeline {
}
} catch (Throwable t) {
// must catch exceptions to ensure synchronizations is also invoked
- log.warn("Exception occurred during event notification. This exception will be ignored.", t);
+ LOG.warn("Exception occurred during event notification. This exception will be ignored.", t);
} finally {
if (oldStepId != null) {
// restore step id
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/StreamResequencer.java b/core/camel-base/src/main/java/org/apache/camel/processor/StreamResequencer.java
index c6e7a03..ffedd20 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/StreamResequencer.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/StreamResequencer.java
@@ -41,6 +41,8 @@ import org.apache.camel.support.AsyncProcessorSupport;
import org.apache.camel.support.LoggingExceptionHandler;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A resequencer that re-orders a (continuous) stream of {@link Exchange}s. The
@@ -59,12 +61,13 @@ import org.apache.camel.util.ObjectHelper;
* Instances of this class poll for {@link Exchange}s from a given
* <code>endpoint</code>. Resequencing work and the delivery of messages to
* the next <code>processor</code> is done within the single polling thread.
- *
*
* @see ResequencerEngine
*/
public class StreamResequencer extends AsyncProcessorSupport implements SequenceSender<Exchange>, Navigate<Processor>, Traceable, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(StreamResequencer.class);
+
private String id;
private String routeId;
private final CamelContext camelContext;
@@ -244,7 +247,7 @@ public class StreamResequencer extends AsyncProcessorSupport implements Sequence
delivery.request();
} catch (Exception e) {
if (isIgnoreInvalidExchanges()) {
- log.debug("Invalid Exchange. This Exchange will be ignored: {}", exchange);
+ LOG.debug("Invalid Exchange. This Exchange will be ignored: {}", exchange);
} else {
exchange.setException(new CamelExchangeException("Error processing Exchange in StreamResequencer", exchange, e));
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/ThreadsProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
index bb16743..7ed4c9a 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
@@ -30,6 +30,8 @@ import org.apache.camel.support.AsyncProcessorSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.concurrent.Rejectable;
import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Threads processor that leverage a thread pool for continue processing the {@link Exchange}s
@@ -56,6 +58,8 @@ import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
*/
public class ThreadsProcessor extends AsyncProcessorSupport implements IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(ThreadsProcessor.class);
+
private String id;
private String routeId;
private final CamelContext camelContext;
@@ -77,7 +81,7 @@ public class ThreadsProcessor extends AsyncProcessorSupport implements IdAware,
@Override
public void run() {
- log.trace("Continue routing exchange {}", exchange);
+ LOG.trace("Continue routing exchange {}", exchange);
if (shutdown.get()) {
exchange.setException(new RejectedExecutionException("ThreadsProcessor is not running."));
}
@@ -88,7 +92,7 @@ public class ThreadsProcessor extends AsyncProcessorSupport implements IdAware,
public void reject() {
// reject should mark the exchange with an rejected exception and mark not to route anymore
exchange.setException(new RejectedExecutionException());
- log.trace("Rejected routing exchange {}", exchange);
+ LOG.trace("Rejected routing exchange {}", exchange);
if (shutdown.get()) {
exchange.setException(new RejectedExecutionException("ThreadsProcessor is not running."));
}
@@ -120,7 +124,7 @@ public class ThreadsProcessor extends AsyncProcessorSupport implements IdAware,
// we cannot execute this asynchronously for transacted exchanges, as the transaction manager doesn't support
// using different threads in the same transaction
if (exchange.isTransacted()) {
- log.trace("Transacted Exchange must be routed synchronously for exchangeId: {} -> {}", exchange.getExchangeId(), exchange);
+ LOG.trace("Transacted Exchange must be routed synchronously for exchangeId: {} -> {}", exchange.getExchangeId(), exchange);
callback.done(true);
return true;
}
@@ -128,7 +132,7 @@ public class ThreadsProcessor extends AsyncProcessorSupport implements IdAware,
try {
// process the call in asynchronous mode
ProcessCall call = new ProcessCall(exchange, callback, false);
- log.trace("Submitting task {}", call);
+ LOG.trace("Submitting task {}", call);
executorService.submit(call);
// tell Camel routing engine we continue routing asynchronous
return false;
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/Throttler.java b/core/camel-base/src/main/java/org/apache/camel/processor/Throttler.java
index 50d7689..ea5a536 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/Throttler.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/Throttler.java
@@ -36,6 +36,8 @@ import org.apache.camel.spi.IdAware;
import org.apache.camel.spi.RouteIdAware;
import org.apache.camel.support.AsyncProcessorSupport;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A <a href="http://camel.apache.org/throttler.html">Throttler</a>
@@ -59,6 +61,8 @@ import org.apache.camel.util.ObjectHelper;
*/
public class Throttler extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(Throttler.class);
+
private static final String DEFAULT_KEY = "CamelThrottlerDefaultKey";
private static final String PROPERTY_EXCHANGE_QUEUED_TIMESTAMP = "CamelThrottlerExchangeQueuedTimestamp";
@@ -102,7 +106,7 @@ public class Throttler extends AsyncProcessorSupport implements Traceable, IdAwa
@Override
public boolean process(final Exchange exchange, final AsyncCallback callback) {
long queuedStart = 0;
- if (log.isTraceEnabled()) {
+ if (LOG.isTraceEnabled()) {
queuedStart = exchange.getProperty(PROPERTY_EXCHANGE_QUEUED_TIMESTAMP, 0L, Long.class);
exchange.removeProperty(PROPERTY_EXCHANGE_QUEUED_TIMESTAMP);
}
@@ -131,41 +135,41 @@ public class Throttler extends AsyncProcessorSupport implements Traceable, IdAwa
} else {
// delegate to async pool
if (isAsyncDelayed() && !exchange.isTransacted() && state == State.SYNC) {
- log.debug("Throttle rate exceeded but AsyncDelayed enabled, so queueing for async processing, exchangeId: {}", exchange.getExchangeId());
+ LOG.debug("Throttle rate exceeded but AsyncDelayed enabled, so queueing for async processing, exchangeId: {}", exchange.getExchangeId());
return processAsynchronously(exchange, callback, throttlingState);
}
// block waiting for a permit
long start = 0;
long elapsed = 0;
- if (log.isTraceEnabled()) {
+ if (LOG.isTraceEnabled()) {
start = System.currentTimeMillis();
}
permit = throttlingState.take();
- if (log.isTraceEnabled()) {
+ if (LOG.isTraceEnabled()) {
elapsed = System.currentTimeMillis() - start;
}
throttlingState.enqueue(permit, exchange);
if (state == State.ASYNC) {
- if (log.isTraceEnabled()) {
+ if (LOG.isTraceEnabled()) {
long queuedTime = start - queuedStart;
- log.trace("Queued for {}ms, Throttled for {}ms, exchangeId: {}", queuedTime, elapsed, exchange.getExchangeId());
+ LOG.trace("Queued for {}ms, Throttled for {}ms, exchangeId: {}", queuedTime, elapsed, exchange.getExchangeId());
}
} else {
- log.trace("Throttled for {}ms, exchangeId: {}", elapsed, exchange.getExchangeId());
+ LOG.trace("Throttled for {}ms, exchangeId: {}", elapsed, exchange.getExchangeId());
}
}
} else {
throttlingState.enqueue(permit, exchange);
if (state == State.ASYNC) {
- if (log.isTraceEnabled()) {
+ if (LOG.isTraceEnabled()) {
long queuedTime = System.currentTimeMillis() - queuedStart;
- log.trace("Queued for {}ms, No throttling applied (throttle cleared while queued), for exchangeId: {}", queuedTime, exchange.getExchangeId());
+ LOG.trace("Queued for {}ms, No throttling applied (throttle cleared while queued), for exchangeId: {}", queuedTime, exchange.getExchangeId());
}
} else {
- log.trace("No throttling applied to exchangeId: {}", exchange.getExchangeId());
+ LOG.trace("No throttling applied to exchangeId: {}", exchange.getExchangeId());
}
}
@@ -177,7 +181,7 @@ public class Throttler extends AsyncProcessorSupport implements Traceable, IdAwa
boolean forceShutdown = exchange.getContext().getShutdownStrategy().forceShutdown(this);
if (forceShutdown) {
String msg = "Run not allowed as ShutdownStrategy is forcing shutting down, will reject executing exchange: " + exchange;
- log.debug(msg);
+ LOG.debug(msg);
exchange.setException(new RejectedExecutionException(msg, e));
} else {
exchange.setException(e);
@@ -198,7 +202,7 @@ public class Throttler extends AsyncProcessorSupport implements Traceable, IdAwa
*/
protected boolean processAsynchronously(final Exchange exchange, final AsyncCallback callback, ThrottlingState throttlingState) {
try {
- if (log.isTraceEnabled()) {
+ if (LOG.isTraceEnabled()) {
exchange.setProperty(PROPERTY_EXCHANGE_QUEUED_TIMESTAMP, System.currentTimeMillis());
}
exchange.setProperty(PROPERTY_EXCHANGE_STATE, State.ASYNC);
@@ -207,7 +211,7 @@ public class Throttler extends AsyncProcessorSupport implements Traceable, IdAwa
return false;
} catch (final RejectedExecutionException e) {
if (isCallerRunsWhenRejected()) {
- log.debug("AsyncExecutor is full, rejected exchange will run in the current thread, exchangeId: {}", exchange.getExchangeId());
+ LOG.debug("AsyncExecutor is full, rejected exchange will run in the current thread, exchangeId: {}", exchange.getExchangeId());
exchange.setProperty(PROPERTY_EXCHANGE_STATE, State.ASYNC_REJECTED);
return process(exchange, callback);
}
@@ -278,11 +282,11 @@ public class Throttler extends AsyncProcessorSupport implements Traceable, IdAwa
prev.cancel(false);
}
// try and incur the least amount of overhead while releasing permits back to the queue
- if (log.isTraceEnabled()) {
- log.trace("Permit released, for exchangeId: {}", exchange.getExchangeId());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Permit released, for exchangeId: {}", exchange.getExchangeId());
}
} catch (RejectedExecutionException e) {
- log.debug("Throttling queue cleaning rejected", e);
+ LOG.debug("Throttling queue cleaning rejected", e);
}
}
@@ -310,9 +314,9 @@ public class Throttler extends AsyncProcessorSupport implements Traceable, IdAwa
while (delta > 0) {
delayQueue.take();
delta--;
- log.trace("Permit discarded due to throttling rate decrease, triggered by ExchangeId: {}", exchange.getExchangeId());
+ LOG.trace("Permit discarded due to throttling rate decrease, triggered by ExchangeId: {}", exchange.getExchangeId());
}
- log.debug("Throttle rate decreased from {} to {}, triggered by ExchangeId: {}", throttleRate, newThrottle, exchange.getExchangeId());
+ LOG.debug("Throttle rate decreased from {} to {}, triggered by ExchangeId: {}", throttleRate, newThrottle, exchange.getExchangeId());
// increase
} else if (newThrottle > throttleRate) {
@@ -321,9 +325,9 @@ public class Throttler extends AsyncProcessorSupport implements Traceable, IdAwa
delayQueue.put(new ThrottlePermit(-1));
}
if (throttleRate == 0) {
- log.debug("Initial throttle rate set to {}, triggered by ExchangeId: {}", newThrottle, exchange.getExchangeId());
+ LOG.debug("Initial throttle rate set to {}, triggered by ExchangeId: {}", newThrottle, exchange.getExchangeId());
} else {
- log.debug("Throttle rate increase from {} to {}, triggered by ExchangeId: {}", throttleRate, newThrottle, exchange.getExchangeId());
+ LOG.debug("Throttle rate increase from {} to {}, triggered by ExchangeId: {}", throttleRate, newThrottle, exchange.getExchangeId());
}
}
throttleRate = newThrottle;
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/TryProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/TryProcessor.java
index 7f3f8fd..b29a275 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/TryProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/TryProcessor.java
@@ -32,12 +32,16 @@ import org.apache.camel.support.AsyncProcessorConverterHelper;
import org.apache.camel.support.AsyncProcessorSupport;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.service.ServiceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Implements try/catch/finally type processing
*/
public class TryProcessor extends AsyncProcessorSupport implements Navigate<Processor>, Traceable, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(TryProcessor.class);
+
protected String id;
protected String routeId;
protected final Processor tryProcessor;
@@ -90,13 +94,13 @@ public class TryProcessor extends AsyncProcessorSupport implements Navigate<Proc
// process the next processor
Processor processor = processors.next();
AsyncProcessor async = AsyncProcessorConverterHelper.convert(processor);
- log.trace("Processing exchangeId: {} >>> {}", exchange.getExchangeId(), exchange);
+ LOG.trace("Processing exchangeId: {} >>> {}", exchange.getExchangeId(), exchange);
async.process(exchange, doneSync -> exchange.getContext().getReactiveExecutor().schedule(this));
} else {
ExchangeHelper.prepareOutToIn(exchange);
exchange.removeProperty(Exchange.TRY_ROUTE_BLOCK);
exchange.setProperty(Exchange.EXCEPTION_HANDLED, lastHandled);
- log.trace("Processing complete for exchangeId: {} >>> {}", exchange.getExchangeId(), exchange);
+ LOG.trace("Processing complete for exchangeId: {} >>> {}", exchange.getExchangeId(), exchange);
callback.done(false);
}
}
@@ -112,7 +116,7 @@ public class TryProcessor extends AsyncProcessorSupport implements Navigate<Proc
if (stop != null) {
boolean doStop = exchange.getContext().getTypeConverter().convertTo(Boolean.class, stop);
if (doStop) {
- log.debug("Exchange is marked to stop routing: {}", exchange);
+ LOG.debug("Exchange is marked to stop routing: {}", exchange);
return false;
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/WireTapProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/WireTapProcessor.java
index 5f79bbd..4e9a47b 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/WireTapProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/WireTapProcessor.java
@@ -44,12 +44,16 @@ import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Processor for wire tapping exchanges to an endpoint destination.
*/
public class WireTapProcessor extends AsyncProcessorSupport implements Traceable, ShutdownAware, IdAware, RouteIdAware, CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(WireTapProcessor.class);
+
private String id;
private String routeId;
private CamelContext camelContext;
@@ -162,10 +166,10 @@ public class WireTapProcessor extends AsyncProcessorSupport implements Traceable
// send the exchange to the destination using an executor service
executorService.submit(() -> {
taskCount.increment();
- log.debug(">>>> (wiretap) {} {}", uri, wireTapExchange);
+ LOG.debug(">>>> (wiretap) {} {}", uri, wireTapExchange);
AsyncProcessorConverterHelper.convert(processor).process(wireTapExchange, doneSync -> {
if (wireTapExchange.getException() != null) {
- log.warn("Error occurred during processing " + wireTapExchange + " wiretap to " + uri + ". This exception will be ignored.", wireTapExchange.getException());
+ LOG.warn("Error occurred during processing " + wireTapExchange + " wiretap to " + uri + ". This exception will be ignored.", wireTapExchange.getException());
}
taskCount.decrement();
});
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
index 0176e97..e898e32 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
@@ -70,6 +70,8 @@ import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.TimeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An implementation of the <a
@@ -88,6 +90,8 @@ import org.apache.camel.util.TimeUtils;
*/
public class AggregateProcessor extends AsyncProcessorSupport implements Navigate<Processor>, Traceable, ShutdownPrepared, ShutdownAware, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(AggregateProcessor.class);
+
public static final String AGGREGATE_TIMEOUT_CHECKER = "AggregateTimeoutChecker";
public static final String AGGREGATE_OPTIMISTIC_LOCKING_EXECUTOR = "AggregateOptimisticLockingExecutor";
@@ -335,7 +339,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
if (ObjectHelper.isEmpty(key)) {
// we have a bad correlation key
if (isIgnoreInvalidCorrelationKeys()) {
- log.debug("Invalid correlation key. This Exchange will be ignored: {}", exchange);
+ LOG.debug("Invalid correlation key. This Exchange will be ignored: {}", exchange);
} else {
exchange.setException(new CamelExchangeException("Invalid correlation key", exchange));
}
@@ -364,7 +368,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
doProcess(exchange, key, callback);
return;
} catch (OptimisticLockingAggregationRepository.OptimisticLockingException e) {
- log.trace("On attempt {} OptimisticLockingAggregationRepository: {} threw OptimisticLockingException while trying to aggregate exchange: {}",
+ LOG.trace("On attempt {} OptimisticLockingAggregationRepository: {} threw OptimisticLockingException while trying to aggregate exchange: {}",
attempt, aggregationRepository, exchange, e);
if (optimisticLockRetryPolicy.shouldRetry(attempt)) {
long delay = optimisticLockRetryPolicy.getDelay(attempt);
@@ -443,7 +447,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
* @throws org.apache.camel.CamelExchangeException is thrown if error aggregating
*/
private List<Exchange> doAggregation(String key, Exchange newExchange) throws CamelExchangeException {
- log.trace("onAggregation +++ start +++ with correlation key: {}", key);
+ LOG.trace("onAggregation +++ start +++ with correlation key: {}", key);
List<Exchange> list = new ArrayList<>();
String complete = null;
@@ -516,7 +520,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
aggregateFailed = true;
if (isDiscardOnAggregationFailure()) {
// discard due failure in aggregation strategy
- log.debug("Aggregation for correlation key {} discarding aggregated exchange: {} due to failure in AggregationStrategy caused by: {}", key, oldExchange, e.getMessage());
+ LOG.debug("Aggregation for correlation key {} discarding aggregated exchange: {} due to failure in AggregationStrategy caused by: {}", key, oldExchange, e.getMessage());
complete = COMPLETED_BY_STRATEGY;
answer = oldExchange;
if (answer == null) {
@@ -544,7 +548,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
if (aggregationRepository instanceof RecoverableAggregationRepository) {
boolean valid = oldExchange == null || answer.getExchangeId().equals(oldExchange.getExchangeId());
if (!valid && aggregateRepositoryWarned.compareAndSet(false, true)) {
- log.warn("AggregationStrategy should return the oldExchange instance instead of the newExchange whenever possible"
+ LOG.warn("AggregationStrategy should return the oldExchange instance instead of the newExchange whenever possible"
+ " as otherwise this can lead to unexpected behavior with some RecoverableAggregationRepository implementations");
}
}
@@ -569,7 +573,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
doAggregationComplete(complete, list, key, originalExchange, answer, aggregateFailed);
}
- log.trace("onAggregation +++ end +++ with correlation key: {}", key);
+ LOG.trace("onAggregation +++ end +++ with correlation key: {}", key);
return list;
}
@@ -606,7 +610,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
}
protected void doAggregationRepositoryAdd(CamelContext camelContext, String key, Exchange oldExchange, Exchange newExchange) {
- log.trace("In progress aggregated oldExchange: {}, newExchange: {} with correlation key: {}", oldExchange, newExchange, key);
+ LOG.trace("In progress aggregated oldExchange: {}, newExchange: {} with correlation key: {}", oldExchange, newExchange, key);
if (optimisticLocking) {
try {
((OptimisticLockingAggregationRepository)aggregationRepository).add(camelContext, key, oldExchange, newExchange);
@@ -696,8 +700,8 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
if (getCompletionTimeoutExpression() != null) {
Long value = getCompletionTimeoutExpression().evaluate(exchange, Long.class);
if (value != null && value > 0) {
- if (log.isTraceEnabled()) {
- log.trace("Updating correlation key {} to timeout after {} ms. as exchange received: {}",
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Updating correlation key {} to timeout after {} ms. as exchange received: {}",
key, value, exchange);
}
addExchangeToTimeoutMap(key, exchange, value);
@@ -706,8 +710,8 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
}
if (!timeoutSet && getCompletionTimeout() > 0) {
// timeout is used so use the timeout map to keep an eye on this
- if (log.isTraceEnabled()) {
- log.trace("Updating correlation key {} to timeout after {} ms. as exchange received: {}",
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Updating correlation key {} to timeout after {} ms. as exchange received: {}",
key, getCompletionTimeout(), exchange);
}
addExchangeToTimeoutMap(key, exchange, getCompletionTimeout());
@@ -734,7 +738,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
if (!fromTimeout && timeoutMap != null) {
// cleanup timeout map if it was a incoming exchange which triggered the timeout (and not the timeout checker)
- log.trace("Removing correlation key {} from timeout", key);
+ LOG.trace("Removing correlation key {} from timeout", key);
timeoutMap.remove(key);
}
@@ -754,7 +758,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
// this exchange is discarded
discarded.incrementAndGet();
// discard due timeout
- log.debug("Aggregation for correlation key {} discarding aggregated exchange: {}", key, aggregated);
+ LOG.debug("Aggregation for correlation key {} discarding aggregated exchange: {}", key, aggregated);
// must confirm the discarded exchange
aggregationRepository.confirm(aggregated.getContext(), aggregated.getExchangeId());
// and remove redelivery state as well
@@ -765,7 +769,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
// this exchange is discarded
discarded.incrementAndGet();
// discard due aggregation failed (or by force)
- log.debug("Aggregation for correlation key {} discarding aggregated exchange: {}", key, aggregated);
+ LOG.debug("Aggregation for correlation key {} discarding aggregated exchange: {}", key, aggregated);
// must confirm the discarded exchange
aggregationRepository.confirm(aggregated.getContext(), aggregated.getExchangeId());
// and remove redelivery state as well
@@ -781,7 +785,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
}
private void onSubmitCompletion(final String key, final Exchange exchange) {
- log.debug("Aggregation complete for correlation key {} sending aggregated exchange: {}", key, exchange);
+ LOG.debug("Aggregation complete for correlation key {} sending aggregated exchange: {}", key, exchange);
// add this as in progress before we submit the task
inProgressCompleteExchanges.add(exchange.getExchangeId());
@@ -816,12 +820,12 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
completedByStrategy.incrementAndGet();
break;
default:
- log.error("Invalid value of {} property: {}", Exchange.AGGREGATED_COMPLETED_BY, exchange);
+ LOG.error("Invalid value of {} property: {}", Exchange.AGGREGATED_COMPLETED_BY, exchange);
break;
}
}
- log.debug("Processing aggregated exchange: {}", exchange);
+ LOG.debug("Processing aggregated exchange: {}", exchange);
// add on completion task so we remember to update the inProgressCompleteExchanges
exchange.adapt(ExtendedExchange.class).addOnCompletion(new AggregateOnCompletion(exchange.getExchangeId()));
@@ -834,7 +838,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
// if there was an exception then let the exception handler handle it
getExceptionHandler().handleException("Error processing aggregated exchange", exchange, exchange.getException());
} else {
- log.trace("Processing aggregated exchange: {} complete.", exchange);
+ LOG.trace("Processing aggregated exchange: {} complete.", exchange);
}
})));
}
@@ -853,20 +857,20 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
}
StopWatch watch = new StopWatch();
- log.trace("Starting restoring CompletionTimeout for {} existing exchanges from the aggregation repository...", keys.size());
+ LOG.trace("Starting restoring CompletionTimeout for {} existing exchanges from the aggregation repository...", keys.size());
for (String key : keys) {
Exchange exchange = aggregationRepository.get(camelContext, key);
// grab the timeout value
long timeout = exchange.hasProperties() ? exchange.getProperty(Exchange.AGGREGATED_TIMEOUT, 0, long.class) : 0;
if (timeout > 0) {
- log.trace("Restoring CompletionTimeout for exchangeId: {} with timeout: {} millis.", exchange.getExchangeId(), timeout);
+ LOG.trace("Restoring CompletionTimeout for exchangeId: {} with timeout: {} millis.", exchange.getExchangeId(), timeout);
addExchangeToTimeoutMap(key, exchange, timeout);
}
}
// log duration of this task so end user can see how long it takes to pre-check this upon starting
- log.info("Restored {} CompletionTimeout conditions in the AggregationTimeoutChecker in {}",
+ LOG.info("Restored {} CompletionTimeout conditions in the AggregationTimeoutChecker in {}",
timeoutMap.size(), TimeUtils.printDuration(watch.taken()));
}
@@ -1144,7 +1148,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
@Override
public void onFailure(Exchange exchange) {
- log.trace("Aggregated exchange onFailure: {}", exchange);
+ LOG.trace("Aggregated exchange onFailure: {}", exchange);
// must remember to remove in progress when we failed
inProgressCompleteExchanges.remove(exchangeId);
@@ -1153,7 +1157,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
@Override
public void onComplete(Exchange exchange) {
- log.trace("Aggregated exchange onComplete: {}", exchange);
+ LOG.trace("Aggregated exchange onComplete: {}", exchange);
// only confirm if we processed without a problem
try {
@@ -1243,11 +1247,11 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
public void run() {
// only run if CamelContext has been fully started
if (!camelContext.getStatus().isStarted()) {
- log.trace("Completion interval task cannot start due CamelContext({}) has not been started yet", camelContext.getName());
+ LOG.trace("Completion interval task cannot start due CamelContext({}) has not been started yet", camelContext.getName());
return;
}
- log.trace("Starting completion interval task");
+ LOG.trace("Starting completion interval task");
// trigger completion for all in the repository
Set<String> keys = aggregationRepository.getKeys();
@@ -1262,7 +1266,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
if (exchange == null) {
stolenInterval = true;
} else {
- log.trace("Completion interval triggered for correlation key: {}", key);
+ LOG.trace("Completion interval triggered for correlation key: {}", key);
// indicate it was completed by interval
exchange.setProperty(Exchange.AGGREGATED_COMPLETED_BY, COMPLETED_BY_INTERVAL);
try {
@@ -1275,7 +1279,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
}
}
if (optimisticLocking && stolenInterval) {
- log.debug("Another Camel instance has already processed this interval aggregation for exchange with correlation id: {}", key);
+ LOG.debug("Another Camel instance has already processed this interval aggregation for exchange with correlation id: {}", key);
}
}
} finally {
@@ -1283,7 +1287,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
}
}
- log.trace("Completion interval task complete");
+ LOG.trace("Completion interval task complete");
}
}
@@ -1301,11 +1305,11 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
public void run() {
// only run if CamelContext has been fully started
if (!camelContext.getStatus().isStarted()) {
- log.trace("Recover check cannot start due CamelContext({}) has not been started yet", camelContext.getName());
+ LOG.trace("Recover check cannot start due CamelContext({}) has not been started yet", camelContext.getName());
return;
}
- log.trace("Starting recover check");
+ LOG.trace("Starting recover check");
// copy the current in progress before doing scan
final Set<String> copyOfInProgress = new LinkedHashSet<>(inProgressCompleteExchanges);
@@ -1315,7 +1319,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
// we may shutdown while doing recovery
if (!isRunAllowed()) {
- log.info("We are shutting down so stop recovering");
+ LOG.info("We are shutting down so stop recovering");
return;
}
lock.lock();
@@ -1324,9 +1328,9 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
// its safer to consider it in progress than risk duplicates due both in progress + recovered
boolean inProgress = copyOfInProgress.contains(exchangeId) || inProgressCompleteExchanges.contains(exchangeId);
if (inProgress) {
- log.trace("Aggregated exchange with id: {} is already in progress.", exchangeId);
+ LOG.trace("Aggregated exchange with id: {} is already in progress.", exchangeId);
} else {
- log.debug("Loading aggregated exchange with id: {} to be recovered.", exchangeId);
+ LOG.debug("Loading aggregated exchange with id: {} to be recovered.", exchangeId);
Exchange exchange = recoverable.recover(camelContext, exchangeId);
if (exchange != null) {
// get the correlation key
@@ -1339,7 +1343,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
// if we are exhausted, then move to dead letter channel
if (data != null && recoverable.getMaximumRedeliveries() > 0 && data.redeliveryCounter >= recoverable.getMaximumRedeliveries()) {
- log.warn("The recovered exchange is exhausted after " + recoverable.getMaximumRedeliveries()
+ LOG.warn("The recovered exchange is exhausted after " + recoverable.getMaximumRedeliveries()
+ " attempts, will now be moved to dead letter channel: " + recoverable.getDeadLetterUri());
// send to DLC
@@ -1374,7 +1378,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
exchange.getIn().setHeader(Exchange.REDELIVERY_MAX_COUNTER, recoverable.getMaximumRedeliveries());
}
- log.debug("Delivery attempt: {} to recover aggregated exchange with id: {}", data.redeliveryCounter, exchangeId);
+ LOG.debug("Delivery attempt: {} to recover aggregated exchange with id: {}", data.redeliveryCounter, exchangeId);
// not exhaust so resubmit the recovered exchange
onSubmitCompletion(key, exchange);
@@ -1386,7 +1390,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
}
}
- log.trace("Recover check complete");
+ LOG.trace("Recover check complete");
}
}
@@ -1398,7 +1402,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
}
if (aggregationStrategy.canPreComplete()) {
preCompletion = true;
- log.info("PreCompletionAwareAggregationStrategy detected. Aggregator {} is in pre-completion mode.", getId());
+ LOG.info("PreCompletionAwareAggregationStrategy detected. Aggregator {} is in pre-completion mode.", getId());
}
if (!preCompletion) {
@@ -1413,24 +1417,24 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
if (getCloseCorrelationKeyOnCompletion() != null) {
if (getCloseCorrelationKeyOnCompletion() > 0) {
- log.info("Using ClosedCorrelationKeys with a LRUCache with a capacity of {}", getCloseCorrelationKeyOnCompletion());
+ LOG.info("Using ClosedCorrelationKeys with a LRUCache with a capacity of {}", getCloseCorrelationKeyOnCompletion());
closedCorrelationKeys = LRUCacheFactory.newLRUCache(getCloseCorrelationKeyOnCompletion());
} else {
- log.info("Using ClosedCorrelationKeys with unbounded capacity");
+ LOG.info("Using ClosedCorrelationKeys with unbounded capacity");
closedCorrelationKeys = new ConcurrentHashMap<>();
}
}
if (aggregationRepository == null) {
aggregationRepository = new MemoryAggregationRepository(optimisticLocking);
- log.info("Defaulting to MemoryAggregationRepository");
+ LOG.info("Defaulting to MemoryAggregationRepository");
}
if (optimisticLocking) {
if (!(aggregationRepository instanceof OptimisticLockingAggregationRepository)) {
throw new IllegalArgumentException("Optimistic locking cannot be enabled without using an AggregationRepository that implements OptimisticLockingAggregationRepository");
}
- log.info("Optimistic locking is enabled");
+ LOG.info("Optimistic locking is enabled");
}
ServiceHelper.startService(aggregationStrategy, processor, aggregationRepository);
@@ -1447,7 +1451,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
// create a background recover thread to check every interval
recoverService = camelContext.getExecutorServiceManager().newScheduledThreadPool(this, "AggregateRecoverChecker", 1);
Runnable recoverTask = new RecoverTask(recoverable);
- log.info("Using RecoverableAggregationRepository by scheduling recover checker to run every {} millis.", interval);
+ LOG.info("Using RecoverableAggregationRepository by scheduling recover checker to run every {} millis.", interval);
// use fixed delay so there is X interval between each run
recoverService.scheduleWithFixedDelay(recoverTask, 1000L, interval, TimeUnit.MILLISECONDS);
@@ -1456,7 +1460,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
if (max <= 0) {
throw new IllegalArgumentException("Option maximumRedeliveries must be a positive number, was: " + max);
}
- log.info("After {} failed redelivery attempts Exchanges will be moved to deadLetterUri: {}", max, recoverable.getDeadLetterUri());
+ LOG.info("After {} failed redelivery attempts Exchanges will be moved to deadLetterUri: {}", max, recoverable.getDeadLetterUri());
// dead letter uri must be a valid endpoint
Endpoint endpoint = camelContext.getEndpoint(recoverable.getDeadLetterUri());
@@ -1472,7 +1476,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
throw new IllegalArgumentException("Only one of completionInterval or completionTimeout can be used, not both.");
}
if (getCompletionInterval() > 0) {
- log.info("Using CompletionInterval to run every {} millis.", getCompletionInterval());
+ LOG.info("Using CompletionInterval to run every {} millis.", getCompletionInterval());
if (getTimeoutCheckerExecutorService() == null) {
setTimeoutCheckerExecutorService(camelContext.getExecutorServiceManager().newSingleThreadScheduledExecutor(this, AGGREGATE_TIMEOUT_CHECKER));
shutdownTimeoutCheckerExecutorService = true;
@@ -1483,7 +1487,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
// start timeout service if its in use
if (getCompletionTimeout() > 0 || getCompletionTimeoutExpression() != null) {
- log.info("Using CompletionTimeout to trigger after {} millis of inactivity.", getCompletionTimeout());
+ LOG.info("Using CompletionTimeout to trigger after {} millis of inactivity.", getCompletionTimeout());
if (getTimeoutCheckerExecutorService() == null) {
setTimeoutCheckerExecutorService(camelContext.getExecutorServiceManager().newSingleThreadScheduledExecutor(this, AGGREGATE_TIMEOUT_CHECKER));
shutdownTimeoutCheckerExecutorService = true;
@@ -1576,18 +1580,18 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
StopWatch watch = new StopWatch();
while (inProgressCompleteExchanges.size() > 0) {
- log.trace("Waiting for {} inflight exchanges to complete", getInProgressCompleteExchanges());
+ LOG.trace("Waiting for {} inflight exchanges to complete", getInProgressCompleteExchanges());
try {
Thread.sleep(100);
} catch (InterruptedException e) {
// break out as we got interrupted such as the JVM terminating
- log.warn("Interrupted while waiting for {} inflight exchanges to complete.", getInProgressCompleteExchanges());
+ LOG.warn("Interrupted while waiting for {} inflight exchanges to complete.", getInProgressCompleteExchanges());
break;
}
}
if (expected > 0) {
- log.info("Forcing completion of all groups with {} exchanges completed in {}", expected, TimeUtils.printDuration(watch.taken()));
+ LOG.info("Forcing completion of all groups with {} exchanges completed in {}", expected, TimeUtils.printDuration(watch.taken()));
}
}
@@ -1623,7 +1627,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
Exchange exchange = aggregationRepository.get(camelContext, key);
if (exchange != null) {
total = 1;
- log.trace("Force completion triggered for correlation key: {}", key);
+ LOG.trace("Force completion triggered for correlation key: {}", key);
// indicate it was completed by a force completion request
exchange.setProperty(Exchange.AGGREGATED_COMPLETED_BY, COMPLETED_BY_FORCE);
Exchange answer = onCompletion(key, exchange, exchange, false, false);
@@ -1634,10 +1638,10 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
} finally {
lock.unlock();
}
- log.trace("Completed force completion of group {}", key);
+ LOG.trace("Completed force completion of group {}", key);
if (total > 0) {
- log.debug("Forcing completion of group {} with {} exchanges", key, total);
+ LOG.debug("Forcing completion of group {} with {} exchanges", key, total);
}
return total;
}
@@ -1647,11 +1651,11 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
// only run if CamelContext has been fully started or is stopping
boolean allow = camelContext.getStatus().isStarted() || camelContext.getStatus().isStopping();
if (!allow) {
- log.warn("Cannot start force completion of all groups because CamelContext({}) has not been started", camelContext.getName());
+ LOG.warn("Cannot start force completion of all groups because CamelContext({}) has not been started", camelContext.getName());
return 0;
}
- log.trace("Starting force completion of all groups task");
+ LOG.trace("Starting force completion of all groups task");
// trigger completion for all in the repository
Set<String> keys = aggregationRepository.getKeys();
@@ -1665,7 +1669,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
for (String key : keys) {
Exchange exchange = aggregationRepository.get(camelContext, key);
if (exchange != null) {
- log.trace("Force completion triggered for correlation key: {}", key);
+ LOG.trace("Force completion triggered for correlation key: {}", key);
// indicate it was completed by a force completion request
exchange.setProperty(Exchange.AGGREGATED_COMPLETED_BY, COMPLETED_BY_FORCE);
Exchange answer = onCompletion(key, exchange, exchange, false, false);
@@ -1678,10 +1682,10 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
lock.unlock();
}
}
- log.trace("Completed force completion of all groups task");
+ LOG.trace("Completed force completion of all groups task");
if (total > 0) {
- log.debug("Forcing completion of all groups with {} exchanges", total);
+ LOG.debug("Forcing completion of all groups with {} exchanges", total);
}
return total;
}
@@ -1695,17 +1699,17 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
Exchange exchange = aggregationRepository.get(camelContext, key);
if (exchange != null) {
total = 1;
- log.trace("Force discarded triggered for correlation key: {}", key);
+ LOG.trace("Force discarded triggered for correlation key: {}", key);
// force discarding by setting aggregate failed as true
onCompletion(key, exchange, exchange, false, true);
}
} finally {
lock.unlock();
}
- log.trace("Completed force discarded of group {}", key);
+ LOG.trace("Completed force discarded of group {}", key);
if (total > 0) {
- log.debug("Forcing discarding of group {} with {} exchanges", key, total);
+ LOG.debug("Forcing discarding of group {} with {} exchanges", key, total);
}
return total;
}
@@ -1715,11 +1719,11 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
// only run if CamelContext has been fully started or is stopping
boolean allow = camelContext.getStatus().isStarted() || camelContext.getStatus().isStopping();
if (!allow) {
- log.warn("Cannot start force discarding of all groups because CamelContext({}) has not been started", camelContext.getName());
+ LOG.warn("Cannot start force discarding of all groups because CamelContext({}) has not been started", camelContext.getName());
return 0;
}
- log.trace("Starting force discarding of all groups task");
+ LOG.trace("Starting force discarding of all groups task");
// trigger completion for all in the repository
Set<String> keys = aggregationRepository.getKeys();
@@ -1733,7 +1737,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
for (String key : keys) {
Exchange exchange = aggregationRepository.get(camelContext, key);
if (exchange != null) {
- log.trace("Force discarded triggered for correlation key: {}", key);
+ LOG.trace("Force discarded triggered for correlation key: {}", key);
// force discarding by setting aggregate failed as true
onCompletion(key, exchange, exchange, false, true);
}
@@ -1742,10 +1746,10 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
lock.unlock();
}
}
- log.trace("Completed force discarding of all groups task");
+ LOG.trace("Completed force discarding of all groups task");
if (total > 0) {
- log.debug("Forcing discarding of all groups with {} exchanges", total);
+ LOG.debug("Forcing discarding of all groups with {} exchanges", total);
}
return total;
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java b/core/camel-base/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java
index fd4b04a..028fb25 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java
@@ -42,6 +42,8 @@ import org.apache.camel.spi.RouteContext;
import org.apache.camel.spi.Tracer;
import org.apache.camel.support.OrderedComparator;
import org.apache.camel.support.service.ServiceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* DefaultChannel is the default {@link Channel}.
@@ -55,6 +57,8 @@ import org.apache.camel.support.service.ServiceHelper;
*/
public class DefaultChannel extends CamelInternalProcessor implements Channel {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultChannel.class);
+
private Processor errorHandler;
// the next processor (non wrapped)
private Processor nextProcessor;
@@ -183,7 +187,7 @@ public class DefaultChannel extends CamelInternalProcessor implements Channel {
// the definition to wrap should be the fine grained,
// so if a child is set then use it, if not then its the original output used
NamedNode targetOutputDef = childDefinition != null ? childDefinition : definition;
- log.debug("Initialize channel for target: '{}'", targetOutputDef);
+ LOG.trace("Initialize channel for target: {}", targetOutputDef);
// setup instrumentation processor for management (jmx)
// this is later used in postInitChannel as we need to setup the error handler later as well
@@ -237,7 +241,7 @@ public class DefaultChannel extends CamelInternalProcessor implements Channel {
// use the fine grained definition (eg the child if available). Its always possible to get back to the parent
Processor wrapped = strategy.wrapProcessorInInterceptors(routeContext.getCamelContext(), targetOutputDef, target, next);
if (!(wrapped instanceof AsyncProcessor)) {
- log.warn("Interceptor: " + strategy + " at: " + definition + " does not return an AsyncProcessor instance."
+ LOG.warn("Interceptor: " + strategy + " at: " + definition + " does not return an AsyncProcessor instance."
+ " This causes the asynchronous routing engine to not work as optimal as possible."
+ " See more details at the InterceptStrategy javadoc."
+ " Camel will use a bridge to adapt the interceptor to the asynchronous routing engine,"
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java b/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
index 7f5abc6..637d2fc 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
@@ -53,6 +53,8 @@ import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Base redeliverable error handler that also supports a final dead letter queue in case
@@ -63,6 +65,8 @@ import org.apache.camel.util.URISupport;
*/
public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport implements AsyncProcessor, ShutdownPrepared, Navigate<Processor> {
+ private static final Logger LOG = LoggerFactory.getLogger(RedeliveryErrorHandler.class);
+
protected final AtomicInteger redeliverySleepCounter = new AtomicInteger();
protected ScheduledExecutorService executorService;
protected final CamelContext camelContext;
@@ -209,7 +213,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
@Override
public void prepareShutdown(boolean suspendOnly, boolean forced) {
// prepare for shutdown, eg do not allow redelivery if configured
- log.trace("Prepare shutdown on error handler: {}", this);
+ LOG.trace("Prepare shutdown on error handler: {}", this);
preparingShutdown = true;
}
@@ -231,9 +235,9 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
Long delay = message.getHeader(Exchange.REDELIVERY_DELAY, Long.class);
if (delay == null) {
delay = redeliveryPolicy.calculateRedeliveryDelay(redeliveryDelay, redeliveryCounter);
- log.debug("Redelivery delay calculated as {}", delay);
+ LOG.debug("Redelivery delay calculated as {}", delay);
} else {
- log.debug("Redelivery delay is {} from Message Header [{}]", delay, Exchange.REDELIVERY_DELAY);
+ LOG.debug("Redelivery delay is {} from Message Header [{}]", delay, Exchange.REDELIVERY_DELAY);
}
return delay;
}
@@ -277,7 +281,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
|| ExchangeHelper.isRedeliveryExhausted(exchange);
}
- log.trace("Is exchangeId: {} done? {}", exchange.getExchangeId(), answer);
+ LOG.trace("Is exchangeId: {} done? {}", exchange.getExchangeId(), answer);
return answer;
}
@@ -294,7 +298,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
answer = true;
}
- log.trace("Is exchangeId: {} interrupted? {}", exchange.getExchangeId(), answer);
+ LOG.trace("Is exchangeId: {} interrupted? {}", exchange.getExchangeId(), answer);
return answer;
}
@@ -393,7 +397,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
public void run() {
// can we still run
if (!isRunAllowed()) {
- log.trace("Run not allowed, will reject executing exchange: {}", exchange);
+ LOG.trace("Run not allowed, will reject executing exchange: {}", exchange);
if (exchange.getException() == null) {
exchange.setException(new RejectedExecutionException());
}
@@ -433,8 +437,8 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
ObjectHelper.notNull(executorService, "Redelivery is enabled but ExecutorService has not been configured.", this);
// schedule the redelivery task
- if (log.isTraceEnabled()) {
- log.trace("Scheduling redelivery task to run in {} millis for exchangeId: {}", redeliveryDelay, exchange.getExchangeId());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Scheduling redelivery task to run in {} millis for exchangeId: {}", redeliveryDelay, exchange.getExchangeId());
}
executorService.schedule(() -> camelContext.getReactiveExecutor().schedule(this::redeliver), redeliveryDelay, TimeUnit.MILLISECONDS);
@@ -489,7 +493,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// if camel context is forcing a shutdown then do not allow running
boolean forceShutdown = camelContext.getShutdownStrategy().forceShutdown(RedeliveryErrorHandler.this);
if (forceShutdown) {
- log.trace("isRunAllowed() -> false (Run not allowed as ShutdownStrategy is forcing shutting down)");
+ LOG.trace("isRunAllowed() -> false (Run not allowed as ShutdownStrategy is forcing shutting down)");
return false;
}
@@ -497,19 +501,19 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// but this only applies during a redelivery (counter must > 0)
if (redeliveryCounter > 0) {
if (currentRedeliveryPolicy.allowRedeliveryWhileStopping) {
- log.trace("isRunAllowed() -> true (Run allowed as RedeliverWhileStopping is enabled)");
+ LOG.trace("isRunAllowed() -> true (Run allowed as RedeliverWhileStopping is enabled)");
return true;
} else if (preparingShutdown) {
// we are preparing for shutdown, now determine if we can still run
boolean answer = isRunAllowedOnPreparingShutdown();
- log.trace("isRunAllowed() -> {} (Run not allowed as we are preparing for shutdown)", answer);
+ LOG.trace("isRunAllowed() -> {} (Run not allowed as we are preparing for shutdown)", answer);
return answer;
}
}
// we cannot run if we are stopping/stopped
boolean answer = !isStoppingOrStopped();
- log.trace("isRunAllowed() -> {} (Run allowed if we are not stopped/stopping)", answer);
+ LOG.trace("isRunAllowed() -> {} (Run allowed if we are not stopped/stopping)", answer);
return answer;
}
@@ -519,15 +523,15 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
if (redeliveryCounter > 0) {
boolean stopping = isStoppingOrStopped();
if (!preparingShutdown && !stopping) {
- log.trace("isRedeliveryAllowed() -> true (we are not stopping/stopped)");
+ LOG.trace("isRedeliveryAllowed() -> true (we are not stopping/stopped)");
return true;
} else {
// we are stopping or preparing to shutdown
if (currentRedeliveryPolicy.allowRedeliveryWhileStopping) {
- log.trace("isRedeliveryAllowed() -> true (Redelivery allowed as RedeliverWhileStopping is enabled)");
+ LOG.trace("isRedeliveryAllowed() -> true (Redelivery allowed as RedeliverWhileStopping is enabled)");
return true;
} else {
- log.trace("isRedeliveryAllowed() -> false (Redelivery not allowed as RedeliverWhileStopping is disabled)");
+ LOG.trace("isRedeliveryAllowed() -> false (Redelivery not allowed as RedeliverWhileStopping is disabled)");
return false;
}
}
@@ -543,8 +547,8 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// letting onRedeliver be executed at first
deliverToOnRedeliveryProcessor();
- if (log.isTraceEnabled()) {
- log.trace("Redelivering exchangeId: {} -> {} for Exchange: {}", exchange.getExchangeId(), outputAsync, exchange);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Redelivering exchangeId: {} -> {} for Exchange: {}", exchange.getExchangeId(), outputAsync, exchange);
}
// emmit event we are doing redelivery
@@ -552,7 +556,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// process the exchange (also redelivery)
outputAsync.process(exchange, doneSync -> {
- log.trace("Redelivering exchangeId: {}", exchange.getExchangeId());
+ LOG.trace("Redelivering exchangeId: {}", exchange.getExchangeId());
// only process if the exchange hasn't failed
// and it has not been handled by the error processor
@@ -674,7 +678,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
} else {
// note this should really not happen, but we have this code as a fail safe
// to be backwards compatible with the old behavior
- log.warn("Cannot determine current route from Exchange with id: {}, will fallback and use first error handler.", exchange.getExchangeId());
+ LOG.warn("Cannot determine current route from Exchange with id: {}, will fallback and use first error handler.", exchange.getExchangeId());
}
if (processor != null) {
failureProcessor = processor;
@@ -713,15 +717,15 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// run this synchronously as its just a Processor
try {
- if (log.isTraceEnabled()) {
- log.trace("OnExceptionOccurred processor {} is processing Exchange: {} due exception occurred", onExceptionProcessor, exchange);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("OnExceptionOccurred processor {} is processing Exchange: {} due exception occurred", onExceptionProcessor, exchange);
}
onExceptionProcessor.process(exchange);
} catch (Throwable e) {
// we dont not want new exception to override existing, so log it as a WARN
- log.warn("Error during processing OnExceptionOccurred. This exception is ignored.", e);
+ LOG.warn("Error during processing OnExceptionOccurred. This exception is ignored.", e);
}
- log.trace("OnExceptionOccurred processor done");
+ LOG.trace("OnExceptionOccurred processor done");
}
/**
@@ -733,8 +737,8 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
return;
}
- if (log.isTraceEnabled()) {
- log.trace("Redelivery processor {} is processing Exchange: {} before its redelivered",
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Redelivery processor {} is processing Exchange: {} before its redelivered",
onRedeliveryProcessor, exchange);
}
@@ -744,7 +748,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
} catch (Throwable e) {
exchange.setException(e);
}
- log.trace("Redelivery processor done");
+ LOG.trace("Redelivery processor done");
}
/**
@@ -795,14 +799,14 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
if (useOriginalInMessage || useOriginalInBody) {
Message original = ExchangeHelper.getOriginalInMessage(exchange);
if (useOriginalInMessage) {
- log.trace("Using the original IN message instead of current");
+ LOG.trace("Using the original IN message instead of current");
exchange.setIn(original);
} else {
- log.trace("Using the original IN message body instead of current");
+ LOG.trace("Using the original IN message body instead of current");
exchange.getIn().setBody(original.getBody());
}
if (exchange.hasOut()) {
- log.trace("Removing the out message to avoid some uncertain behavior");
+ LOG.trace("Removing the out message to avoid some uncertain behavior");
exchange.setOut(null);
}
}
@@ -813,7 +817,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// invoke custom on prepare
if (onPrepareProcessor != null) {
try {
- log.trace("OnPrepare processor {} is processing Exchange: {}", onPrepareProcessor, exchange);
+ LOG.trace("OnPrepare processor {} is processing Exchange: {}", onPrepareProcessor, exchange);
onPrepareProcessor.process(exchange);
} catch (Exception e) {
// a new exception was thrown during prepare
@@ -821,7 +825,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
}
}
- log.trace("Failure processor {} is processing Exchange: {}", processor, exchange);
+ LOG.trace("Failure processor {} is processing Exchange: {}", processor, exchange);
// store the last to endpoint as the failure endpoint
exchange.setProperty(Exchange.FAILURE_ENDPOINT, exchange.getProperty(Exchange.TO_ENDPOINT));
@@ -840,7 +844,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// the failure processor could also be asynchronous
AsyncProcessor afp = AsyncProcessorConverterHelper.convert(processor);
afp.process(exchange, sync -> {
- log.trace("Failure processor done: {} processing Exchange: {}", processor, exchange);
+ LOG.trace("Failure processor done: {} processing Exchange: {}", processor, exchange);
try {
prepareExchangeAfterFailure(exchange, isDeadLetterChannel, shouldHandle, shouldContinue);
// fire event as we had a failure processor to handle it, which there is a event for
@@ -855,7 +859,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// invoke custom on prepare
if (onPrepareProcessor != null) {
try {
- log.trace("OnPrepare processor {} is processing Exchange: {}", onPrepareProcessor, exchange);
+ LOG.trace("OnPrepare processor {} is processing Exchange: {}", onPrepareProcessor, exchange);
onPrepareProcessor.process(exchange);
} catch (Exception e) {
// a new exception was thrown during prepare
@@ -897,7 +901,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
boolean alreadySet = exchange.getProperty(Exchange.ERRORHANDLER_HANDLED) != null;
if (alreadySet) {
boolean handled = exchange.getProperty(Exchange.ERRORHANDLER_HANDLED, Boolean.class);
- log.trace("This exchange has already been marked for handling: {}", handled);
+ LOG.trace("This exchange has already been marked for handling: {}", handled);
if (!handled) {
// exception not handled, put exception back in the exchange
exchange.setException(exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class));
@@ -909,11 +913,11 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// dead letter channel is special
if (shouldContinue) {
- log.trace("This exchange is continued: {}", exchange);
+ LOG.trace("This exchange is continued: {}", exchange);
// okay we want to continue then prepare the exchange for that as well
prepareExchangeForContinue(exchange, isDeadLetterChannel);
} else if (shouldHandle) {
- log.trace("This exchange is handled so its marked as not failed: {}", exchange);
+ LOG.trace("This exchange is handled so its marked as not failed: {}", exchange);
exchange.setProperty(Exchange.ERRORHANDLER_HANDLED, Boolean.TRUE);
} else {
// okay the redelivery policy are not explicit set to true, so we should allow to check for some
@@ -939,7 +943,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
}
if (handled) {
- log.trace("This exchange is handled so its marked as not failed: {}", exchange);
+ LOG.trace("This exchange is handled so its marked as not failed: {}", exchange);
exchange.setProperty(Exchange.ERRORHANDLER_HANDLED, Boolean.TRUE);
return;
}
@@ -951,7 +955,7 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
}
private void prepareExchangeAfterFailureNotHandled(Exchange exchange) {
- log.trace("This exchange is not handled or continued so its marked as failed: {}", exchange);
+ LOG.trace("This exchange is not handled or continued so its marked as failed: {}", exchange);
// exception not handled, put exception back in the exchange
exchange.setProperty(Exchange.ERRORHANDLER_HANDLED, Boolean.FALSE);
exchange.setException(exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class));
@@ -1107,14 +1111,14 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// if marked as rollback only then do not continue/redeliver
boolean exhausted = exchange.getProperty(Exchange.REDELIVERY_EXHAUSTED, false, Boolean.class);
if (exhausted) {
- log.trace("This exchange is marked as redelivery exhausted: {}", exchange);
+ LOG.trace("This exchange is marked as redelivery exhausted: {}", exchange);
return true;
}
// if marked as rollback only then do not continue/redeliver
boolean rollbackOnly = exchange.getProperty(Exchange.ROLLBACK_ONLY, false, Boolean.class);
if (rollbackOnly) {
- log.trace("This exchange is marked as rollback only, so forcing it to be exhausted: {}", exchange);
+ LOG.trace("This exchange is marked as rollback only, so forcing it to be exhausted: {}", exchange);
return true;
}
// its the first original call so continue
@@ -1186,20 +1190,20 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
StopWatch watch = new StopWatch();
- log.debug("Sleeping for: {} millis until attempting redelivery", redeliveryDelay);
+ LOG.debug("Sleeping for: {} millis until attempting redelivery", redeliveryDelay);
while (watch.taken() < redeliveryDelay) {
// sleep using 1 sec interval
long delta = redeliveryDelay - watch.taken();
long max = Math.min(1000, delta);
if (max > 0) {
- log.trace("Sleeping for: {} millis until waking up for re-check", max);
+ LOG.trace("Sleeping for: {} millis until waking up for re-check", max);
Thread.sleep(max);
}
// are we preparing for shutdown then only do redelivery if allowed
if (preparingShutdown && !currentRedeliveryPolicy.isAllowRedeliveryWhileStopping()) {
- log.debug("Rejected redelivery while stopping");
+ LOG.debug("Rejected redelivery while stopping");
return false;
}
}
@@ -1274,8 +1278,8 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// determine if redeliver is enabled or not
redeliveryEnabled = determineIfRedeliveryIsEnabled();
- if (log.isTraceEnabled()) {
- log.trace("Redelivery enabled: {} on error handler: {}", redeliveryEnabled, this);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Redelivery enabled: {} on error handler: {}", redeliveryEnabled, this);
}
// we only need thread pool if redelivery is enabled
@@ -1284,8 +1288,8 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
// use default shared executor service
executorService = camelContext.adapt(ExtendedCamelContext.class).getErrorHandlerExecutorService();
}
- if (log.isDebugEnabled()) {
- log.debug("Using ExecutorService: {} for redeliveries on error handler: {}", executorService, this);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Using ExecutorService: {} for redeliveries on error handler: {}", executorService, this);
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java b/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
index b126382..ee07060 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
@@ -35,7 +35,10 @@ import org.apache.camel.spi.RouteIdAware;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.support.AsyncProcessorConverterHelper;
import org.apache.camel.support.AsyncProcessorSupport;
+import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.support.service.ServiceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An implementation of the <a
@@ -47,6 +50,8 @@ import org.apache.camel.support.service.ServiceHelper;
*/
public class IdempotentConsumer extends AsyncProcessorSupport implements CamelContextAware, Navigate<Processor>, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(IdempotentConsumer.class);
+
private CamelContext camelContext;
private String id;
private String routeId;
@@ -140,7 +145,7 @@ public class IdempotentConsumer extends AsyncProcessorSupport implements CamelCo
if (skipDuplicate) {
// if we should skip duplicate then we are done
- log.debug("Ignoring duplicate message with id: {} for exchange: {}", messageId, exchange);
+ LOG.debug("Ignoring duplicate message with id: {} for exchange: {}", messageId, exchange);
callback.done(true);
return true;
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java b/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
index b8403d0..f29a838 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
@@ -43,6 +43,8 @@ import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.MessageHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.support.service.ServiceSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A {@link org.apache.camel.spi.Debugger} that has easy debugging functionality which
@@ -59,10 +61,12 @@ import org.apache.camel.support.service.ServiceSupport;
*/
public final class BacklogDebugger extends ServiceSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(BacklogDebugger.class);
+
private long fallbackTimeout = 300;
private final CamelContext camelContext;
private LoggingLevel loggingLevel = LoggingLevel.INFO;
- private final CamelLogger logger = new CamelLogger(log, loggingLevel);
+ private final CamelLogger logger = new CamelLogger(LOG, loggingLevel);
private final AtomicBoolean enabled = new AtomicBoolean();
private final AtomicLong debugCounter = new AtomicLong(0);
private final Debugger debugger;
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java b/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java
index 1c109ad..4b48bd0 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java
@@ -96,9 +96,6 @@ public final class BacklogTracer extends ServiceSupport {
filter = shouldTraceFilter(exchange);
}
- if (log.isTraceEnabled()) {
- log.trace("Should trace evaluated {} -> pattern: {}, filter: {}", definition.getId(), pattern, filter);
- }
return pattern && filter;
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/DefaultDebugger.java b/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/DefaultDebugger.java
index b4c8b9c..319dc8e 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/DefaultDebugger.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/DefaultDebugger.java
@@ -284,7 +284,7 @@ public class DefaultDebugger extends ServiceSupport implements Debugger, CamelCo
try {
breakpoint.beforeProcess(exchange, processor, definition);
} catch (Throwable e) {
- log.warn("Exception occurred in breakpoint: " + breakpoint + ". This exception will be ignored.", e);
+ // ignore
}
}
@@ -292,7 +292,7 @@ public class DefaultDebugger extends ServiceSupport implements Debugger, CamelCo
try {
breakpoint.afterProcess(exchange, processor, definition, timeTaken);
} catch (Throwable e) {
- log.warn("Exception occurred in breakpoint: " + breakpoint + ". This exception will be ignored.", e);
+ // ignore
}
}
@@ -306,7 +306,7 @@ public class DefaultDebugger extends ServiceSupport implements Debugger, CamelCo
try {
breakpoint.onEvent(exchange, event, definition);
} catch (Throwable e) {
- log.warn("Exception occurred in breakpoint: " + breakpoint + ". This exception will be ignored.", e);
+ // ignore
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java b/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
index c2ad725..3f1a15e 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
@@ -26,8 +26,11 @@ import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
import org.apache.camel.Traceable;
+import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This FailOverLoadBalancer will failover to use next processor when an exception occurred
@@ -38,6 +41,8 @@ import org.apache.camel.util.ObjectHelper;
*/
public class FailOverLoadBalancer extends LoadBalancerSupport implements Traceable, CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(FailOverLoadBalancer.class);
+
private final List<Class<?>> exceptions;
private CamelContext camelContext;
private boolean roundRobin;
@@ -141,7 +146,7 @@ public class FailOverLoadBalancer extends LoadBalancerSupport implements Traceab
}
}
- log.trace("Should failover: {} for exchangeId: {}", answer, exchange.getExchangeId());
+ LOG.trace("Should failover: {} for exchangeId: {}", answer, exchange.getExchangeId());
return answer;
}
@@ -151,7 +156,7 @@ public class FailOverLoadBalancer extends LoadBalancerSupport implements Traceab
// determine if we can still run, or the camel context is forcing a shutdown
boolean forceShutdown = camelContext.getShutdownStrategy().forceShutdown(this);
if (forceShutdown) {
- log.trace("Run not allowed as ShutdownStrategy is forcing shutting down");
+ LOG.trace("Run not allowed as ShutdownStrategy is forcing shutting down");
}
return !forceShutdown && super.isRunAllowed();
}
@@ -186,7 +191,7 @@ public class FailOverLoadBalancer extends LoadBalancerSupport implements Traceab
} else if (isRoundRobin()) {
index = counter.updateAndGet(x -> ++x < processors.length ? x : 0);
}
- log.trace("Failover starting with endpoint index {}", index);
+ LOG.trace("Failover starting with endpoint index {}", index);
}
public void run() {
@@ -195,14 +200,14 @@ public class FailOverLoadBalancer extends LoadBalancerSupport implements Traceab
lastGoodIndex.set(index);
// and copy the current result to original so it will contain this result of this eip
ExchangeHelper.copyResults(exchange, copy);
- log.debug("Failover complete for exchangeId: {} >>> {}", exchange.getExchangeId(), exchange);
+ LOG.debug("Failover complete for exchangeId: {} >>> {}", exchange.getExchangeId(), exchange);
callback.done(false);
return;
}
// can we still run
if (!isRunAllowed()) {
- log.trace("Run not allowed, will reject executing exchange: {}", exchange);
+ LOG.trace("Run not allowed, will reject executing exchange: {}", exchange);
if (exchange.getException() == null) {
exchange.setException(new RejectedExecutionException());
}
@@ -215,7 +220,7 @@ public class FailOverLoadBalancer extends LoadBalancerSupport implements Traceab
attempts++;
// are we exhausted by attempts?
if (maximumFailoverAttempts > -1 && attempts > maximumFailoverAttempts) {
- log.debug("Breaking out of failover after {} failover attempts", attempts);
+ LOG.debug("Breaking out of failover after {} failover attempts", attempts);
ExchangeHelper.copyResults(exchange, copy);
callback.done(false);
return;
@@ -228,12 +233,12 @@ public class FailOverLoadBalancer extends LoadBalancerSupport implements Traceab
if (index >= processors.length) {
// out of bounds
if (isRoundRobin()) {
- log.trace("Failover is round robin enabled and therefore starting from the first endpoint");
+ LOG.trace("Failover is round robin enabled and therefore starting from the first endpoint");
index = 0;
counter.set(0);
} else {
// no more processors to try
- log.trace("Breaking out of failover as we reached the end of endpoints to use for failover");
+ LOG.trace("Breaking out of failover as we reached the end of endpoints to use for failover");
ExchangeHelper.copyResults(exchange, copy);
callback.done(false);
return;
@@ -245,7 +250,7 @@ public class FailOverLoadBalancer extends LoadBalancerSupport implements Traceab
AsyncProcessor processor = processors[index];
// process the exchange
- log.debug("Processing failover at attempt {} for {}", attempts, copy);
+ LOG.debug("Processing failover at attempt {} for {}", attempts, copy);
processor.process(copy, doneSync -> exchange.getContext().getReactiveExecutor().schedule(this::run));
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionRoutePolicy.java b/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionRoutePolicy.java
index d0f8304..5ce6379 100644
--- a/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionRoutePolicy.java
+++ b/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionRoutePolicy.java
@@ -30,6 +30,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Route;
import org.apache.camel.spi.RoutePolicy;
import org.apache.camel.support.RoutePolicySupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Modeled after the circuit breaker {@link ThrottlingInflightRoutePolicy}
@@ -49,6 +51,8 @@ import org.apache.camel.support.RoutePolicySupport;
*/
public class ThrottlingExceptionRoutePolicy extends RoutePolicySupport implements CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(ThrottlingExceptionRoutePolicy.class);
+
private static final int STATE_CLOSED = 0;
private static final int STATE_HALF_OPEN = 1;
private static final int STATE_OPEN = 2;
@@ -99,7 +103,7 @@ public class ThrottlingExceptionRoutePolicy extends RoutePolicySupport implement
@Override
public void onInit(Route route) {
- log.debug("Initializing ThrottlingExceptionRoutePolicy route policy...");
+ LOG.debug("Initializing ThrottlingExceptionRoutePolicy route policy");
logState();
}
@@ -115,7 +119,7 @@ public class ThrottlingExceptionRoutePolicy extends RoutePolicySupport implement
public void onExchangeDone(Route route, Exchange exchange) {
if (keepOpen.get()) {
if (state.get() != STATE_OPEN) {
- log.debug("opening circuit b/c keepOpen is on");
+ LOG.debug("opening circuit b/c keepOpen is on");
openCircuit(route);
}
} else {
@@ -158,9 +162,9 @@ public class ThrottlingExceptionRoutePolicy extends RoutePolicySupport implement
}
}
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
String exceptionName = exchange.getException() == null ? "none" : exchange.getException().getClass().getSimpleName();
- log.debug("hasFailed ({}) with Throttled Exception: {} for exchangeId: {}", answer, exceptionName, exchange.getExchangeId());
+ LOG.debug("hasFailed ({}) with Throttled Exception: {} for exchangeId: {}", answer, exceptionName, exchange.getExchangeId());
}
return answer;
}
@@ -172,39 +176,39 @@ public class ThrottlingExceptionRoutePolicy extends RoutePolicySupport implement
if (state.get() == STATE_CLOSED) {
if (failureLimitReached) {
- log.debug("Opening circuit...");
+ LOG.debug("Opening circuit...");
openCircuit(route);
}
} else if (state.get() == STATE_HALF_OPEN) {
if (failureLimitReached) {
- log.debug("Opening circuit...");
+ LOG.debug("Opening circuit...");
openCircuit(route);
} else {
- log.debug("Closing circuit...");
+ LOG.debug("Closing circuit...");
closeCircuit(route);
}
} else if (state.get() == STATE_OPEN) {
if (!keepOpen.get()) {
long elapsedTimeSinceOpened = System.currentTimeMillis() - openedAt;
if (halfOpenAfter <= elapsedTimeSinceOpened) {
- log.debug("Checking an open circuit...");
+ LOG.debug("Checking an open circuit...");
if (halfOpenHandler != null) {
if (halfOpenHandler.isReadyToBeClosed()) {
- log.debug("Closing circuit...");
+ LOG.debug("Closing circuit...");
closeCircuit(route);
} else {
- log.debug("Opening circuit...");
+ LOG.debug("Opening circuit...");
openCircuit(route);
}
} else {
- log.debug("Half opening circuit...");
+ LOG.debug("Half opening circuit...");
halfOpenCircuit(route);
}
} else {
- log.debug("keeping circuit open (time not elapsed)...");
+ LOG.debug("keeping circuit open (time not elapsed)...");
}
} else {
- log.debug("keeping circuit open (keepOpen is true)...");
+ LOG.debug("keeping circuit open (keepOpen is true)...");
this.addHalfOpenTimer(route);
}
}
@@ -273,8 +277,8 @@ public class ThrottlingExceptionRoutePolicy extends RoutePolicySupport implement
}
private void logState() {
- if (log.isDebugEnabled()) {
- log.debug(dumpState());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(dumpState());
}
}
@@ -325,7 +329,7 @@ public class ThrottlingExceptionRoutePolicy extends RoutePolicySupport implement
}
public void setKeepOpen(boolean keepOpen) {
- log.debug("keep open: {}", keepOpen);
+ LOG.debug("keep open: {}", keepOpen);
this.keepOpen.set(keepOpen);
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingInflightRoutePolicy.java b/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingInflightRoutePolicy.java
index 7c8f5ac..ec249fe 100644
--- a/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingInflightRoutePolicy.java
+++ b/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingInflightRoutePolicy.java
@@ -34,6 +34,8 @@ import org.apache.camel.support.EventNotifierSupport;
import org.apache.camel.support.RoutePolicySupport;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A throttle based {@link org.apache.camel.spi.RoutePolicy} which is capable of dynamic
@@ -48,6 +50,8 @@ import org.apache.camel.util.ObjectHelper;
*/
public class ThrottlingInflightRoutePolicy extends RoutePolicySupport implements CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(ThrottlingInflightRoutePolicy.class);
+
public enum ThrottlingScope {
Context, Route
}
@@ -108,8 +112,8 @@ public class ThrottlingInflightRoutePolicy extends RoutePolicySupport implements
int size = getSize(route, exchange);
boolean stop = maxInflightExchanges > 0 && size > maxInflightExchanges;
- if (log.isTraceEnabled()) {
- log.trace("{} > 0 && {} > {} evaluated as {}", maxInflightExchanges, size, maxInflightExchanges, stop);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("{} > 0 && {} > {} evaluated as {}", maxInflightExchanges, size, maxInflightExchanges, stop);
}
if (stop) {
try {
@@ -126,8 +130,8 @@ public class ThrottlingInflightRoutePolicy extends RoutePolicySupport implements
// so we need to ensure that we read the most current size and start the consumer if we are already to low
size = getSize(route, exchange);
boolean start = size <= resumeInflightExchanges;
- if (log.isTraceEnabled()) {
- log.trace("{} <= {} evaluated as {}", size, resumeInflightExchanges, start);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("{} <= {} evaluated as {}", size, resumeInflightExchanges, start);
}
if (start) {
try {
@@ -225,7 +229,7 @@ public class ThrottlingInflightRoutePolicy extends RoutePolicySupport implements
}
protected CamelLogger createLogger() {
- return new CamelLogger(log, getLoggingLevel());
+ return new CamelLogger(LOG, getLoggingLevel());
}
private int getSize(Route route, Exchange exchange) {
diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
index 6d438e3..46edcea 100644
--- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
+++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
@@ -37,9 +37,13 @@ import org.apache.camel.support.AsyncProcessorSupport;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DefaultServiceCallProcessor extends AsyncProcessorSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultServiceCallProcessor.class);
+
private final ExchangePattern exchangePattern;
private final String name;
private final String scheme;
@@ -86,7 +90,6 @@ public class DefaultServiceCallProcessor extends AsyncProcessorSupport {
// Properties
// *************************************
-
public ExchangePattern getExchangePattern() {
return exchangePattern;
}
@@ -179,7 +182,7 @@ public class DefaultServiceCallProcessor extends AsyncProcessorSupport {
final int port = service.getPort();
final Map<String, String> meta = service.getMetadata();
- log.debug("Service {} active at server: {}:{}", name, host, port);
+ LOG.debug("Service {} active at server: {}:{}", name, host, port);
// set selected server as header
message.setHeader(ServiceCallConstants.SERVICE_HOST, host);
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java
index b017356..190bd94 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java
@@ -45,24 +45,22 @@ import org.apache.camel.model.transformer.TransformerDefinition;
import org.apache.camel.model.validator.ValidatorDefinition;
import org.apache.camel.processor.MulticastProcessor;
import org.apache.camel.reifier.dataformat.DataFormatReifier;
-import org.apache.camel.reifier.transformer.TransformerReifier;
-import org.apache.camel.reifier.validator.ValidatorReifier;
import org.apache.camel.runtimecatalog.RuntimeCamelCatalog;
import org.apache.camel.spi.DataFormat;
-import org.apache.camel.spi.DataType;
import org.apache.camel.spi.Registry;
-import org.apache.camel.spi.Transformer;
import org.apache.camel.spi.TransformerRegistry;
-import org.apache.camel.spi.Validator;
import org.apache.camel.spi.ValidatorRegistry;
import org.apache.camel.support.CamelContextHelper;
-import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Represents the context used to configure routes and the policies to use.
*/
public abstract class AbstractModelCamelContext extends AbstractCamelContext implements ModelCamelContext, CatalogCamelContext {
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractModelCamelContext.class);
+
private final Model model = new DefaultModel(this);
/**
@@ -289,7 +287,7 @@ public abstract class AbstractModelCamelContext extends AbstractCamelContext imp
for (Map.Entry<String, DataFormatDefinition> e : model.getDataFormats().entrySet()) {
String id = e.getKey();
DataFormatDefinition def = e.getValue();
- log.debug("Creating Dataformat with id: {} and definition: {}", id, def);
+ LOG.debug("Creating Dataformat with id: {} and definition: {}", id, def);
DataFormat df = DataFormatReifier.reifier(def).createDataFormat(this);
addService(df, true);
getRegistry().bind(id, df);
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index a4c8817..4289d85 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -16,9 +16,8 @@
*/
package org.apache.camel.impl;
-import java.util.Map;
-
import javax.naming.Context;
+import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
@@ -97,12 +96,16 @@ import org.apache.camel.spi.TypeConverterRegistry;
import org.apache.camel.spi.UnitOfWorkFactory;
import org.apache.camel.spi.UuidGenerator;
import org.apache.camel.support.DefaultRegistry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Represents the context used to configure routes and the policies to use.
*/
public class DefaultCamelContext extends AbstractModelCamelContext {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultCamelContext.class);
+
/**
* Creates the {@link CamelContext} using {@link DefaultRegistry} as
* registry.
@@ -270,7 +273,7 @@ public class DefaultCamelContext extends AbstractModelCamelContext {
PackageScanClassResolver packageScanClassResolver;
// use WebSphere specific resolver if running on WebSphere
if (WebSpherePackageScanClassResolver.isWebSphereClassLoader(this.getClass().getClassLoader())) {
- log.info("Using WebSphere specific PackageScanClassResolver");
+ LOG.info("Using WebSphere specific PackageScanClassResolver");
packageScanClassResolver = new WebSpherePackageScanClassResolver("META-INF/services/org/apache/camel/TypeConverter");
} else {
packageScanClassResolver = new DefaultPackageScanClassResolver();
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
index 9ab8419..e1b179a 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
@@ -38,16 +38,21 @@ import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.cluster.CamelClusterView;
import org.apache.camel.spi.CamelEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStartedEvent;
+import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.support.EventNotifierSupport;
import org.apache.camel.support.RoutePolicySupport;
import org.apache.camel.support.cluster.ClusterServiceHelper;
import org.apache.camel.support.cluster.ClusterServiceSelectors;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ReferenceCount;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@ManagedResource(description = "Clustered Route policy using")
public final class ClusteredRoutePolicy extends RoutePolicySupport implements CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(ClusteredRoutePolicy.class);
+
private final AtomicBoolean leader;
private final Set<Route> startedRoutes;
private final Set<Route> stoppedRoutes;
@@ -165,7 +170,7 @@ public final class ClusteredRoutePolicy extends RoutePolicySupport implements Ca
public void onInit(Route route) {
super.onInit(route);
- log.info("Route managed by {}. Setting route {} AutoStartup flag to false.", getClass(), route.getId());
+ LOG.info("Route managed by {}. Setting route {} AutoStartup flag to false.", getClass(), route.getId());
route.getRouteContext().setAutoStartup(false);
this.refCount.retain();
@@ -181,7 +186,7 @@ public final class ClusteredRoutePolicy extends RoutePolicySupport implements Ca
.orElseThrow(() -> new IllegalStateException("CamelCluster service not found"));
}
- log.debug("ClusteredRoutePolicy {} is using ClusterService instance {} (id={}, type={})", this, clusterService, clusterService.getId(),
+ LOG.debug("ClusteredRoutePolicy {} is using ClusterService instance {} (id={}, type={})", this, clusterService, clusterService.getId(),
clusterService.getClass().getName());
clusterView = clusterService.getView(namespace);
@@ -207,10 +212,10 @@ public final class ClusteredRoutePolicy extends RoutePolicySupport implements Ca
private synchronized void setLeader(boolean isLeader) {
if (isLeader && leader.compareAndSet(false, isLeader)) {
- log.debug("Leadership taken");
+ LOG.debug("Leadership taken");
startManagedRoutes();
} else if (!isLeader && leader.getAndSet(isLeader)) {
- log.debug("Leadership lost");
+ LOG.debug("Leadership lost");
stopManagedRoutes();
}
}
@@ -234,7 +239,7 @@ public final class ClusteredRoutePolicy extends RoutePolicySupport implements Ca
for (Route route : stoppedRoutes) {
ServiceStatus status = getStatus(route);
if (status != null && status.isStartable()) {
- log.debug("Starting route '{}'", route.getId());
+ LOG.debug("Starting route '{}'", route.getId());
camelContext.getRouteController().startRoute(route.getId());
startedRoutes.add(route);
@@ -266,7 +271,7 @@ public final class ClusteredRoutePolicy extends RoutePolicySupport implements Ca
for (Route route : startedRoutes) {
ServiceStatus status = getStatus(route);
if (status != null && status.isStoppable()) {
- log.debug("Stopping route '{}'", route.getId());
+ LOG.debug("Stopping route '{}'", route.getId());
stopRoute(route);
stoppedRoutes.add(route);
@@ -280,7 +285,7 @@ public final class ClusteredRoutePolicy extends RoutePolicySupport implements Ca
}
private void onCamelContextStarted() {
- log.debug("Apply cluster policy (stopped-routes='{}', started-routes='{}')", stoppedRoutes.stream().map(Route::getId).collect(Collectors.joining(",")),
+ LOG.debug("Apply cluster policy (stopped-routes='{}', started-routes='{}')", stoppedRoutes.stream().map(Route::getId).collect(Collectors.joining(",")),
startedRoutes.stream().map(Route::getId).collect(Collectors.joining(",")));
clusterView.addEventListener(leadershipEventListener);
@@ -333,7 +338,7 @@ public final class ClusteredRoutePolicy extends RoutePolicySupport implements Ca
// Eventually delay the startup of the routes a later time
if (initialDelay.toMillis() > 0) {
- log.debug("Policy will be effective in {}", initialDelay);
+ LOG.debug("Policy will be effective in {}", initialDelay);
executorService.schedule(ClusteredRoutePolicy.this::onCamelContextStarted, initialDelay.toMillis(), TimeUnit.MILLISECONDS);
} else {
ClusteredRoutePolicy.this.onCamelContextStarted();
diff --git a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
index 093b864..cb9b996 100644
--- a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
+++ b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiCamelContextPublisher.java
@@ -33,6 +33,8 @@ import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import org.osgi.framework.Version;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This {@link org.apache.camel.spi.EventNotifier} is in charge of registering
@@ -40,6 +42,8 @@ import org.osgi.framework.Version;
*/
public class OsgiCamelContextPublisher extends EventNotifierSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(OsgiCamelContextPublisher.class);
+
public static final String CONTEXT_SYMBOLIC_NAME_PROPERTY = "camel.context.symbolicname";
public static final String CONTEXT_VERSION_PROPERTY = "camel.context.version";
public static final String CONTEXT_NAME_PROPERTY = "camel.context.name";
@@ -62,13 +66,13 @@ public class OsgiCamelContextPublisher extends EventNotifierSupport {
CamelContext context = ((CamelContextEvent) event).getContext();
ServiceRegistration<?> reg = registrations.remove(context);
if (reg != null) {
- if (log.isDebugEnabled()) {
- log.debug("Unregistering CamelContext [{}] from OSGi registry", context.getName());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Unregistering CamelContext [{}] from OSGi registry", context.getName());
}
try {
reg.unregister();
} catch (Exception e) {
- log.warn("Error unregistering CamelContext [" + context.getName() + "] from OSGi registry. This exception will be ignored.", e);
+ LOG.warn("Error unregistering CamelContext [" + context.getName() + "] from OSGi registry. This exception will be ignored.", e);
}
}
}
@@ -83,12 +87,12 @@ public class OsgiCamelContextPublisher extends EventNotifierSupport {
protected void doShutdown() throws Exception {
// clear and unregister any left-over registration (which should not happen)
if (!registrations.isEmpty()) {
- log.warn("On shutdown there are {} registrations which was supposed to have been unregistered already. Will unregister these now.", registrations.size());
+ LOG.warn("On shutdown there are {} registrations which was supposed to have been unregistered already. Will unregister these now.", registrations.size());
for (ServiceRegistration<?> reg : registrations.values()) {
try {
reg.unregister();
} catch (Exception e) {
- log.warn("Error unregistering from OSGi registry. This exception will be ignored.", e);
+ LOG.warn("Error unregistering from OSGi registry. This exception will be ignored.", e);
}
}
}
@@ -114,7 +118,7 @@ public class OsgiCamelContextPublisher extends EventNotifierSupport {
props.put(CONTEXT_MANAGEMENT_NAME_PROPERTY, managementName);
}
- log.debug("Registering CamelContext [{}] in OSGi registry", name);
+ LOG.debug("Registering CamelContext [{}] in OSGi registry", name);
ServiceRegistration<?> reg = bundleContext.registerService(CamelContext.class.getName(), camelContext, props);
if (reg != null) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/CustomIdFactoryTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/CustomIdFactoryTest.java
index 27ef44a..32a420e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/CustomIdFactoryTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/CustomIdFactoryTest.java
@@ -118,7 +118,7 @@ public class CustomIdFactoryTest extends ContextTestSupport {
return new DelegateProcessor(target) {
@Override
protected void processNext(Exchange exchange) throws Exception {
- log.debug("Debugging at: {} with id: {} with exchange: {}", definition, definition.getId(), exchange);
+ LOG.debug("Debugging at: {} with id: {} with exchange: {}", definition, definition.getId(), exchange);
// record the path taken at runtime
ids += definition.getId();
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/transformer/TransformerRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/transformer/TransformerRouteTest.java
index 27e4fbf..6cdeae1 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/transformer/TransformerRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/transformer/TransformerRouteTest.java
@@ -260,11 +260,11 @@ public class TransformerRouteTest extends ContextTestSupport {
public boolean process(Exchange exchange, AsyncCallback callback) {
Object input = exchange.getIn().getBody();
if (input instanceof XOrderResponse) {
- log.info("Endpoint: XOrderResponse -> XML");
+ LOG.info("Endpoint: XOrderResponse -> XML");
exchange.getIn().setBody("<XOrderResponse/>");
} else {
assertEquals("<XOrder/>", input);
- log.info("Endpoint: XML -> XOrder");
+ LOG.info("Endpoint: XML -> XOrder");
exchange.getIn().setBody(new XOrder());
}
@@ -294,7 +294,7 @@ public class TransformerRouteTest extends ContextTestSupport {
@Override
public void transform(Message message, DataType from, DataType to) throws Exception {
assertEquals("name=XOrder", message.getBody());
- log.info("Bean: Other -> XOrder");
+ LOG.info("Bean: Other -> XOrder");
message.setBody(new XOrder());
}
}
@@ -302,7 +302,7 @@ public class TransformerRouteTest extends ContextTestSupport {
public static class XOrderResponseToOtherTransformer extends Transformer {
@Override
public void transform(Message message, DataType from, DataType to) throws Exception {
- log.info("Bean: XOrderResponse -> Other");
+ LOG.info("Bean: XOrderResponse -> Other");
message.setBody("name=XOrderResponse");
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorRouteTest.java
index b131795..b649bc1 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorRouteTest.java
@@ -148,7 +148,7 @@ public class ValidatorRouteTest extends ContextTestSupport {
public void validate(Message message, DataType type) throws ValidationException {
message.getExchange().setProperty(VALIDATOR_INVOKED, OtherXOrderValidator.class);
assertEquals("name=XOrder", message.getBody());
- log.info("Java validation: other XOrder");
+ LOG.info("Java validation: other XOrder");
}
}
@@ -157,7 +157,7 @@ public class ValidatorRouteTest extends ContextTestSupport {
public void validate(Message message, DataType type) throws ValidationException {
message.getExchange().setProperty(VALIDATOR_INVOKED, OtherXOrderResponseValidator.class);
assertEquals("name=XOrderResponse", message.getBody());
- log.info("Java validation: other XOrderResponse");
+ LOG.info("Java validation: other XOrderResponse");
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MyLoggingSentEventNotifer.java b/core/camel-core/src/test/java/org/apache/camel/processor/MyLoggingSentEventNotifer.java
index 70e36d5..fe68393 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/MyLoggingSentEventNotifer.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/MyLoggingSentEventNotifer.java
@@ -19,16 +19,20 @@ package org.apache.camel.processor;
import org.apache.camel.spi.CamelEvent;
import org.apache.camel.spi.CamelEvent.ExchangeSentEvent;
import org.apache.camel.support.EventNotifierSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
// START SNIPPET: e1
public class MyLoggingSentEventNotifer extends EventNotifierSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(MyLoggingSentEventNotifer.class);
+
@Override
public void notify(CamelEvent event) throws Exception {
// react only when its the sent event
if (event instanceof ExchangeSentEvent) {
ExchangeSentEvent sent = (ExchangeSentEvent)event;
- log.info("Took {} millis to send to: {}", sent.getTimeTaken(), sent.getEndpoint());
+ LOG.info("Took {} millis to send to: {}", sent.getTimeTaken(), sent.getEndpoint());
}
}
diff --git a/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/ValidatingProcessor.java b/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/ValidatingProcessor.java
index 314c6cf..e08fa00 100644
--- a/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/ValidatingProcessor.java
+++ b/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/ValidatingProcessor.java
@@ -37,6 +37,8 @@ import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import javax.xml.validation.Validator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Node;
import org.w3c.dom.ls.LSResourceResolver;
@@ -60,6 +62,8 @@ import static org.apache.camel.support.processor.validation.SchemaReader.ACCESS_
*/
public class ValidatingProcessor extends AsyncProcessorSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(ValidatingProcessor.class);
+
private final SchemaReader schemaReader;
private ValidatorErrorHandler errorHandler = new DefaultValidationErrorHandler();
private boolean useSharedSchema = true;
@@ -102,11 +106,11 @@ public class ValidatingProcessor extends AsyncProcessorSupport {
// turn off access to external schema by default
if (!Boolean.parseBoolean(exchange.getContext().getGlobalOptions().get(ACCESS_EXTERNAL_DTD))) {
try {
- log.debug("Configuring Validator to not allow access to external DTD/Schema");
+ LOG.debug("Configuring Validator to not allow access to external DTD/Schema");
validator.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
validator.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
} catch (SAXException e) {
- log.warn(e.getMessage(), e);
+ LOG.warn(e.getMessage(), e);
}
}
@@ -160,7 +164,7 @@ public class ValidatingProcessor extends AsyncProcessorSupport {
validator.setErrorHandler(handler);
try {
- log.trace("Validating {}", source);
+ LOG.trace("Validating {}", source);
validator.validate(source, result);
handler.handleErrors(exchange, schema, result);
} catch (SAXParseException e) {
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index 74d1344..d6540f4 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -479,7 +479,7 @@ public abstract class BaseMainSupport extends ServiceSupport {
// invoke configure method if exists
Method method = findMethod(config.getClass(), "configure");
if (method != null) {
- log.info("Calling configure method on configuration class: {}", config.getClass().getName());
+ LOG.info("Calling configure method on configuration class: {}", config.getClass().getName());
invokeMethod(method, config);
}
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/DefaultInstrumentationProcessor.java b/core/camel-management/src/main/java/org/apache/camel/management/DefaultInstrumentationProcessor.java
index 52f4042..a6dd4f9f 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/DefaultInstrumentationProcessor.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/DefaultInstrumentationProcessor.java
@@ -24,6 +24,8 @@ import org.apache.camel.management.mbean.ManagedPerformanceCounter;
import org.apache.camel.spi.ManagementInterceptStrategy.InstrumentationProcessor;
import org.apache.camel.support.processor.DelegateAsyncProcessor;
import org.apache.camel.util.StopWatch;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* JMX enabled processor or advice that uses the {@link org.apache.camel.management.mbean.ManagedCounter} for instrumenting
@@ -35,6 +37,9 @@ import org.apache.camel.util.StopWatch;
public class DefaultInstrumentationProcessor extends DelegateAsyncProcessor
implements InstrumentationProcessor<StopWatch>, Ordered {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultInstrumentationProcessor.class);
+
+
private PerformanceCounter counter;
private String type;
@@ -91,8 +96,8 @@ public class DefaultInstrumentationProcessor extends DelegateAsyncProcessor
}
protected void recordTime(Exchange exchange, long duration) {
- if (log.isTraceEnabled()) {
- log.trace("{}Recording duration: {} millis for exchange: {}", type != null ? type + ": " : "", duration, exchange);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("{}Recording duration: {} millis for exchange: {}", type != null ? type + ": " : "", duration, exchange);
}
if (!exchange.isFailed() && exchange.getException() == null) {
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java
index 755539a..72f1c9a 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.management;
+import javax.management.JMException;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -26,10 +29,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ThreadPoolExecutor;
-import javax.management.JMException;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Channel;
@@ -112,6 +111,8 @@ import org.apache.camel.throttling.ThrottlingExceptionRoutePolicy;
import org.apache.camel.throttling.ThrottlingInflightRoutePolicy;
import org.apache.camel.util.KeyValueHolder;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default JMX managed lifecycle strategy that registered objects using the configured
@@ -121,6 +122,8 @@ import org.apache.camel.util.ObjectHelper;
*/
public class JmxManagementLifecycleStrategy extends ServiceSupport implements LifecycleStrategy, CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(JmxManagementLifecycleStrategy.class);
+
// the wrapped processors is for performance counters, which are in use for the created routes
// when a route is removed, we should remove the associated processors from this map
private final Map<Processor, KeyValueHolder<NamedNode, InstrumentationProcessor>> wrappedProcessors = new HashMap<>();
@@ -198,7 +201,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
throw new VetoCamelContextStartException("CamelContext (" + context.getName() + ") with ObjectName[" + on + "] is already registered."
+ " Make sure to use unique names on CamelContext when using multiple CamelContexts in the same MBeanServer.", context);
} else {
- log.warn("This CamelContext(" + context.getName() + ") will be registered using the name: " + managementName
+ LOG.warn("This CamelContext(" + context.getName() + ") will be registered using the name: " + managementName
+ " due to clash with an existing name already registered in MBeanServer.");
}
}
@@ -241,7 +244,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
}
manageObject(me);
} catch (Exception e) {
- log.warn("Could not register CamelHealth MBean. This exception will be ignored.", e);
+ LOG.warn("Could not register CamelHealth MBean. This exception will be ignored.", e);
}
try {
@@ -252,7 +255,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
}
manageObject(me);
} catch (Exception e) {
- log.warn("Could not register RouteController MBean. This exception will be ignored.", e);
+ LOG.warn("Could not register RouteController MBean. This exception will be ignored.", e);
}
}
@@ -270,8 +273,8 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
newName = strategy.getNextName();
ObjectName on = getManagementStrategy().getManagementObjectNameStrategy().getObjectNameForCamelContext(newName, name);
done = !getManagementStrategy().isManagedName(on);
- if (log.isTraceEnabled()) {
- log.trace("Using name: {} in ObjectName[{}] exists? {}", name, on, done);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Using name: {} in ObjectName[{}] exists? {}", name, on, done);
}
}
return newName;
@@ -291,7 +294,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
return;
}
- log.debug("Registering {} pre registered services", preServices.size());
+ LOG.debug("Registering {} pre registered services", preServices.size());
for (PreRegisterService pre : preServices) {
if (pre.getComponent() != null) {
onComponentAdd(pre.getName(), pre.getComponent());
@@ -320,7 +323,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
unmanageObject(mc);
}
} catch (Exception e) {
- log.warn("Could not unregister RouteController MBean", e);
+ LOG.warn("Could not unregister RouteController MBean", e);
}
try {
@@ -330,7 +333,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
unmanageObject(mc);
}
} catch (Exception e) {
- log.warn("Could not unregister CamelHealth MBean", e);
+ LOG.warn("Could not unregister CamelHealth MBean", e);
}
try {
@@ -340,7 +343,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
unmanageObject(mc);
}
} catch (Exception e) {
- log.warn("Could not unregister CamelContext MBean", e);
+ LOG.warn("Could not unregister CamelContext MBean", e);
}
camelContextMBean = null;
@@ -360,7 +363,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
Object mc = getManagementObjectStrategy().getManagedObjectForComponent(camelContext, component, name);
manageObject(mc);
} catch (Exception e) {
- log.warn("Could not register Component MBean", e);
+ LOG.warn("Could not register Component MBean", e);
}
}
@@ -374,7 +377,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
Object mc = getManagementObjectStrategy().getManagedObjectForComponent(camelContext, component, name);
unmanageObject(mc);
} catch (Exception e) {
- log.warn("Could not unregister Component MBean", e);
+ LOG.warn("Could not unregister Component MBean", e);
}
}
@@ -408,7 +411,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
}
manageObject(me);
} catch (Exception e) {
- log.warn("Could not register Endpoint MBean for endpoint: " + endpoint + ". This exception will be ignored.", e);
+ LOG.warn("Could not register Endpoint MBean for endpoint: " + endpoint + ". This exception will be ignored.", e);
}
}
@@ -423,7 +426,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
Object me = getManagementObjectStrategy().getManagedObjectForEndpoint(camelContext, endpoint);
unmanageObject(me);
} catch (Exception e) {
- log.warn("Could not unregister Endpoint MBean for endpoint: " + endpoint + ". This exception will be ignored.", e);
+ LOG.warn("Could not unregister Endpoint MBean for endpoint: " + endpoint + ". This exception will be ignored.", e);
}
}
@@ -453,14 +456,14 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
// skip already managed services, for example if a route has been restarted
if (getManagementStrategy().isManaged(managedObject)) {
- log.trace("The service is already managed: {}", service);
+ LOG.trace("The service is already managed: {}", service);
return;
}
try {
manageObject(managedObject);
} catch (Exception e) {
- log.warn("Could not register service: " + service + " as Service MBean.", e);
+ LOG.warn("Could not register service: " + service + " as Service MBean.", e);
}
}
@@ -476,7 +479,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
try {
unmanageObject(managedObject);
} catch (Exception e) {
- log.warn("Could not unregister service: " + service + " as Service MBean.", e);
+ LOG.warn("Could not unregister service: " + service + " as Service MBean.", e);
}
}
}
@@ -625,7 +628,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
// skip already managed routes, for example if the route has been restarted
if (getManagementStrategy().isManaged(mr)) {
- log.trace("The route is already managed: {}", route);
+ LOG.trace("The route is already managed: {}", route);
continue;
}
@@ -651,9 +654,9 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
try {
manageObject(mr);
} catch (JMException e) {
- log.warn("Could not register Route MBean", e);
+ LOG.warn("Could not register Route MBean", e);
} catch (Exception e) {
- log.warn("Could not create Route MBean", e);
+ LOG.warn("Could not create Route MBean", e);
}
}
}
@@ -670,14 +673,14 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
// skip unmanaged routes
if (!getManagementStrategy().isManaged(mr)) {
- log.trace("The route is not managed: {}", route);
+ LOG.trace("The route is not managed: {}", route);
continue;
}
try {
unmanageObject(mr);
} catch (Exception e) {
- log.warn("Could not unregister Route MBean", e);
+ LOG.warn("Could not unregister Route MBean", e);
}
// remove from known routes ids, as the route has been removed
@@ -700,14 +703,14 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
// skip already managed services, for example if a route has been restarted
if (getManagementStrategy().isManaged(me)) {
- log.trace("The error handler builder is already managed: {}", errorHandlerBuilder);
+ LOG.trace("The error handler builder is already managed: {}", errorHandlerBuilder);
return;
}
try {
manageObject(me);
} catch (Exception e) {
- log.warn("Could not register error handler builder: " + errorHandlerBuilder + " as ErrorHandler MBean.", e);
+ LOG.warn("Could not register error handler builder: " + errorHandlerBuilder + " as ErrorHandler MBean.", e);
}
}
@@ -722,7 +725,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
try {
unmanageObject(me);
} catch (Exception e) {
- log.warn("Could not unregister error handler: " + me + " as ErrorHandler MBean.", e);
+ LOG.warn("Could not unregister error handler: " + me + " as ErrorHandler MBean.", e);
}
}
}
@@ -740,7 +743,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
// skip already managed services, for example if a route has been restarted
if (getManagementStrategy().isManaged(mtp)) {
- log.trace("The thread pool is already managed: {}", threadPool);
+ LOG.trace("The thread pool is already managed: {}", threadPool);
return;
}
@@ -750,7 +753,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
// we need to keep track here, as we cannot re-construct the thread pool ObjectName when removing the thread pool
managedThreadPools.put(threadPool, mtp);
} catch (Exception e) {
- log.warn("Could not register thread pool: " + threadPool + " as ThreadPool MBean.", e);
+ LOG.warn("Could not register thread pool: " + threadPool + " as ThreadPool MBean.", e);
}
}
@@ -765,14 +768,14 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
if (mtp != null) {
// skip unmanaged routes
if (!getManagementStrategy().isManaged(mtp)) {
- log.trace("The thread pool is not managed: {}", threadPool);
+ LOG.trace("The thread pool is not managed: {}", threadPool);
return;
}
try {
unmanageObject(mtp);
} catch (Exception e) {
- log.warn("Could not unregister ThreadPool MBean", e);
+ LOG.warn("Could not unregister ThreadPool MBean", e);
}
}
}
@@ -942,7 +945,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
return false;
}
- log.trace("Checking whether to register {} from route: {}", service, route);
+ LOG.trace("Checking whether to register {} from route: {}", service, route);
ManagementAgent agent = getManagementStrategy().getManagementAgent();
if (agent == null) {
@@ -997,7 +1000,7 @@ public class JmxManagementLifecycleStrategy extends ServiceSupport implements Li
&& camelContext.getManagementStrategy().getManagementAgent().getLoadStatisticsEnabled();
boolean disabled = !load || camelContext.getManagementStrategy().getManagementAgent().getStatisticsLevel() == ManagementStatisticsLevel.Off;
- log.debug("Load performance statistics {}", disabled ? "disabled" : "enabled");
+ LOG.debug("Load performance statistics {}", disabled ? "disabled" : "enabled");
if (!disabled) {
// must use 1 sec interval as the load statistics is based on 1 sec calculations
loadTimer.setInterval(1000);
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategy.java b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategy.java
index 860f764..7c10d77 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategy.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategy.java
@@ -25,6 +25,8 @@ import org.apache.camel.impl.engine.DefaultManagementStrategy;
import org.apache.camel.spi.ManagementAgent;
import org.apache.camel.spi.ManagementObjectNameStrategy;
import org.apache.camel.spi.ManagementObjectStrategy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A JMX capable {@link org.apache.camel.spi.ManagementStrategy} that Camel by default uses if possible.
@@ -36,6 +38,8 @@ import org.apache.camel.spi.ManagementObjectStrategy;
*/
public class JmxManagementStrategy extends DefaultManagementStrategy {
+ private static final Logger LOG = LoggerFactory.getLogger(JmxManagementStrategy.class);
+
public JmxManagementStrategy() {
}
@@ -69,7 +73,7 @@ public class JmxManagementStrategy extends DefaultManagementStrategy {
return getManagementAgent().isRegistered(name);
}
} catch (Exception e) {
- log.warn("Cannot check whether the managed object is registered. This exception will be ignored.", e);
+ LOG.warn("Cannot check whether the managed object is registered. This exception will be ignored.", e);
}
return false;
}
@@ -81,7 +85,7 @@ public class JmxManagementStrategy extends DefaultManagementStrategy {
return getManagementAgent().isRegistered((ObjectName) name);
}
} catch (Exception e) {
- log.warn("Cannot check whether the managed object is registered. This exception will be ignored.", e);
+ LOG.warn("Cannot check whether the managed object is registered. This exception will be ignored.", e);
}
return false;
}
@@ -93,7 +97,7 @@ public class JmxManagementStrategy extends DefaultManagementStrategy {
@Override
protected void doStart() throws Exception {
- log.info("JMX is enabled");
+ LOG.info("JMX is enabled");
doStartManagementStrategy();
}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/PublishEventNotifier.java b/core/camel-management/src/main/java/org/apache/camel/management/PublishEventNotifier.java
index 7abdbfa..687d201 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/PublishEventNotifier.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/PublishEventNotifier.java
@@ -28,6 +28,8 @@ import org.apache.camel.support.EventNotifierSupport;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A {@link org.apache.camel.spi.EventNotifier} which publishes the {@link EventObject} to some
@@ -39,6 +41,8 @@ import org.apache.camel.util.URISupport;
*/
public class PublishEventNotifier extends EventNotifierSupport implements CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(PublishEventNotifier.class);
+
private CamelContext camelContext;
private Endpoint endpoint;
private String endpointUri;
@@ -48,13 +52,13 @@ public class PublishEventNotifier extends EventNotifierSupport implements CamelC
public void notify(CamelEvent event) throws Exception {
// only notify when we are started
if (!isStarted()) {
- log.debug("Cannot publish event as notifier is not started: {}", event);
+ LOG.debug("Cannot publish event as notifier is not started: {}", event);
return;
}
// only notify when camel context is running
if (!camelContext.getStatus().isStarted()) {
- log.debug("Cannot publish event as CamelContext is not started: {}", event);
+ LOG.debug("Cannot publish event as CamelContext is not started: {}", event);
return;
}
diff --git a/core/camel-management/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingSendProcessorTest.java b/core/camel-management/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingSendProcessorTest.java
index 0d5b30a..51a659b 100644
--- a/core/camel-management/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingSendProcessorTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingSendProcessorTest.java
@@ -29,9 +29,13 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultAsyncProducer;
import org.apache.camel.support.DefaultEndpoint;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ReduceStacksNeededDuringRoutingSendProcessorTest extends ContextTestSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(ReduceStacksNeededDuringRoutingSendProcessorTest.class);
+
@Override
protected boolean useJmx() {
return true;
@@ -100,8 +104,8 @@ public class ReduceStacksNeededDuringRoutingSendProcessorTest extends ContextTes
throw new IllegalArgumentException("Forced to dump stacktrace");
} catch (Exception e) {
e.fillInStackTrace();
- log.info("There are " + e.getStackTrace().length + " lines in the stacktrace");
- log.error("Dump stacktrace to log", e);
+ LOG.info("There are " + e.getStackTrace().length + " lines in the stacktrace");
+ LOG.error("Dump stacktrace to log", e);
}
callback.done(true);
return true;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ChildServiceSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/ChildServiceSupport.java
index 44c0248..f5577f9 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ChildServiceSupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ChildServiceSupport.java
@@ -35,30 +35,24 @@ public abstract class ChildServiceSupport extends ServiceSupport {
public void start() {
synchronized (lock) {
if (status == STARTED) {
- log.trace("Service: {} already started", this);
return;
}
if (status == STARTING) {
- log.trace("Service: {} already starting", this);
return;
}
try {
initService(childServices);
} catch (Exception e) {
status = FAILED;
- log.trace("Error while initializing service: " + this, e);
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
try {
status = STARTING;
- log.trace("Starting service: {}", this);
ServiceHelper.startService(childServices);
doStart();
status = STARTED;
- log.trace("Service: {} started", this);
} catch (Exception e) {
status = FAILED;
- log.trace("Error while starting service: " + this, e);
ServiceHelper.stopService(childServices);
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
@@ -69,23 +63,18 @@ public abstract class ChildServiceSupport extends ServiceSupport {
public void stop() {
synchronized (lock) {
if (status == STOPPED || status == SHUTTINGDOWN || status == SHUTDOWN) {
- log.trace("Service: {} already stopped", this);
return;
}
if (status == STOPPING) {
- log.trace("Service: {} already stopping", this);
return;
}
status = STOPPING;
- log.trace("Stopping service: {}", this);
try {
doStop();
ServiceHelper.stopService(childServices);
status = STOPPED;
- log.trace("Service: {} stopped service", this);
} catch (Exception e) {
status = FAILED;
- log.trace("Error while stopping service: " + this, e);
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
}
@@ -95,24 +84,19 @@ public abstract class ChildServiceSupport extends ServiceSupport {
public void shutdown() {
synchronized (lock) {
if (status == SHUTDOWN) {
- log.trace("Service: {} already shut down", this);
return;
}
if (status == SHUTTINGDOWN) {
- log.trace("Service: {} already shutting down", this);
return;
}
stop();
status = SHUTDOWN;
- log.trace("Shutting down service: {}", this);
try {
doShutdown();
ServiceHelper.stopAndShutdownServices(childServices);
- log.trace("Service: {} shut down", this);
status = SHUTDOWN;
} catch (Exception e) {
status = FAILED;
- log.trace("Error shutting down service: " + this, e);
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java
index da53ee4..78a5390 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultComponent.java
@@ -47,12 +47,16 @@ import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
import org.apache.camel.util.function.Suppliers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default component to use for base for components implementations.
*/
public abstract class DefaultComponent extends ServiceSupport implements Component {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultComponent.class);
+
/**
* Simple RAW() pattern used only for validating URI in this class
*/
@@ -132,12 +136,12 @@ public abstract class DefaultComponent extends ServiceSupport implements Compone
parameters.remove("hash");
validateURI(uri, path, parameters);
- if (log.isTraceEnabled()) {
+ if (LOG.isTraceEnabled()) {
// at trace level its okay to have parameters logged, that may contain passwords
- log.trace("Creating endpoint uri=[{}], path=[{}], parameters=[{}]", URISupport.sanitizeUri(uri), URISupport.sanitizePath(path), parameters);
- } else if (log.isDebugEnabled()) {
+ LOG.trace("Creating endpoint uri=[{}], path=[{}], parameters=[{}]", URISupport.sanitizeUri(uri), URISupport.sanitizePath(path), parameters);
+ } else if (LOG.isDebugEnabled()) {
// but at debug level only output sanitized uris
- log.debug("Creating endpoint uri=[{}], path=[{}]", URISupport.sanitizeUri(uri), URISupport.sanitizePath(path));
+ LOG.debug("Creating endpoint uri=[{}], path=[{}]", URISupport.sanitizeUri(uri), URISupport.sanitizePath(path));
}
// extract these global options and infer their value based on global/component level configuration
@@ -222,12 +226,12 @@ public abstract class DefaultComponent extends ServiceSupport implements Compone
uri = useRawUri() ? uri : encodedUri;
validateURI(uri, path, parameters);
- if (log.isTraceEnabled()) {
+ if (LOG.isTraceEnabled()) {
// at trace level its okay to have parameters logged, that may contain passwords
- log.trace("Creating endpoint uri=[{}], path=[{}], parameters=[{}]", URISupport.sanitizeUri(uri), URISupport.sanitizePath(path), parameters);
- } else if (log.isDebugEnabled()) {
+ LOG.trace("Creating endpoint uri=[{}], path=[{}], parameters=[{}]", URISupport.sanitizeUri(uri), URISupport.sanitizePath(path), parameters);
+ } else if (LOG.isDebugEnabled()) {
// but at debug level only output sanitized uris
- log.debug("Creating endpoint uri=[{}], path=[{}]", URISupport.sanitizeUri(uri), URISupport.sanitizePath(path));
+ LOG.debug("Creating endpoint uri=[{}], path=[{}]", URISupport.sanitizeUri(uri), URISupport.sanitizePath(path));
}
// extract these global options and infer their value based on global/component level configuration
@@ -408,33 +412,33 @@ public abstract class DefaultComponent extends ServiceSupport implements Compone
}
try {
final Registry registry = getCamelContext().getRegistry();
- log.trace("Discovering optional component property configurer class for component: {}", name);
+ LOG.trace("Discovering optional component property configurer class for component: {}", name);
final String componentConfigurerName = name + "-component-configurer";
componentPropertyConfigurer = registry.lookupByNameAndType(componentConfigurerName, GeneratedPropertyConfigurer.class);
- if (log.isDebugEnabled() && componentPropertyConfigurer != null) {
- log.debug("Discovered component property configurer using the Camel registry: {} -> {}", componentConfigurerName, componentPropertyConfigurer);
+ if (LOG.isDebugEnabled() && componentPropertyConfigurer != null) {
+ LOG.debug("Discovered component property configurer using the Camel registry: {} -> {}", componentConfigurerName, componentPropertyConfigurer);
}
if (componentPropertyConfigurer == null) {
final Optional<Class<?>> clazz = getCamelContext().adapt(ExtendedCamelContext.class).getFactoryFinder(RESOURCE_PATH)
.findOptionalClass(name + "-component", null);
clazz.ifPresent(c -> componentPropertyConfigurer = org.apache.camel.support.ObjectHelper.newInstance(c, GeneratedPropertyConfigurer.class));
- if (log.isDebugEnabled() && componentPropertyConfigurer != null) {
- log.debug("Discovered component property configurer using the FactoryFinder: {} -> {}", name, componentPropertyConfigurer);
+ if (LOG.isDebugEnabled() && componentPropertyConfigurer != null) {
+ LOG.debug("Discovered component property configurer using the FactoryFinder: {} -> {}", name, componentPropertyConfigurer);
}
}
- log.trace("Discovering optional endpoint property configurer class for component: {}", name);
+ LOG.trace("Discovering optional endpoint property configurer class for component: {}", name);
final String endpointConfigurerName = name + "-endpoint-configurer";
endpointPropertyConfigurer = registry.lookupByNameAndType(endpointConfigurerName, GeneratedPropertyConfigurer.class);
- if (log.isDebugEnabled() && endpointPropertyConfigurer != null) {
- log.debug("Discovered endpoint property configurer using the Camel registry: {} -> {}", endpointConfigurerName, endpointPropertyConfigurer);
+ if (LOG.isDebugEnabled() && endpointPropertyConfigurer != null) {
+ LOG.debug("Discovered endpoint property configurer using the Camel registry: {} -> {}", endpointConfigurerName, endpointPropertyConfigurer);
}
if (endpointPropertyConfigurer == null) {
final Optional<Class<?>> clazz = getCamelContext().adapt(ExtendedCamelContext.class).getFactoryFinder(RESOURCE_PATH)
.findOptionalClass(name + "-endpoint", null);
clazz.ifPresent(c -> endpointPropertyConfigurer = org.apache.camel.support.ObjectHelper.newInstance(c, GeneratedPropertyConfigurer.class));
- if (log.isDebugEnabled() && endpointPropertyConfigurer != null) {
- log.debug("Discovered endpoint property configurer using the FactoryFinder: {} -> {}", name, endpointPropertyConfigurer);
+ if (LOG.isDebugEnabled() && endpointPropertyConfigurer != null) {
+ LOG.debug("Discovered endpoint property configurer using the FactoryFinder: {} -> {}", name, endpointPropertyConfigurer);
}
}
} catch (NoFactoryAvailableException e) {
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultConsumer.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultConsumer.java
index 1248651..10bce1c 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultConsumer.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultConsumer.java
@@ -31,12 +31,16 @@ import org.apache.camel.spi.UnitOfWork;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A default consumer useful for implementation inheritance.
*/
public class DefaultConsumer extends ServiceSupport implements Consumer, RouteAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultConsumer.class);
+
private transient String consumerToString;
private final Endpoint endpoint;
private final Processor processor;
@@ -152,19 +156,19 @@ public class DefaultConsumer extends ServiceSupport implements Consumer, RouteAw
@Override
protected void doInit() throws Exception {
- log.debug("Init consumer: {}", this);
+ LOG.debug("Init consumer: {}", this);
ServiceHelper.initService(processor);
}
@Override
protected void doStop() throws Exception {
- log.debug("Stopping consumer: {}", this);
+ LOG.debug("Stopping consumer: {}", this);
ServiceHelper.stopService(processor);
}
@Override
protected void doStart() throws Exception {
- log.debug("Starting consumer: {}", this);
+ LOG.debug("Starting consumer: {}", this);
ServiceHelper.startService(processor);
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java
index 5a64175..d0dea66 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultEndpoint.java
@@ -36,6 +36,8 @@ import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A default endpoint useful for implementation inheritance.
@@ -50,6 +52,8 @@ import org.apache.camel.util.URISupport;
*/
public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint, HasId, CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultEndpoint.class);
+
private final String id = EndpointHelper.createEndpointId();
private transient String endpointUriToString;
private volatile String endpointUri;
@@ -212,9 +216,9 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint
@Override
public PollingConsumer createPollingConsumer() throws Exception {
// should not call configurePollingConsumer when its EventDrivenPollingConsumer
- if (log.isDebugEnabled()) {
- log.debug("Creating EventDrivenPollingConsumer with queueSize: {} blockWhenFull: {} blockTimeout: {}",
- new Object[]{getPollingConsumerQueueSize(), isPollingConsumerBlockWhenFull(), getPollingConsumerBlockTimeout()});
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Creating EventDrivenPollingConsumer with queueSize: {} blockWhenFull: {} blockTimeout: {}",
+ getPollingConsumerQueueSize(), isPollingConsumerBlockWhenFull(), getPollingConsumerBlockTimeout());
}
EventDrivenPollingConsumer consumer = new EventDrivenPollingConsumer(this, getPollingConsumerQueueSize());
consumer.setBlockWhenFull(isPollingConsumerBlockWhenFull());
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultProducer.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultProducer.java
index 732119c..dc4dc48 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultProducer.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultProducer.java
@@ -21,12 +21,16 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A default implementation of {@link Producer} for implementation inheritance.
*/
public abstract class DefaultProducer extends ServiceSupport implements Producer {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultProducer.class);
+
private transient String producerToString;
private final Endpoint endpoint;
@@ -63,9 +67,9 @@ public abstract class DefaultProducer extends ServiceSupport implements Producer
protected void doStart() throws Exception {
// log at debug level for singletons, for prototype scoped log at trace level to not spam logs
if (isSingleton()) {
- log.debug("Starting producer: {}", this);
+ LOG.debug("Starting producer: {}", this);
} else {
- log.trace("Starting producer: {}", this);
+ LOG.trace("Starting producer: {}", this);
}
}
@@ -73,9 +77,9 @@ public abstract class DefaultProducer extends ServiceSupport implements Producer
protected void doStop() throws Exception {
// log at debug level for singletons, for prototype scoped log at trace level to not spam logs
if (isSingleton()) {
- log.debug("Stopping producer: {}", this);
+ LOG.debug("Stopping producer: {}", this);
} else {
- log.trace("Stopping producer: {}", this);
+ LOG.trace("Stopping producer: {}", this);
}
}
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumer.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumer.java
index d0450c7..134af0f 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumer.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumer.java
@@ -23,12 +23,17 @@ import org.apache.camel.Exchange;
import org.apache.camel.PollingConsumer;
import org.apache.camel.Processor;
import org.apache.camel.support.service.ServiceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A default implementation of an event driven {@link org.apache.camel.Consumer} which uses the
* {@link PollingConsumer}
*/
public class DefaultScheduledPollConsumer extends ScheduledPollConsumer {
+
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultScheduledPollConsumer.class);
+
private PollingConsumer pollingConsumer;
private int timeout;
@@ -59,7 +64,7 @@ public class DefaultScheduledPollConsumer extends ScheduledPollConsumer {
}
messagesPolled++;
- log.trace("Polled {} {}", messagesPolled, exchange);
+ LOG.trace("Polled {} {}", messagesPolled, exchange);
// prepare for processing where message should be IN
ExchangeHelper.prepareOutToIn(exchange);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
index ed2c3d5..7e5a87c 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
@@ -28,12 +28,16 @@ import org.apache.camel.Consumer;
import org.apache.camel.spi.ScheduledPollConsumerScheduler;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default {@link ScheduledBatchPollingConsumer}.
*/
public class DefaultScheduledPollConsumerScheduler extends ServiceSupport implements ScheduledPollConsumerScheduler {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultScheduledPollConsumerScheduler.class);
+
private CamelContext camelContext;
private Consumer consumer;
private ScheduledExecutorService scheduledExecutorService;
@@ -137,16 +141,16 @@ public class DefaultScheduledPollConsumerScheduler extends ServiceSupport implem
// only schedule task if we have not already done that
if (futures.size() == 0) {
if (isUseFixedDelay()) {
- if (log.isDebugEnabled()) {
- log.debug("Scheduling poll (fixed delay) with initialDelay: {}, delay: {} ({}) for: {}",
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Scheduling poll (fixed delay) with initialDelay: {}, delay: {} ({}) for: {}",
new Object[]{getInitialDelay(), getDelay(), getTimeUnit().name().toLowerCase(Locale.ENGLISH), consumer.getEndpoint()});
}
for (int i = 0; i < concurrentTasks; i++) {
futures.add(scheduledExecutorService.scheduleWithFixedDelay(task, getInitialDelay(), getDelay(), getTimeUnit()));
}
} else {
- if (log.isDebugEnabled()) {
- log.debug("Scheduling poll (fixed rate) with initialDelay: {}, delay: {} ({}) for: {}",
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Scheduling poll (fixed rate) with initialDelay: {}, delay: {} ({}) for: {}",
new Object[]{getInitialDelay(), getDelay(), getTimeUnit().name().toLowerCase(Locale.ENGLISH), consumer.getEndpoint()});
}
for (int i = 0; i < concurrentTasks; i++) {
@@ -180,7 +184,7 @@ public class DefaultScheduledPollConsumerScheduler extends ServiceSupport implem
@Override
protected void doStop() throws Exception {
if (isSchedulerStarted()) {
- log.debug("This consumer is stopping, so cancelling scheduled task: {}", futures);
+ LOG.debug("This consumer is stopping, so cancelling scheduled task: {}", futures);
for (ScheduledFuture<?> future : futures) {
future.cancel(true);
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/EventDrivenPollingConsumer.java b/core/camel-support/src/main/java/org/apache/camel/support/EventDrivenPollingConsumer.java
index a54539f..e67f0fd 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/EventDrivenPollingConsumer.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/EventDrivenPollingConsumer.java
@@ -31,6 +31,8 @@ import org.apache.camel.PollingConsumerPollingStrategy;
import org.apache.camel.Processor;
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.support.service.ServiceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A default implementation of the {@link org.apache.camel.PollingConsumer} which uses the normal
@@ -39,6 +41,8 @@ import org.apache.camel.support.service.ServiceHelper;
*/
public class EventDrivenPollingConsumer extends PollingConsumerSupport implements Processor, IsSingleton {
+ private static final Logger LOG = LoggerFactory.getLogger(EventDrivenPollingConsumer.class);
+
private final BlockingQueue<Exchange> queue;
private ExceptionHandler interruptedExceptionHandler;
private Consumer consumer;
@@ -129,7 +133,7 @@ public class EventDrivenPollingConsumer extends PollingConsumerSupport implement
}
}
}
- log.trace("Consumer is not running, so returning null");
+ LOG.trace("Consumer is not running, so returning null");
return null;
}
@@ -169,7 +173,7 @@ public class EventDrivenPollingConsumer extends PollingConsumerSupport implement
}
} catch (InterruptedException e) {
// ignore
- log.debug("Put interrupted, are we stopping? {}", isStopping() || isStopped());
+ LOG.debug("Put interrupted, are we stopping? {}", isStopping() || isStopped());
}
} else {
queue.add(exchange);
@@ -198,7 +202,7 @@ public class EventDrivenPollingConsumer extends PollingConsumerSupport implement
try {
timeout = strategy.beforePoll(timeout);
} catch (Exception e) {
- log.debug("Error occurred before polling " + consumer + ". This exception will be ignored.", e);
+ LOG.debug("Error occurred before polling " + consumer + ". This exception will be ignored.", e);
}
}
return timeout;
@@ -210,7 +214,7 @@ public class EventDrivenPollingConsumer extends PollingConsumerSupport implement
try {
strategy.afterPoll();
} catch (Exception e) {
- log.debug("Error occurred after polling " + consumer + ". This exception will be ignored.", e);
+ LOG.debug("Error occurred after polling " + consumer + ". This exception will be ignored.", e);
}
}
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/RoutePolicySupport.java b/core/camel-support/src/main/java/org/apache/camel/support/RoutePolicySupport.java
index a100781..2c3d93e 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/RoutePolicySupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/RoutePolicySupport.java
@@ -84,7 +84,6 @@ public abstract class RoutePolicySupport extends ServiceSupport implements Route
*/
public void startConsumer(Consumer consumer) throws Exception {
ServiceHelper.startService(consumer);
- log.debug("Started consumer {}", consumer);
}
/**
@@ -96,7 +95,6 @@ public abstract class RoutePolicySupport extends ServiceSupport implements Route
public void stopConsumer(Consumer consumer) throws Exception {
// stop and shutdown
ServiceHelper.stopAndShutdownServices(consumer);
- log.debug("Stopped consumer {}", consumer);
}
/**
@@ -109,13 +107,7 @@ public abstract class RoutePolicySupport extends ServiceSupport implements Route
* @return <tt>true</tt> if the consumer was suspended or stopped, <tt>false</tt> if the consumer was already suspend or stopped
*/
public boolean suspendOrStopConsumer(Consumer consumer) throws Exception {
- boolean suspended = ServiceHelper.suspendService(consumer);
- if (suspended) {
- log.debug("Suspended consumer {}", consumer);
- } else {
- log.trace("Consumer already suspended {}", consumer);
- }
- return suspended;
+ return ServiceHelper.suspendService(consumer);
}
/**
@@ -128,13 +120,7 @@ public abstract class RoutePolicySupport extends ServiceSupport implements Route
* @return <tt>true</tt> if the consumer was resumed or started, <tt>false</tt> if the consumer was already resumed or started
*/
public boolean resumeOrStartConsumer(Consumer consumer) throws Exception {
- boolean resumed = ServiceHelper.resumeService(consumer);
- if (resumed) {
- log.debug("Resumed consumer {}", consumer);
- } else {
- log.trace("Consumer already resumed {}", consumer);
- }
- return resumed;
+ return ServiceHelper.resumeService(consumer);
}
public void startRoute(Route route) throws Exception {
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledBatchPollingConsumer.java b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledBatchPollingConsumer.java
index 4ca2e5a..df28620 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledBatchPollingConsumer.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledBatchPollingConsumer.java
@@ -24,12 +24,16 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.ShutdownRunningTask;
import org.apache.camel.spi.ShutdownAware;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A useful base class for any consumer which is polling batch based
*/
public abstract class ScheduledBatchPollingConsumer extends ScheduledPollConsumer implements BatchConsumer, ShutdownAware {
+ private static final Logger LOG = LoggerFactory.getLogger(ScheduledBatchPollingConsumer.class);
+
protected volatile ShutdownRunningTask shutdownRunningTask;
protected volatile int pendingExchanges;
protected int maxMessagesPerPoll;
@@ -65,7 +69,7 @@ public abstract class ScheduledBatchPollingConsumer extends ScheduledPollConsume
// in the processBatch method and until an exchange gets enlisted as in-flight
// which happens later, so we need to signal back to the shutdown strategy that
// there is a pending exchange. When we are no longer polling, then we will return 0
- log.trace("Currently polling so returning 1 as pending exchanges");
+ LOG.trace("Currently polling so returning 1 as pending exchanges");
answer = 1;
}
@@ -119,7 +123,7 @@ public abstract class ScheduledBatchPollingConsumer extends ScheduledPollConsume
exchange.setProperty(Exchange.BATCH_INDEX, 0);
exchange.setProperty(Exchange.BATCH_SIZE, 1);
exchange.setProperty(Exchange.BATCH_COMPLETE, true);
- log.debug("Sending empty message as there were no messages from polling: {}", this.getEndpoint());
+ LOG.debug("Sending empty message as there were no messages from polling: {}", this.getEndpoint());
getProcessor().process(exchange);
}
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
index 77e53ee..4414ede 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
@@ -33,12 +33,16 @@ import org.apache.camel.spi.PollingConsumerPollStrategy;
import org.apache.camel.spi.ScheduledPollConsumerScheduler;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A useful base class for any consumer which is polling based
*/
public abstract class ScheduledPollConsumer extends DefaultConsumer implements Runnable, Suspendable, PollingConsumerPollingStrategy {
+ private static final Logger LOG = LoggerFactory.getLogger(ScheduledPollConsumer.class);
+
private ScheduledPollConsumerScheduler scheduler;
private ScheduledExecutorService scheduledExecutorService;
@@ -87,15 +91,15 @@ public abstract class ScheduledPollConsumer extends DefaultConsumer implements R
try {
// log starting
if (LoggingLevel.ERROR == runLoggingLevel) {
- log.error("Scheduled task started on: {}", this.getEndpoint());
+ LOG.error("Scheduled task started on: {}", this.getEndpoint());
} else if (LoggingLevel.WARN == runLoggingLevel) {
- log.warn("Scheduled task started on: {}", this.getEndpoint());
+ LOG.warn("Scheduled task started on: {}", this.getEndpoint());
} else if (LoggingLevel.INFO == runLoggingLevel) {
- log.info("Scheduled task started on: {}", this.getEndpoint());
+ LOG.info("Scheduled task started on: {}", this.getEndpoint());
} else if (LoggingLevel.DEBUG == runLoggingLevel) {
- log.debug("Scheduled task started on: {}", this.getEndpoint());
+ LOG.debug("Scheduled task started on: {}", this.getEndpoint());
} else {
- log.trace("Scheduled task started on: {}", this.getEndpoint());
+ LOG.trace("Scheduled task started on: {}", this.getEndpoint());
}
// execute scheduled task
@@ -103,26 +107,26 @@ public abstract class ScheduledPollConsumer extends DefaultConsumer implements R
// log completed
if (LoggingLevel.ERROR == runLoggingLevel) {
- log.error("Scheduled task completed on: {}", this.getEndpoint());
+ LOG.error("Scheduled task completed on: {}", this.getEndpoint());
} else if (LoggingLevel.WARN == runLoggingLevel) {
- log.warn("Scheduled task completed on: {}", this.getEndpoint());
+ LOG.warn("Scheduled task completed on: {}", this.getEndpoint());
} else if (LoggingLevel.INFO == runLoggingLevel) {
- log.info("Scheduled task completed on: {}", this.getEndpoint());
+ LOG.info("Scheduled task completed on: {}", this.getEndpoint());
} else if (LoggingLevel.DEBUG == runLoggingLevel) {
- log.debug("Scheduled task completed on: {}", this.getEndpoint());
+ LOG.debug("Scheduled task completed on: {}", this.getEndpoint());
} else {
- log.trace("Scheduled task completed on: {}", this.getEndpoint());
+ LOG.trace("Scheduled task completed on: {}", this.getEndpoint());
}
} catch (Error e) {
// must catch Error, to ensure the task is re-scheduled
- log.error("Error occurred during running scheduled task on: " + this.getEndpoint() + ", due: " + e.getMessage(), e);
+ LOG.error("Error occurred during running scheduled task on: " + this.getEndpoint() + ", due: " + e.getMessage(), e);
}
}
private void doRun() {
if (isSuspended()) {
- log.trace("Cannot start to poll: {} as its suspended", this.getEndpoint());
+ LOG.trace("Cannot start to poll: {} as its suspended", this.getEndpoint());
return;
}
@@ -134,9 +138,9 @@ public abstract class ScheduledPollConsumer extends DefaultConsumer implements R
if (backoffCounter++ < backoffMultiplier) {
// yes we should backoff
if (idleCounter > 0) {
- log.debug("doRun() backoff due subsequent {} idles (backoff at {}/{})", idleCounter, backoffCounter, backoffMultiplier);
+ LOG.debug("doRun() backoff due subsequent {} idles (backoff at {}/{})", idleCounter, backoffCounter, backoffMultiplier);
} else {
- log.debug("doRun() backoff due subsequent {} errors (backoff at {}/{})", errorCounter, backoffCounter, backoffMultiplier);
+ LOG.debug("doRun() backoff due subsequent {} errors (backoff at {}/{})", errorCounter, backoffCounter, backoffMultiplier);
}
return;
} else {
@@ -144,14 +148,14 @@ public abstract class ScheduledPollConsumer extends DefaultConsumer implements R
idleCounter = 0;
errorCounter = 0;
backoffCounter = 0;
- log.trace("doRun() backoff finished, resetting counters.");
+ LOG.trace("doRun() backoff finished, resetting counters.");
}
}
long count = counter.incrementAndGet();
boolean stopFire = repeatCount > 0 && count > repeatCount;
if (stopFire) {
- log.debug("Cancelling {} scheduler as repeat count limit reached after {} counts.", getEndpoint(), repeatCount);
+ LOG.debug("Cancelling {} scheduler as repeat count limit reached after {} counts.", getEndpoint(), repeatCount);
scheduler.unscheduleTask();
return;
}
@@ -169,9 +173,9 @@ public abstract class ScheduledPollConsumer extends DefaultConsumer implements R
if (isPollAllowed()) {
if (retryCounter == -1) {
- log.trace("Starting to poll: {}", this.getEndpoint());
+ LOG.trace("Starting to poll: {}", this.getEndpoint());
} else {
- log.debug("Retrying attempt {} to poll: {}", retryCounter, this.getEndpoint());
+ LOG.debug("Retrying attempt {} to poll: {}", retryCounter, this.getEndpoint());
}
// mark we are polling which should also include the begin/poll/commit
@@ -181,7 +185,7 @@ public abstract class ScheduledPollConsumer extends DefaultConsumer implements R
if (begin) {
retryCounter++;
polledMessages = poll();
- log.trace("Polled {} messages", polledMessages);
+ LOG.trace("Polled {} messages", polledMessages);
if (polledMessages == 0 && isSendEmptyMessageWhenIdle()) {
// send an "empty" exchange
@@ -193,17 +197,17 @@ public abstract class ScheduledPollConsumer extends DefaultConsumer implements R
if (polledMessages > 0 && isGreedy()) {
done = false;
retryCounter = -1;
- log.trace("Greedy polling after processing {} messages", polledMessages);
+ LOG.trace("Greedy polling after processing {} messages", polledMessages);
}
} else {
- log.debug("Cannot begin polling as pollStrategy returned false: {}", pollStrategy);
+ LOG.debug("Cannot begin polling as pollStrategy returned false: {}", pollStrategy);
}
} finally {
polling = false;
}
}
- log.trace("Finished polling: {}", this.getEndpoint());
+ LOG.trace("Finished polling: {}", this.getEndpoint());
} catch (Exception e) {
try {
boolean retry = pollStrategy.rollback(this, getEndpoint(), retryCounter, e);
@@ -230,7 +234,7 @@ public abstract class ScheduledPollConsumer extends DefaultConsumer implements R
getExceptionHandler().handleException("Consumer " + this + " failed polling endpoint: " + getEndpoint()
+ ". Will try again at next poll", cause);
} catch (Throwable e) {
- log.warn("Error handling exception. This exception will be ignored.", e);
+ LOG.warn("Error handling exception. This exception will be ignored.", e);
}
}
}
@@ -242,7 +246,7 @@ public abstract class ScheduledPollConsumer extends DefaultConsumer implements R
idleCounter = polledMessages == 0 ? ++idleCounter : 0;
errorCounter = 0;
}
- log.trace("doRun() done with idleCounter={}, errorCounter={}", idleCounter, errorCounter);
+ LOG.trace("doRun() done with idleCounter={}, errorCounter={}", idleCounter, errorCounter);
// avoid this thread to throw exceptions because the thread pool wont re-schedule a new thread
}
@@ -254,7 +258,7 @@ public abstract class ScheduledPollConsumer extends DefaultConsumer implements R
*/
protected void processEmptyMessage() throws Exception {
Exchange exchange = getEndpoint().createExchange();
- log.debug("Sending empty message as there were no messages from polling: {}", this.getEndpoint());
+ LOG.debug("Sending empty message as there were no messages from polling: {}", this.getEndpoint());
getProcessor().process(exchange);
}
@@ -428,7 +432,7 @@ public abstract class ScheduledPollConsumer extends DefaultConsumer implements R
if (backoffIdleThreshold <= 0 && backoffErrorThreshold <= 0) {
throw new IllegalArgumentException("backoffIdleThreshold and/or backoffErrorThreshold must be configured to a positive value when using backoffMultiplier");
}
- log.debug("Using backoff[multiplier={}, idleThreshold={}, errorThreshold={}] on {}", backoffMultiplier, backoffIdleThreshold, backoffErrorThreshold, getEndpoint());
+ LOG.debug("Using backoff[multiplier={}, idleThreshold={}, errorThreshold={}] on {}", backoffMultiplier, backoffIdleThreshold, backoffErrorThreshold, getEndpoint());
}
if (scheduler == null) {
@@ -517,7 +521,7 @@ public abstract class ScheduledPollConsumer extends DefaultConsumer implements R
@Override
public long beforePoll(long timeout) throws Exception {
- log.trace("Before poll {}", getEndpoint());
+ LOG.trace("Before poll {}", getEndpoint());
// resume or start our self
if (!ServiceHelper.resumeService(this)) {
ServiceHelper.startService(this);
@@ -529,7 +533,7 @@ public abstract class ScheduledPollConsumer extends DefaultConsumer implements R
@Override
public void afterPoll() throws Exception {
- log.trace("After poll {}", getEndpoint());
+ LOG.trace("After poll {}", getEndpoint());
// suspend or stop our self
if (!ServiceHelper.suspendService(this)) {
ServiceHelper.stopService(this);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/cluster/AbstractCamelClusterService.java b/core/camel-support/src/main/java/org/apache/camel/support/cluster/AbstractCamelClusterService.java
index ff92826..8740722 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/cluster/AbstractCamelClusterService.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/cluster/AbstractCamelClusterService.java
@@ -31,9 +31,13 @@ import org.apache.camel.cluster.CamelClusterView;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.ReferenceCount;
import org.apache.camel.util.concurrent.LockHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class AbstractCamelClusterService<T extends CamelClusterView> extends ServiceSupport implements CamelClusterService {
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractCamelClusterService.class);
+
private final Map<String, ViewHolder<T>> views;
private final Map<String, Object> attributes;
private final StampedLock lock;
@@ -190,10 +194,10 @@ public abstract class AbstractCamelClusterService<T extends CamelClusterView> ex
ViewHolder<T> holder = views.get(namespace);
if (holder != null) {
- log.info("Force start of view {}", namespace);
+ LOG.info("Force start of view {}", namespace);
holder.startView();
} else {
- log.warn("Error forcing start of view {}: it does not exist", namespace);
+ LOG.warn("Error forcing start of view {}: it does not exist", namespace);
}
}
);
@@ -207,10 +211,10 @@ public abstract class AbstractCamelClusterService<T extends CamelClusterView> ex
ViewHolder<T> holder = views.get(namespace);
if (holder != null) {
- log.info("Force stop of view {}", namespace);
+ LOG.info("Force stop of view {}", namespace);
holder.stopView();
} else {
- log.warn("Error forcing stop of view {}: it does not exist", namespace);
+ LOG.warn("Error forcing stop of view {}: it does not exist", namespace);
}
}
);
@@ -272,7 +276,7 @@ public abstract class AbstractCamelClusterService<T extends CamelClusterView> ex
}
V retain() {
- log.debug("Retain view {}, old-refs={}", view.getNamespace(), count.get());
+ LOG.debug("Retain view {}, old-refs={}", view.getNamespace(), count.get());
count.retain();
@@ -280,22 +284,22 @@ public abstract class AbstractCamelClusterService<T extends CamelClusterView> ex
}
void release() {
- log.debug("Release view {}, old-refs={}", view.getNamespace(), count.get());
+ LOG.debug("Release view {}, old-refs={}", view.getNamespace(), count.get());
count.release();
}
void startView() throws Exception {
if (AbstractCamelClusterService.this.isRunAllowed()) {
- log.debug("Start view {}", view.getNamespace());
+ LOG.debug("Start view {}", view.getNamespace());
view.start();
} else {
- log.debug("Can't start view {} as cluster service is not running, view will be started on service start-up", view.getNamespace());
+ LOG.debug("Can't start view {} as cluster service is not running, view will be started on service start-up", view.getNamespace());
}
}
void stopView() throws Exception {
- log.debug("Stop view {}", view.getNamespace());
+ LOG.debug("Stop view {}", view.getNamespace());
view.stop();
}
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/management/DefaultManagementMBeanAssembler.java b/core/camel-support/src/main/java/org/apache/camel/support/management/DefaultManagementMBeanAssembler.java
index 448d8e1..1234733 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/management/DefaultManagementMBeanAssembler.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/management/DefaultManagementMBeanAssembler.java
@@ -32,6 +32,8 @@ import org.apache.camel.spi.ManagementMBeanAssembler;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An assembler to assemble a {@link javax.management.modelmbean.ModelMBean} which can be used
@@ -40,6 +42,8 @@ import org.apache.camel.util.ObjectHelper;
*/
public class DefaultManagementMBeanAssembler extends ServiceSupport implements ManagementMBeanAssembler {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultManagementMBeanAssembler.class);
+
protected final MBeanInfoAssembler assembler;
protected final CamelContext camelContext;
@@ -59,7 +63,7 @@ public class DefaultManagementMBeanAssembler extends ServiceSupport implements M
// there may be a custom embedded instance which have additional methods
custom = ((ManagedInstance) obj).getInstance();
if (custom != null && ObjectHelper.hasAnnotation(custom.getClass().getAnnotations(), ManagedResource.class)) {
- log.trace("Assembling MBeanInfo for: {} from custom @ManagedResource object: {}", name, custom);
+ LOG.trace("Assembling MBeanInfo for: {} from custom @ManagedResource object: {}", name, custom);
// get the mbean info into different groups (mbi = both, standard = standard out of the box mbi)
mbi = assembler.getMBeanInfo(camelContext, obj, custom, name.toString());
standardMbi = assembler.getMBeanInfo(camelContext, obj, null, name.toString());
@@ -68,7 +72,7 @@ public class DefaultManagementMBeanAssembler extends ServiceSupport implements M
if (mbi == null) {
// use the default provided mbean which has been annotated with JMX annotations
- log.trace("Assembling MBeanInfo for: {} from @ManagedResource object: {}", name, obj);
+ LOG.trace("Assembling MBeanInfo for: {} from @ManagedResource object: {}", name, obj);
mbi = assembler.getMBeanInfo(camelContext, obj, null, name.toString());
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/processor/CamelLogProcessor.java b/core/camel-support/src/main/java/org/apache/camel/support/processor/CamelLogProcessor.java
index 1656688..0a1f57a 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/processor/CamelLogProcessor.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/processor/CamelLogProcessor.java
@@ -29,6 +29,8 @@ import org.apache.camel.spi.LogListener;
import org.apache.camel.spi.MaskingFormatter;
import org.apache.camel.spi.RouteIdAware;
import org.apache.camel.support.AsyncProcessorSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A {@link Processor} which just logs to a {@link CamelLogger} object which can be used
@@ -39,6 +41,8 @@ import org.apache.camel.support.AsyncProcessorSupport;
*/
public class CamelLogProcessor extends AsyncProcessorSupport implements IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(CamelLogProcessor.class);
+
private String id;
private String routeId;
private CamelLogger logger;
@@ -137,9 +141,9 @@ public class CamelLogProcessor extends AsyncProcessorSupport implements IdAware,
String output = listener.onLog(exchange, logger, message);
message = output != null ? output : message;
} catch (Throwable t) {
- log.warn("Ignoring an exception thrown by {}: {}", listener.getClass().getName(), t.getMessage());
- if (log.isDebugEnabled()) {
- log.debug("", t);
+ LOG.warn("Ignoring an exception thrown by {}: {}", listener.getClass().getName(), t.getMessage());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("", t);
}
}
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/processor/ThroughputLogger.java b/core/camel-support/src/main/java/org/apache/camel/support/processor/ThroughputLogger.java
index fd5ae95..bbfab8c 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/processor/ThroughputLogger.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/processor/ThroughputLogger.java
@@ -30,12 +30,16 @@ import org.apache.camel.spi.IdAware;
import org.apache.camel.spi.RouteIdAware;
import org.apache.camel.support.AsyncProcessorSupport;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A logger for logging message throughput.
*/
public class ThroughputLogger extends AsyncProcessorSupport implements AsyncProcessor, IdAware, RouteIdAware {
+ private static final Logger LOG = LoggerFactory.getLogger(ThroughputLogger.class);
+
private String id;
private String routeId;
private final AtomicInteger receivedCounter = new AtomicInteger();
@@ -209,7 +213,7 @@ public class ThroughputLogger extends AsyncProcessorSupport implements AsyncProc
logSchedulerService = camelContext.getExecutorServiceManager().newSingleThreadScheduledExecutor(this, "ThroughputLogger");
Runnable scheduledLogTask = new ScheduledLogTask();
- log.info("Scheduling throughput logger to run every {} millis.", groupInterval);
+ LOG.info("Scheduling throughput logger to run every {} millis.", groupInterval);
// must use fixed rate to have it trigger at every X interval
logSchedulerService.scheduleAtFixedRate(scheduledLogTask, groupDelay, groupInterval, TimeUnit.MILLISECONDS);
}
@@ -249,7 +253,7 @@ public class ThroughputLogger extends AsyncProcessorSupport implements AsyncProc
public void run() {
// only run if CamelContext has been fully started
if (!camelContext.getStatus().isStarted()) {
- log.trace("ThroughputLogger cannot start because CamelContext({}) has not been started yet", camelContext.getName());
+ LOG.trace("ThroughputLogger cannot start because CamelContext({}) has not been started yet", camelContext.getName());
return;
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/processor/idempotent/FileIdempotentRepository.java b/core/camel-support/src/main/java/org/apache/camel/support/processor/idempotent/FileIdempotentRepository.java
index f4d5527..e309219 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/processor/idempotent/FileIdempotentRepository.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/processor/idempotent/FileIdempotentRepository.java
@@ -36,6 +36,8 @@ import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.Scanner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A file based implementation of {@link org.apache.camel.spi.IdempotentRepository}.
@@ -51,6 +53,8 @@ import org.apache.camel.util.Scanner;
@ManagedResource(description = "File based idempotent repository")
public class FileIdempotentRepository extends ServiceSupport implements IdempotentRepository {
+ private static final Logger LOG = LoggerFactory.getLogger(FileIdempotentRepository.class);
+
private static final String STORE_DELIMITER = "\n";
private final AtomicBoolean init = new AtomicBoolean();
@@ -140,7 +144,7 @@ public class FileIdempotentRepository extends ServiceSupport implements Idempote
// check if we hit maximum capacity (if enabled) and report a warning about this
if (maxFileStoreSize > 0 && fileStore.length() > maxFileStoreSize) {
- log.warn("Maximum capacity of file store: {} hit at {} bytes. Dropping {} oldest entries from the file store", fileStore, maxFileStoreSize, dropOldestFileStore);
+ LOG.warn("Maximum capacity of file store: {} hit at {} bytes. Dropping {} oldest entries from the file store", fileStore, maxFileStoreSize, dropOldestFileStore);
trunkStore();
}
@@ -310,17 +314,17 @@ public class FileIdempotentRepository extends ServiceSupport implements Idempote
* @param key the key
*/
protected void appendToStore(final String key) {
- log.debug("Appending: {} to idempotent filestore: {}", key, fileStore);
+ LOG.debug("Appending: {} to idempotent filestore: {}", key, fileStore);
FileOutputStream fos = null;
try {
// create store parent directory if missing
File storeParentDirectory = fileStore.getParentFile();
if (storeParentDirectory != null && !storeParentDirectory.exists()) {
- log.info("Parent directory of file store {} doesn't exist. Creating.", fileStore);
+ LOG.info("Parent directory of file store {} doesn't exist. Creating.", fileStore);
if (fileStore.getParentFile().mkdirs()) {
- log.info("Parent directory of filestore: {} successfully created.", fileStore);
+ LOG.info("Parent directory of filestore: {} successfully created.", fileStore);
} else {
- log.warn("Parent directory of filestore: {} cannot be created.", fileStore);
+ LOG.warn("Parent directory of filestore: {} cannot be created.", fileStore);
}
}
// create store if missing
@@ -334,12 +338,12 @@ public class FileIdempotentRepository extends ServiceSupport implements Idempote
} catch (IOException e) {
throw RuntimeCamelException.wrapRuntimeCamelException(e);
} finally {
- IOHelper.close(fos, "Appending to file idempotent repository", log);
+ IOHelper.close(fos, "Appending to file idempotent repository", LOG);
}
}
protected synchronized void removeFromStore(String key) {
- log.debug("Removing: {} from idempotent filestore: {}", key, fileStore);
+ LOG.debug("Removing: {} from idempotent filestore: {}", key, fileStore);
// we need to re-load the entire file and remove the key and then re-write the file
List<String> lines = new ArrayList<>();
@@ -362,7 +366,7 @@ public class FileIdempotentRepository extends ServiceSupport implements Idempote
if (found) {
// rewrite file
- log.debug("Rewriting idempotent filestore: {} due to key: {} removed", fileStore, key);
+ LOG.debug("Rewriting idempotent filestore: {} due to key: {} removed", fileStore, key);
FileOutputStream fos = null;
try {
fos = new FileOutputStream(fileStore);
@@ -373,7 +377,7 @@ public class FileIdempotentRepository extends ServiceSupport implements Idempote
} catch (IOException e) {
throw RuntimeCamelException.wrapRuntimeCamelException(e);
} finally {
- IOHelper.close(fos, "Rewriting file idempotent repository", log);
+ IOHelper.close(fos, "Rewriting file idempotent repository", LOG);
}
}
}
@@ -398,7 +402,7 @@ public class FileIdempotentRepository extends ServiceSupport implements Idempote
return;
}
- log.debug("Trunking: {} oldest entries from idempotent filestore: {}", dropOldestFileStore, fileStore);
+ LOG.debug("Trunking: {} oldest entries from idempotent filestore: {}", dropOldestFileStore, fileStore);
// we need to re-load the entire file and remove the key and then re-write the file
List<String> lines = new ArrayList<>();
@@ -420,7 +424,7 @@ public class FileIdempotentRepository extends ServiceSupport implements Idempote
if (!lines.isEmpty()) {
// rewrite file
- log.debug("Rewriting idempotent filestore: {} with {} entries:", fileStore, lines.size());
+ LOG.debug("Rewriting idempotent filestore: {} with {} entries:", fileStore, lines.size());
FileOutputStream fos = null;
try {
fos = new FileOutputStream(fileStore);
@@ -431,11 +435,11 @@ public class FileIdempotentRepository extends ServiceSupport implements Idempote
} catch (IOException e) {
throw RuntimeCamelException.wrapRuntimeCamelException(e);
} finally {
- IOHelper.close(fos, "Rewriting file idempotent repository", log);
+ IOHelper.close(fos, "Rewriting file idempotent repository", LOG);
}
} else {
// its a small file so recreate the file
- log.debug("Clearing idempotent filestore: {}", fileStore);
+ LOG.debug("Clearing idempotent filestore: {}", fileStore);
clearStore();
}
}
@@ -456,7 +460,7 @@ public class FileIdempotentRepository extends ServiceSupport implements Idempote
protected void loadStore() throws IOException {
// auto create starting directory if needed
if (!fileStore.exists()) {
- log.debug("Creating filestore: {}", fileStore);
+ LOG.debug("Creating filestore: {}", fileStore);
File parent = fileStore.getParentFile();
if (parent != null) {
parent.mkdirs();
@@ -467,7 +471,7 @@ public class FileIdempotentRepository extends ServiceSupport implements Idempote
}
}
- log.trace("Loading to 1st level cache from idempotent filestore: {}", fileStore);
+ LOG.trace("Loading to 1st level cache from idempotent filestore: {}", fileStore);
cache.clear();
try (Scanner scanner = new Scanner(fileStore, null, STORE_DELIMITER)) {
@@ -479,7 +483,7 @@ public class FileIdempotentRepository extends ServiceSupport implements Idempote
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
- log.debug("Loaded {} to the 1st level cache from idempotent filestore: {}", cache.size(), fileStore);
+ LOG.debug("Loaded {} to the 1st level cache from idempotent filestore: {}", cache.size(), fileStore);
}
@Override
[camel] 02/05: CAMEL-14421: optimize core - ServiceSupport should
not have instance logger. Use static logger instead.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2ae0cd8c24b35707d4cc40fd09310977cff57a68
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 23 05:38:05 2020 +0100
CAMEL-14421: optimize core - ServiceSupport should not have instance logger. Use static logger instead.
---
.../apache/camel/component/ahc/ws/WsEndpoint.java | 26 ++++---
.../apache/camel/component/ahc/ws/WsProducer.java | 7 +-
.../apache/camel/component/ahc/AhcComponent.java | 10 ++-
.../apache/camel/component/ahc/AhcProducer.java | 25 ++++---
.../apache/camel/component/as2/AS2Component.java | 8 ++-
.../apache/camel/component/as2/AS2Consumer.java | 6 +-
.../camel/component/asterisk/AsteriskProducer.java | 6 +-
.../camel/component/atmos/AtmosEndpoint.java | 5 --
.../atmosphere/websocket/WebsocketProducer.java | 10 +--
.../client/AbstractAtomixClientProducer.java | 11 ++-
.../atomix/client/map/AtomixMapConsumer.java | 8 ++-
.../client/messaging/AtomixMessagingConsumer.java | 7 +-
.../atomix/client/queue/AtomixQueueConsumer.java | 6 +-
.../atomix/client/set/AtomixSetConsumer.java | 6 +-
.../atomix/client/value/AtomixValueConsumer.java | 6 +-
.../atomix/cluster/AtomixClusterService.java | 14 ++--
.../atomix/cluster/AtomixClusterView.java | 22 +++---
.../apache/camel/component/aws/cw/CwProducer.java | 6 +-
.../camel/component/aws/ddb/DdbEndpoint.java | 20 +++---
.../component/aws/ddbstream/DdbStreamConsumer.java | 10 ++-
.../camel/component/aws/ec2/EC2Producer.java | 46 ++++++------
.../camel/component/aws/ecs/ECSProducer.java | 12 ++--
.../camel/component/aws/eks/EKSProducer.java | 11 +--
.../camel/component/aws/iam/IAMProducer.java | 29 ++++----
.../aws/firehose/KinesisFirehoseProducer.java | 8 ++-
.../component/aws/kinesis/KinesisConsumer.java | 17 +++--
.../camel/component/aws/kms/KMSProducer.java | 16 +++--
.../camel/component/aws/lambda/LambdaProducer.java | 40 ++++++-----
.../apache/camel/component/aws/mq/MQProducer.java | 16 +++--
.../camel/component/aws/msk/MSKProducer.java | 12 ++--
.../apache/camel/component/aws/s3/S3Consumer.java | 34 +++++----
.../apache/camel/component/aws/s3/S3Producer.java | 2 +-
.../camel/component/aws/ses/SesProducer.java | 16 +++--
.../camel/component/aws/sns/SnsEndpoint.java | 16 +++--
.../camel/component/aws/sns/SnsProducer.java | 10 ++-
.../camel/component/aws/sqs/SqsConsumer.java | 42 ++++++-----
.../camel/component/aws/sqs/SqsEndpoint.java | 22 +++---
.../camel/component/aws/sqs/SqsProducer.java | 22 +++---
.../component/aws/swf/SWFActivityProducer.java | 4 +-
.../component/aws/swf/SWFWorkflowProducer.java | 4 +-
.../component/aws/translate/TranslateProducer.java | 6 +-
.../camel/component/aws/xray/XRayTracer.java | 45 ++++++------
.../aws2/translate/Translate2Producer.java | 5 +-
.../component/azure/blob/BlobServiceConsumer.java | 1 -
.../component/azure/blob/BlobServiceEndpoint.java | 2 -
.../component/azure/blob/BlobServiceProducer.java | 28 ++++----
.../azure/queue/QueueServiceConsumer.java | 1 -
.../azure/queue/QueueServiceEndpoint.java | 2 -
.../azure/queue/QueueServiceProducer.java | 14 ++--
.../dataformat/barcode/BarcodeDataFormat.java | 14 ++--
.../component/bean/AbstractBeanProcessor.java | 8 ++-
.../apache/camel/component/bean/BeanComponent.java | 8 ++-
.../component/beanstalk/BeanstalkConsumer.java | 16 +++--
.../camel/blueprint/BlueprintCamelContext.java | 34 +++++----
.../apache/camel/component/box/BoxConsumer.java | 8 ++-
.../aggregate/CaffeineAggregationRepository.java | 16 +++--
.../camel/component/cbor/CBORDataFormat.java | 13 ++--
.../cdi/transaction/TransactionErrorHandler.java | 54 +++++++-------
.../org/apache/camel/component/cm/CMComponent.java | 1 -
.../org/apache/camel/component/cm/CMProducer.java | 23 +++---
.../apache/camel/component/cmis/CMISConsumer.java | 6 +-
.../apache/camel/component/cmis/CMISProducer.java | 10 ++-
.../component/controlbus/ControlBusProducer.java | 20 +++---
.../component/couchbase/CouchbaseConsumer.java | 41 ++++++-----
.../component/couchbase/CouchbaseProducer.java | 14 ++--
.../camel/component/couchdb/CouchDbConsumer.java | 8 ++-
.../camel/component/couchdb/CouchDbProducer.java | 16 +++--
.../component/crypto/cms/CryptoCmsComponent.java | 8 ++-
.../camel/component/cxf/CxfBlueprintEndpoint.java | 6 +-
.../apache/camel/component/cxf/CxfComponent.java | 6 +-
.../apache/camel/component/cxf/CxfConsumer.java | 26 ++++---
.../apache/camel/component/cxf/CxfEndpoint.java | 26 ++++---
.../apache/camel/component/cxf/CxfProducer.java | 32 +++++----
.../component/dataset/DataSetTestEndpoint.java | 10 ++-
.../camel/component/direct/DirectProducer.java | 8 ++-
.../directvm/DirectVmBlockingProducer.java | 8 ++-
.../component/directvm/DirectVmProcessor.java | 12 ++--
.../camel/component/directvm/DirectVmProducer.java | 6 +-
.../component/disruptor/DisruptorProducer.java | 22 +++---
.../docker/consumer/DockerEventsConsumer.java | 10 ++-
.../docker/producer/AsyncDockerProducer.java | 63 +++++------------
.../camel/component/dozer/DozerEndpoint.java | 6 +-
.../camel/component/dozer/DozerProducer.java | 12 ++--
.../camel/component/drill/DrillProducer.java | 8 ++-
.../integration/producer/DropboxDelProducer.java | 1 -
.../integration/producer/DropboxMoveProducer.java | 2 -
.../aggregate/EhcacheAggregationRepository.java | 16 +++--
.../elasticsearch/ElasticsearchProducer.java | 11 ++-
.../camel/component/elsql/ElsqlEndpoint.java | 6 +-
.../camel/component/elsql/ElsqlProducer.java | 12 ++--
.../component/eventadmin/EventAdminConsumer.java | 6 +-
.../camel/component/facebook/FacebookConsumer.java | 11 ++-
.../camel/component/facebook/FacebookEndpoint.java | 9 ++-
.../component/file/watch/FileWatchConsumer.java | 10 ++-
.../apache/camel/component/file/FileConsumer.java | 31 ++++----
.../apache/camel/component/file/FileEndpoint.java | 16 +++--
.../camel/component/file/GenericFileConsumer.java | 52 +++++++-------
.../camel/component/file/GenericFileEndpoint.java | 24 +++----
.../component/file/GenericFileOnCompletion.java | 14 ++--
.../component/file/GenericFilePollingConsumer.java | 32 +++++----
.../camel/component/file/GenericFileProducer.java | 37 +++++-----
...dempotentChangedRepositoryReadLockStrategy.java | 20 +++---
...IdempotentRenameRepositoryReadLockStrategy.java | 7 +-
.../FileIdempotentRepositoryReadLockStrategy.java | 15 ++--
.../strategy/GenericFileDeleteProcessStrategy.java | 6 +-
.../GenericFileProcessStrategySupport.java | 9 ++-
.../camel/component/file/remote/FtpConsumer.java | 26 ++++---
.../camel/component/file/remote/FtpEndpoint.java | 11 ++-
.../camel/component/file/remote/FtpsEndpoint.java | 13 ++--
.../component/file/remote/RemoteFileConsumer.java | 49 +++++++------
.../component/file/remote/RemoteFileEndpoint.java | 12 ++--
.../component/file/remote/RemoteFileProducer.java | 29 ++++----
.../camel/component/file/remote/SftpConsumer.java | 24 ++++---
.../camel/component/ganglia/GangliaProducer.java | 12 ++--
.../git/consumer/AbstractGitConsumer.java | 6 +-
.../camel/component/git/producer/GitProducer.java | 54 +++++++-------
.../google/bigquery/GoogleBigQueryProducer.java | 18 +++--
.../bigquery/sql/GoogleBigQuerySQLProducer.java | 14 ++--
.../stream/GoogleCalendarStreamConsumer.java | 7 +-
.../apache/camel/component/gora/GoraConsumer.java | 2 -
.../apache/camel/component/grpc/GrpcConsumer.java | 14 ++--
.../apache/camel/component/grpc/GrpcProducer.java | 12 ++--
.../guava/eventbus/GuavaEventBusConsumer.java | 6 +-
.../guava/eventbus/GuavaEventBusProducer.java | 8 ++-
.../hazelcast/queue/HazelcastQueueConsumer.java | 5 +-
.../hazelcast/seda/HazelcastSedaConsumer.java | 18 +++--
.../camel/component/hbase/HBaseConsumer.java | 8 ++-
.../idempotent/HBaseIdempotentRepository.java | 12 ++--
.../apache/camel/component/hdfs/HdfsConsumer.java | 26 ++++---
.../apache/camel/component/hdfs/HdfsProducer.java | 37 +++++-----
.../camel/component/hipchat/HipchatComponent.java | 6 +-
.../camel/component/hipchat/HipchatConsumer.java | 11 ++-
.../camel/component/hipchat/HipchatProducer.java | 13 ++--
.../apache/camel/component/http/HttpComponent.java | 10 ++-
.../apache/camel/component/http/HttpEndpoint.java | 8 ++-
.../apache/camel/component/http/HttpProducer.java | 17 +++--
.../hystrix/metrics/HystrixEventStreamService.java | 12 ++--
.../component/iec60870/AbstractIecComponent.java | 17 +++--
.../component/iec60870/client/ClientComponent.java | 2 -
.../component/iec60870/client/ClientConsumer.java | 8 ++-
.../component/iec60870/server/ServerComponent.java | 2 -
.../component/iec60870/server/ServerConsumer.java | 6 +-
.../cache/IgniteCacheContinuousQueryConsumer.java | 16 +++--
.../ignite/events/IgniteEventsConsumer.java | 14 ++--
.../ignite/events/IgniteEventsEndpoint.java | 10 ++-
.../ignite/idgen/IgniteIdGenEndpoint.java | 6 +-
.../ignite/messaging/IgniteMessagingConsumer.java | 14 ++--
.../component/infinispan/InfinispanComponent.java | 7 +-
.../component/infinispan/InfinispanConsumer.java | 4 +-
.../camel/component/influxdb/InfluxDbEndpoint.java | 6 +-
.../camel/component/influxdb/InfluxDbProducer.java | 10 ++-
.../apache/camel/component/irc/IrcComponent.java | 24 ++++---
.../apache/camel/component/irc/IrcConsumer.java | 10 ++-
.../apache/camel/component/irc/IrcEndpoint.java | 16 +++--
.../apache/camel/component/irc/IrcProducer.java | 14 ++--
.../camel/component/ironmq/IronMQConsumer.java | 22 +++---
.../camel/component/ironmq/IronMQEndpoint.java | 6 +-
.../camel/component/ironmq/IronMQProducer.java | 8 ++-
.../camel/component/jackson/JacksonDataFormat.java | 24 ++++---
.../component/jacksonxml/JacksonXMLDataFormat.java | 14 ++--
.../camel/converter/jaxb/JaxbDataFormat.java | 22 +++---
.../camel/component/jcache/JCacheConsumer.java | 4 +-
.../aggregate/JCacheAggregationRepository.java | 22 +++---
.../jclouds/JcloudsBlobStoreConsumer.java | 1 -
.../jclouds/JcloudsBlobStoreProducer.java | 8 ++-
.../apache/camel/component/jcr/JcrConsumer.java | 26 ++++---
.../apache/camel/component/jdbc/JdbcComponent.java | 6 +-
.../apache/camel/component/jdbc/JdbcProducer.java | 18 +++--
.../camel/component/jetty/JettyHttpComponent.java | 17 +++--
.../component/jetty/async/MyAsyncProducer.java | 13 ++--
.../jgroups/raft/JGroupsRaftProducer.java | 12 ++--
.../camel/component/jgroups/JGroupsConsumer.java | 8 ++-
.../camel/component/jgroups/JGroupsEndpoint.java | 10 ++-
.../camel/component/jgroups/JGroupsProducer.java | 12 ++--
.../apache/camel/component/jms/JmsComponent.java | 9 ++-
.../apache/camel/component/jms/JmsConsumer.java | 19 +++--
.../apache/camel/component/jms/JmsEndpoint.java | 20 +++---
.../apache/camel/component/jms/JmsProducer.java | 54 +++++++-------
.../camel/component/jms/async/MyAsyncProducer.java | 14 ++--
.../apache/camel/component/jmx/JMXConsumer.java | 22 +++---
.../apache/camel/component/jpa/JpaComponent.java | 26 ++++---
.../apache/camel/component/jpa/JpaConsumer.java | 30 ++++----
.../camel/component/jpa/JpaPollingConsumer.java | 10 ++-
.../apache/camel/component/jpa/JpaProducer.java | 10 ++-
.../idempotent/jpa/JpaMessageIdRepository.java | 20 +++---
.../apache/camel/component/scp/ScpEndpoint.java | 2 +-
.../component/jt400/Jt400DataQueueConsumer.java | 12 ++--
.../camel/component/kafka/KafkaConsumer.java | 68 +++++++++---------
.../camel/component/kafka/KafkaEndpoint.java | 6 +-
.../camel/component/kafka/KafkaProducer.java | 24 ++++---
.../config_maps/KubernetesConfigMapsConsumer.java | 8 ++-
.../config_maps/KubernetesConfigMapsProducer.java | 16 +++--
.../deployments/KubernetesDeploymentsConsumer.java | 8 ++-
.../deployments/KubernetesDeploymentsProducer.java | 22 +++---
.../kubernetes/hpa/KubernetesHPAConsumer.java | 8 ++-
.../kubernetes/hpa/KubernetesHPAProducer.java | 20 +++---
.../kubernetes/job/KubernetesJobProducer.java | 20 +++---
.../namespaces/KubernetesNamespacesConsumer.java | 8 ++-
.../kubernetes/nodes/KubernetesNodesConsumer.java | 8 ++-
.../kubernetes/nodes/KubernetesNodesProducer.java | 12 ++--
.../kubernetes/pods/KubernetesPodsConsumer.java | 8 ++-
.../KubernetesReplicationControllersConsumer.java | 8 ++-
.../services/KubernetesServicesConsumer.java | 8 ++-
.../OpenshiftBuildConfigsProducer.java | 8 ++-
.../openshift/builds/OpenshiftBuildsProducer.java | 8 ++-
.../camel/component/language/LanguageProducer.java | 6 +-
.../apache/camel/component/ldap/LdapProducer.java | 17 +++--
.../apache/camel/component/ldif/LdifProducer.java | 37 +++++-----
.../leveldb/LevelDBAggregationRepository.java | 46 ++++++------
.../apache/camel/component/log/LogComponent.java | 7 +-
.../apache/camel/component/mail/MailConsumer.java | 82 ++++++++++++----------
.../apache/camel/component/mail/MailProducer.java | 8 ++-
.../camel/component/master/MasterConsumer.java | 8 +--
.../camel/component/metrics/GaugeProducer.java | 9 ++-
.../camel/component/metrics/HistogramProducer.java | 7 +-
.../camel/component/metrics/MetricsComponent.java | 14 ++--
.../camel/component/metrics/TimerProducer.java | 11 ++-
.../component/micrometer/MicrometerComponent.java | 6 +-
.../camel/component/micrometer/TimerProducer.java | 9 ++-
.../component/milo/client/MiloClientComponent.java | 8 ++-
.../component/milo/client/MiloClientConsumer.java | 9 ++-
.../component/milo/client/MiloClientProducer.java | 2 -
.../component/milo/server/MiloServerComponent.java | 15 ++--
.../component/milo/server/MiloServerProducer.java | 6 +-
.../apache/camel/component/mllp/MllpEndpoint.java | 2 -
.../apache/camel/component/mock/MockEndpoint.java | 40 ++++++-----
.../component/mongodb/gridfs/GridFsEndpoint.java | 10 ++-
.../camel/component/mongodb/MongoDbEndpoint.java | 15 ++--
.../camel/component/mongodb/MongoDbProducer.java | 16 +++--
.../component/mybatis/MyBatisBeanProducer.java | 18 +++--
.../camel/component/mybatis/MyBatisConsumer.java | 10 ++-
.../component/nagios/NagiosEventNotifier.java | 13 ++--
.../camel/component/nagios/NagiosProducer.java | 11 ++-
.../apache/camel/component/nats/NatsConsumer.java | 18 +++--
.../apache/camel/component/nats/NatsProducer.java | 19 ++---
.../component/netty/http/NettyHttpComponent.java | 10 ++-
.../component/netty/http/NettyHttpEndpoint.java | 10 ++-
.../component/netty/http/NettyHttpProducer.java | 8 ++-
.../camel/component/netty/NettyComponent.java | 6 +-
.../camel/component/netty/NettyConsumer.java | 12 ++--
.../camel/component/netty/NettyProducer.java | 78 ++++++++++----------
.../camel/opentracing/OpenTracingTracer.java | 31 ++++----
.../component/optaplanner/OptaPlannerConsumer.java | 4 +-
.../apache/camel/component/paho/PahoConsumer.java | 22 +++---
.../apache/camel/component/paho/PahoProducer.java | 10 ++-
.../component/paxlogging/PaxLoggingConsumer.java | 8 ++-
.../apache/camel/component/pdf/PdfProducer.java | 11 ++-
.../slot/PgReplicationSlotConsumer.java | 12 ++--
.../slot/PgReplicationSlotEndpoint.java | 6 +-
.../camel/component/pgevent/PgEventConsumer.java | 8 ++-
.../camel/component/pgevent/PgEventEndpoint.java | 14 ++--
.../camel/component/printer/PrinterProducer.java | 9 ++-
.../camel/component/pubnub/PubNubConsumer.java | 9 ++-
.../camel/component/pubnub/PubNubProducer.java | 22 +++---
.../camel/component/pulsar/PulsarProducer.java | 8 ++-
.../camel/component/quartz/QuartzComponent.java | 36 +++++-----
.../camel/component/quartz/QuartzEndpoint.java | 29 ++++----
.../QuartzScheduledPollConsumerScheduler.java | 22 +++---
.../component/quickfixj/QuickfixjComponent.java | 8 ++-
.../component/quickfixj/QuickfixjConsumer.java | 6 +-
.../component/quickfixj/QuickfixjEndpoint.java | 8 ++-
.../camel/component/quickfixj/QuickfixjEngine.java | 12 ++--
.../component/quickfixj/QuickfixjProducer.java | 8 ++-
.../examples/trading/TradeExecutorComponent.java | 2 +-
.../camel/component/rabbitmq/RabbitConsumer.java | 40 ++++++-----
.../component/rabbitmq/RabbitMQComponent.java | 12 ++--
.../camel/component/rabbitmq/RabbitMQConsumer.java | 21 +++---
.../camel/component/rabbitmq/RabbitMQProducer.java | 35 +++++----
.../rabbitmq/reply/ReplyManagerSupport.java | 39 +++++-----
.../rabbitmq/reply/TemporaryQueueReplyManager.java | 14 ++--
.../reactive/streams/ReactiveStreamsConsumer.java | 6 +-
.../apache/camel/component/rest/RestEndpoint.java | 15 ++--
.../component/salesforce/SalesforceComponent.java | 15 ++--
.../component/salesforce/SalesforceConsumer.java | 16 +++--
.../component/salesforce/SalesforceEndpoint.java | 12 ++--
.../component/salesforce/SalesforceProducer.java | 6 +-
.../component/sap/netweaver/NetWeaverProducer.java | 11 ++-
.../camel/component/xquery/XQueryEndpoint.java | 6 +-
.../component/scheduler/SchedulerConsumer.java | 8 ++-
.../component/schematron/SchematronEndpoint.java | 15 ++--
.../component/schematron/SchematronProducer.java | 20 ++----
.../apache/camel/component/seda/SedaConsumer.java | 36 +++++-----
.../apache/camel/component/seda/SedaEndpoint.java | 16 +++--
.../apache/camel/component/seda/SedaProducer.java | 33 +++++----
.../camel/component/service/ServiceConsumer.java | 4 +-
.../camel/component/servlet/ServletComponent.java | 6 +-
.../apache/camel/component/sjms/SjmsConsumer.java | 10 ++-
.../apache/camel/component/sjms/SjmsProducer.java | 34 +++++----
.../component/sjms/batch/SjmsBatchConsumer.java | 14 ++--
.../component/sjms/producer/InOutProducer.java | 22 +++---
.../camel/component/slack/SlackConsumer.java | 8 +--
.../apache/camel/component/smpp/SmppConsumer.java | 24 ++++---
.../apache/camel/component/smpp/SmppProducer.java | 24 ++++---
.../apache/camel/component/snmp/SnmpEndpoint.java | 7 +-
.../apache/camel/component/snmp/SnmpOIDPoller.java | 26 ++++---
.../apache/camel/component/snmp/SnmpProducer.java | 12 ++--
.../camel/component/snmp/SnmpTrapConsumer.java | 32 +++++----
.../camel/component/snmp/SnmpTrapProducer.java | 16 +++--
.../camel/dataformat/soap/SoapJaxbDataFormat.java | 12 ++--
.../apache/camel/component/solr/SolrComponent.java | 12 ++--
.../component/SoroushBotAbstractConsumer.java | 32 +++++----
.../component/SoroushBotDownloadFileProducer.java | 3 -
.../component/SoroushBotMultiThreadConsumer.java | 13 ++--
.../component/SoroushBotSendMessageProducer.java | 10 +--
.../component/SoroushBotSingleThreadConsumer.java | 15 ++--
.../camel/component/sparkrest/SparkConsumer.java | 8 ++-
.../camel/component/splunk/SplunkConsumer.java | 12 ++--
.../camel/component/splunk/SplunkEndpoint.java | 6 +-
.../spring/batch/SpringBatchProducer.java | 6 +-
.../integration/SpringIntegrationConsumer.java | 7 +-
.../integration/SpringIntegrationProducer.java | 11 ++-
.../spring/ws/SpringWebserviceComponent.java | 8 ++-
.../spring/ws/SpringWebserviceProducer.java | 10 ++-
.../spring/spi/SpringManagementMBeanAssembler.java | 10 ++-
.../camel/spring/spi/TransactionErrorHandler.java | 52 +++++++-------
.../camel/spring/StartAndStopEventNotifier.java | 8 ++-
.../apache/camel/component/sql/SqlComponent.java | 6 +-
.../apache/camel/component/sql/SqlConsumer.java | 14 ++--
.../apache/camel/component/sql/SqlProducer.java | 11 ++-
.../camel/component/stream/StreamConsumer.java | 18 +++--
.../camel/component/stream/StreamEndpoint.java | 6 +-
.../camel/component/stream/StreamProducer.java | 22 +++---
.../camel/component/telegram/TelegramConsumer.java | 14 ++--
.../camel/component/telegram/TelegramProducer.java | 14 ++--
.../apache/camel/test/junit4/CamelTestSupport.java | 38 +++++-----
.../camel/test/junit4/LanguageTestSupport.java | 6 +-
.../camel/component/thrift/ThriftConsumer.java | 20 +++---
.../camel/component/thrift/ThriftProducer.java | 20 +++---
.../camel/component/timer/TimerConsumer.java | 13 ++--
.../directmessage/DirectMessageProducer.java | 6 +-
.../component/twitter/search/SearchProducer.java | 8 ++-
.../component/twitter/timeline/UserProducer.java | 12 ++--
.../camel/component/undertow/UndertowConsumer.java | 9 ++-
.../camel/component/undertow/UndertowEndpoint.java | 6 +-
.../camel/component/undertow/UndertowProducer.java | 12 ++--
.../camel/component/vertx/VertxComponent.java | 20 +++---
.../camel/component/vertx/VertxConsumer.java | 18 +++--
.../camel/component/vertx/VertxProducer.java | 10 ++-
.../camel/component/weather/WeatherConsumer.java | 10 ++-
.../camel/component/weather/WeatherProducer.java | 8 ++-
.../camel/component/webhook/WebhookEndpoint.java | 8 ++-
.../component/websocket/WebsocketProducer.java | 16 +++--
.../apache/camel/component/xmpp/XmppComponent.java | 8 ++-
.../apache/camel/component/xmpp/XmppConsumer.java | 28 ++++----
.../apache/camel/component/xmpp/XmppEndpoint.java | 18 +++--
.../component/xslt/saxon/XsltSaxonEndpoint.java | 11 ++-
.../apache/camel/component/xslt/XsltComponent.java | 6 +-
.../apache/camel/component/xslt/XsltEndpoint.java | 15 ++--
.../zookeepermaster/policy/MasterRoutePolicy.java | 14 ++--
.../component/zookeeper/ZooKeeperConsumer.java | 24 ++++---
.../component/zookeeper/ZooKeeperProducer.java | 56 ++++++++-------
351 files changed, 3274 insertions(+), 2092 deletions(-)
diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
index 27f66d8..184ed1c 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
@@ -33,6 +33,8 @@ import org.asynchttpclient.DefaultAsyncHttpClientConfig;
import org.asynchttpclient.ws.WebSocket;
import org.asynchttpclient.ws.WebSocketListener;
import org.asynchttpclient.ws.WebSocketUpgradeHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* To exchange data with external Websocket servers using <a href="http://github.com/sonatype/async-http-client">Async Http Client</a>.
@@ -41,6 +43,8 @@ import org.asynchttpclient.ws.WebSocketUpgradeHandler;
syntax = "ahc-ws:httpUri", label = "websocket")
public class WsEndpoint extends AhcEndpoint {
+ private static final Logger LOG = LoggerFactory.getLogger(WsEndpoint.class);
+
private final Set<WsConsumer> consumers = new HashSet<>();
private final WsListener listener = new WsListener();
private transient WebSocket websocket;
@@ -120,7 +124,7 @@ public class WsEndpoint extends AhcEndpoint {
public void connect() throws Exception {
String uri = getHttpUri().toASCIIString();
- log.debug("Connecting to {}", uri);
+ LOG.debug("Connecting to {}", uri);
websocket = getClient().prepareGet(uri).execute(
new WebSocketUpgradeHandler.Builder()
.addWebSocketListener(listener).build()).get();
@@ -129,8 +133,8 @@ public class WsEndpoint extends AhcEndpoint {
@Override
protected void doStop() throws Exception {
if (websocket != null && websocket.isOpen()) {
- if (log.isDebugEnabled()) {
- log.debug("Disconnecting from {}", getHttpUri().toASCIIString());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Disconnecting from {}", getHttpUri().toASCIIString());
}
websocket.removeWebSocketListener(listener);
websocket.sendCloseFrame();
@@ -151,7 +155,7 @@ public class WsEndpoint extends AhcEndpoint {
void reConnect() throws Exception {
if (websocket == null || !websocket.isOpen()) {
String uri = getHttpUri().toASCIIString();
- log.info("Reconnecting websocket: {}", uri);
+ LOG.info("Reconnecting websocket: {}", uri);
connect();
}
}
@@ -160,16 +164,16 @@ public class WsEndpoint extends AhcEndpoint {
@Override
public void onOpen(WebSocket websocket) {
- log.debug("Websocket opened");
+ LOG.debug("Websocket opened");
}
@Override
public void onClose(WebSocket websocket, int code, String reason) {
- log.debug("websocket closed - reconnecting");
+ LOG.debug("websocket closed - reconnecting");
try {
reConnect();
} catch (Exception e) {
- log.warn("Error re-connecting to websocket", e);
+ LOG.warn("Error re-connecting to websocket", e);
ExceptionHandler exceptionHandler = getExceptionHandler();
if (exceptionHandler != null) {
exceptionHandler.handleException("Error re-connecting to websocket", e);
@@ -179,7 +183,7 @@ public class WsEndpoint extends AhcEndpoint {
@Override
public void onError(Throwable t) {
- log.debug("websocket on error", t);
+ LOG.debug("websocket on error", t);
if (isSendMessageOnError()) {
for (WsConsumer consumer : consumers) {
consumer.sendMessage(t);
@@ -189,7 +193,7 @@ public class WsEndpoint extends AhcEndpoint {
@Override
public void onBinaryFrame(byte[] message, boolean finalFragment, int rsv) {
- log.debug("Received message --> {}", message);
+ LOG.debug("Received message --> {}", message);
for (WsConsumer consumer : consumers) {
consumer.sendMessage(message);
}
@@ -197,7 +201,7 @@ public class WsEndpoint extends AhcEndpoint {
@Override
public void onTextFrame(String message, boolean finalFragment, int rsv) {
- log.debug("Received message --> {}", message);
+ LOG.debug("Received message --> {}", message);
for (WsConsumer consumer : consumers) {
consumer.sendMessage(message);
}
@@ -205,7 +209,7 @@ public class WsEndpoint extends AhcEndpoint {
@Override
public void onPingFrame(byte[] payload) {
- log.debug("Received ping --> {}", payload);
+ LOG.debug("Received ping --> {}", payload);
websocket.sendPongFrame(payload);
}
}
diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsProducer.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsProducer.java
index 716fa81..812b9d0 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsProducer.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsProducer.java
@@ -23,11 +23,16 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
import org.asynchttpclient.ws.WebSocket;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
*/
public class WsProducer extends DefaultProducer {
+
+ private static final Logger LOG = LoggerFactory.getLogger(WsProducer.class);
+
private static final int DEFAULT_STREAM_BUFFER_SIZE = 127;
private int streamBufferSize = DEFAULT_STREAM_BUFFER_SIZE;
@@ -46,7 +51,7 @@ public class WsProducer extends DefaultProducer {
Message in = exchange.getIn();
Object message = in.getBody();
if (message != null) {
- log.debug("Sending out {}", message);
+ LOG.debug("Sending out {}", message);
if (message instanceof String) {
sendMessage(getWebSocket(), (String)message, getEndpoint().isUseStreaming());
} else if (message instanceof byte[]) {
diff --git a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java
index 5cfd740..09083c8 100644
--- a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java
+++ b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java
@@ -37,13 +37,17 @@ import org.asynchttpclient.Realm;
import org.asynchttpclient.Realm.Builder;
import org.asynchttpclient.cookie.CookieStore;
import org.asynchttpclient.cookie.ThreadSafeCookieStore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* To call external HTTP services using <a href="http://github.com/sonatype/async-http-client">Async Http Client</a>
*/
@Component("ahc")
public class AhcComponent extends HeaderFilterStrategyComponent implements SSLContextParametersAware {
-
+
+ private static final Logger LOG = LoggerFactory.getLogger(AhcComponent.class);
+
private static final String CLIENT_CONFIG_PREFIX = "clientConfig.";
private static final String CLIENT_REALM_CONFIG_PREFIX = "clientConfig.realm.";
@@ -88,12 +92,12 @@ public class AhcComponent extends HeaderFilterStrategyComponent implements SSLCo
? new DefaultAsyncHttpClientConfig.Builder() : AhcComponent.cloneConfig(endpoint.getClientConfig());
if (endpoint.getClient() != null) {
- log.warn("The user explicitly set an AsyncHttpClient instance on the component or "
+ LOG.warn("The user explicitly set an AsyncHttpClient instance on the component or "
+ "endpoint, but this endpoint URI contains client configuration parameters. "
+ "Are you sure that this is what was intended? The AsyncHttpClient will be used"
+ " and the URI parameters will be ignored.");
} else if (endpoint.getClientConfig() != null) {
- log.warn("The user explicitly set an AsyncHttpClientConfig instance on the component or "
+ LOG.warn("The user explicitly set an AsyncHttpClientConfig instance on the component or "
+ "endpoint, but this endpoint URI contains client configuration parameters. "
+ "Are you sure that this is what was intended? The URI parameters will be applied"
+ " to a clone of the supplied AsyncHttpClientConfig in order to prevent unintended modification"
diff --git a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java
index 265e6d1..3e5e783 100644
--- a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java
+++ b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java
@@ -27,12 +27,15 @@ import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.HttpResponseBodyPart;
import org.asynchttpclient.HttpResponseStatus;
import org.asynchttpclient.Request;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
*/
public class AhcProducer extends DefaultAsyncProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(AhcProducer.class);
private final AsyncHttpClient client;
public AhcProducer(AhcEndpoint endpoint) {
@@ -50,7 +53,7 @@ public class AhcProducer extends DefaultAsyncProducer {
try {
// AHC supports async processing
Request request = getEndpoint().getBinding().prepareRequest(getEndpoint(), exchange);
- log.debug("Executing request {}", request);
+ LOG.debug("Executing request {}", request);
client.executeRequest(request, new AhcAsyncHandler(exchange, callback, request.getUrl(), getEndpoint().getBufferSize()));
return false;
} catch (Exception e) {
@@ -82,8 +85,8 @@ public class AhcProducer extends DefaultAsyncProducer {
@Override
public void onThrowable(Throwable t) {
- if (log.isTraceEnabled()) {
- log.trace("{} onThrowable {}", exchange.getExchangeId(), t);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("{} onThrowable {}", exchange.getExchangeId(), t);
}
try {
getEndpoint().getBinding().onThrowable(getEndpoint(), exchange, t);
@@ -96,8 +99,8 @@ public class AhcProducer extends DefaultAsyncProducer {
@Override
public Exchange onCompleted() throws Exception {
- if (log.isTraceEnabled()) {
- log.trace("{} onCompleted", exchange.getExchangeId());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("{} onCompleted", exchange.getExchangeId());
}
try {
getEndpoint().getBinding().onComplete(getEndpoint(), exchange, url, os, contentLength, statusCode, statusText);
@@ -120,8 +123,8 @@ public class AhcProducer extends DefaultAsyncProducer {
throws Exception {
// write body parts to stream, which we will bind to the Camel Exchange in onComplete
os.write(bodyPart.getBodyPartBytes());
- if (log.isTraceEnabled()) {
- log.trace("{} onBodyPartReceived {} bytes", exchange.getExchangeId(), bodyPart.length());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("{} onBodyPartReceived {} bytes", exchange.getExchangeId(), bodyPart.length());
}
contentLength += bodyPart.length();
return State.CONTINUE;
@@ -130,8 +133,8 @@ public class AhcProducer extends DefaultAsyncProducer {
@Override
public State onStatusReceived(HttpResponseStatus responseStatus)
throws Exception {
- if (log.isTraceEnabled()) {
- log.trace("{} onStatusReceived {}", exchange.getExchangeId(), responseStatus);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("{} onStatusReceived {}", exchange.getExchangeId(), responseStatus);
}
try {
statusCode = responseStatus.getStatusCode();
@@ -145,8 +148,8 @@ public class AhcProducer extends DefaultAsyncProducer {
@Override
public State onHeadersReceived(HttpHeaders headers) throws Exception {
- if (log.isTraceEnabled()) {
- log.trace("{} onHeadersReceived {}", exchange.getExchangeId(), headers);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("{} onHeadersReceived {}", exchange.getExchangeId(), headers);
}
try {
getEndpoint().getBinding().onHeadersReceived(getEndpoint(), exchange, headers);
diff --git a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Component.java b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Component.java
index 3c85b34..48ca689 100644
--- a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Component.java
+++ b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Component.java
@@ -25,13 +25,17 @@ import org.apache.camel.component.as2.internal.AS2ApiName;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.component.AbstractApiComponent;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Represents the component that manages {@link AS2Endpoint}.
*/
@Component("as2")
public class AS2Component extends AbstractApiComponent<AS2ApiName, AS2Configuration, AS2ApiCollection> {
-
+
+ private static final Logger LOG = LoggerFactory.getLogger(AS2Component.class);
+
public AS2Component() {
super(AS2Endpoint.class, AS2ApiName.class, AS2ApiCollection.getCollection());
}
@@ -65,7 +69,7 @@ public class AS2Component extends AbstractApiComponent<AS2ApiName, AS2Configurat
protected void doStart() throws Exception {
super.doStart();
if (Security.getProvider("BC") == null) {
- log.debug("Adding BouncyCastleProvider as security provider");
+ LOG.debug("Adding BouncyCastleProvider as security provider");
Security.addProvider(new BouncyCastleProvider());
}
}
diff --git a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Consumer.java b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Consumer.java
index 4d57c9f..f918f3d 100644
--- a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Consumer.java
+++ b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Consumer.java
@@ -41,12 +41,16 @@ import org.apache.http.HttpResponse;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpCoreContext;
import org.apache.http.protocol.HttpRequestHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The AS2 consumer.
*/
public class AS2Consumer extends AbstractApiConsumer<AS2ApiName, AS2Configuration> implements HttpRequestHandler {
+ private static final Logger LOG = LoggerFactory.getLogger(AS2Consumer.class);
+
private static final String HANDLER_PROPERTY = "handler";
private static final String REQUEST_URI_PROPERTY = "requestUri";
@@ -127,7 +131,7 @@ public class AS2Consumer extends AbstractApiConsumer<AS2ApiName, AS2Configuratio
exception = exchange.getException();
}
} catch (Exception e) {
- log.info("Failed to process AS2 message", e);
+ LOG.info("Failed to process AS2 message", e);
exception = e;
}
diff --git a/components/camel-asterisk/src/main/java/org/apache/camel/component/asterisk/AsteriskProducer.java b/components/camel-asterisk/src/main/java/org/apache/camel/component/asterisk/AsteriskProducer.java
index d6673bb..b346f6d 100644
--- a/components/camel-asterisk/src/main/java/org/apache/camel/component/asterisk/AsteriskProducer.java
+++ b/components/camel-asterisk/src/main/java/org/apache/camel/component/asterisk/AsteriskProducer.java
@@ -25,12 +25,16 @@ import org.asteriskjava.manager.AuthenticationFailedException;
import org.asteriskjava.manager.TimeoutException;
import org.asteriskjava.manager.action.ManagerAction;
import org.asteriskjava.manager.response.ManagerResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The Asterisk producer.
*/
public class AsteriskProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(AsteriskProducer.class);
+
private final AsteriskEndpoint endpoint;
private final AsteriskConnection connection;
@@ -67,7 +71,7 @@ public class AsteriskProducer extends DefaultProducer {
// Action must be set
ObjectHelper.notNull(action, "action");
- log.debug("Send action {}", action);
+ LOG.debug("Send action {}", action);
ManagerAction managerAction = action.apply(exchange);
ManagerResponse managerResponse = connection.sendAction(managerAction);
diff --git a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/AtmosEndpoint.java b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/AtmosEndpoint.java
index a9c0e1c..61a74fb 100644
--- a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/AtmosEndpoint.java
+++ b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/AtmosEndpoint.java
@@ -65,8 +65,6 @@ public class AtmosEndpoint extends DefaultEndpoint {
*/
@Override
public Producer createProducer() throws Exception {
- log.debug("resolve producer atmos endpoint {{}}", configuration.getOperation());
- log.debug("resolve producer atmos attached client: {}", configuration.getClient());
if (configuration.getOperation() == AtmosOperation.put) {
return new AtmosPutProducer(this, configuration);
} else if (this.configuration.getOperation() == AtmosOperation.del) {
@@ -88,9 +86,6 @@ public class AtmosEndpoint extends DefaultEndpoint {
*/
@Override
public Consumer createConsumer(Processor processor) throws Exception {
- log.debug("resolve consumer atmos endpoint {{}}", configuration.getOperation());
- log.debug("resolve consumer atmos attached client:{}", configuration.getClient());
-
AtmosScheduledPollConsumer consumer;
if (this.configuration.getOperation() == AtmosOperation.get) {
consumer = new AtmosScheduledPollGetConsumer(this, processor, configuration);
diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketProducer.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketProducer.java
index a8a0203..ff9d664 100644
--- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketProducer.java
+++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketProducer.java
@@ -75,9 +75,9 @@ public class WebsocketProducer extends DefaultProducer {
message = in.getBody(byte[].class);
}
- log.debug("Sending to {}", message);
+ LOG.debug("Sending to {}", message);
if (getEndpoint().isSendToAll()) {
- log.debug("Sending to all -> {}", message);
+ LOG.debug("Sending to all -> {}", message);
//TODO consider using atmosphere's broadcast or a more configurable async send
for (final WebSocket websocket : getEndpoint().getWebSocketStore().getAllWebSockets()) {
sendMessage(websocket, message);
@@ -99,12 +99,12 @@ public class WebsocketProducer extends DefaultProducer {
List<String> notValidConnectionKeys = new ArrayList<>();
for (final String connectionKey : connectionKeyList) {
- log.debug("Sending to connection key {} -> {}", connectionKey, message);
+ LOG.debug("Sending to connection key {} -> {}", connectionKey, message);
sendMessage(getWebSocket(connectionKey, notValidConnectionKeys), message);
}
if (!notValidConnectionKeys.isEmpty()) {
- log.debug("Some connections have not received the message {}", message);
+ LOG.debug("Some connections have not received the message {}", message);
getEndpoint().getWebsocketConsumer().sendNotDeliveredMessage(notValidConnectionKeys, message);
}
}
@@ -140,7 +140,7 @@ public class WebsocketProducer extends DefaultProducer {
if (websocket == null) {
//collect for call back to handle not sent message(s) to guaranty delivery
notValidConnectionKeys.add(connectionKey);
- log.debug("Failed to send message to single connection; connetion key is not valid. {}", connectionKey);
+ LOG.debug("Failed to send message to single connection; connetion key is not valid. {}", connectionKey);
}
}
return websocket;
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientProducer.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientProducer.java
index c2c1978..47086dd 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientProducer.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientProducer.java
@@ -31,6 +31,9 @@ import org.apache.camel.component.atomix.AtomixAsyncMessageProcessor;
import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.support.DefaultAsyncProducer;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.component.atomix.client.AtomixClientConstants.RESOURCE_ACTION_HAS_RESULT;
import static org.apache.camel.component.atomix.client.AtomixClientConstants.RESOURCE_NAME;
@@ -38,6 +41,8 @@ import static org.apache.camel.support.ObjectHelper.invokeMethodSafe;
public abstract class AbstractAtomixClientProducer<E extends AbstractAtomixClientEndpoint, R extends Resource> extends DefaultAsyncProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractAtomixClientProducer.class);
+
private final Map<String, AtomixAsyncMessageProcessor> processors;
private ConcurrentMap<String, R> resources;
@@ -133,8 +138,10 @@ public abstract class AbstractAtomixClientProducer<E extends AbstractAtomixClien
throw new IllegalArgumentException("Second argument should be of type AsyncCallback");
}
- log.debug("bind key={}, class={}, method={}",
- annotation.value(), this.getClass(), method.getName());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("bind key={}, class={}, method={}",
+ annotation.value(), this.getClass(), method.getName());
+ }
this.processors.put(annotation.value(), (m, c) -> (boolean)invokeMethodSafe(method, this, m, c));
} else {
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumer.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumer.java
index 429699e..abf16c9 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumer.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapConsumer.java
@@ -25,9 +25,13 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.atomix.client.AbstractAtomixClientConsumer;
import org.apache.camel.component.atomix.client.AtomixClientConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class AtomixMapConsumer extends AbstractAtomixClientConsumer<AtomixMapEndpoint> {
+ private static final Logger LOG = LoggerFactory.getLogger(AtomixMapConsumer.class);
+
private final List<Listener<DistributedMap.EntryEvent<Object, Object>>> listeners;
private final String resourceName;
private final String resultHeader;
@@ -55,12 +59,12 @@ public final class AtomixMapConsumer extends AbstractAtomixClientConsumer<Atomix
Object key = getAtomixEndpoint().getConfiguration().getKey();
if (key == null) {
- log.debug("Subscribe to events for map: {}", resourceName);
+ LOG.debug("Subscribe to events for map: {}", resourceName);
this.listeners.add(this.map.onAdd(this::onEvent).join());
this.listeners.add(this.map.onRemove(this::onEvent).join());
this.listeners.add(this.map.onUpdate(this::onEvent).join());
} else {
- log.debug("Subscribe to events for map: {}, key: {}", resourceName, key);
+ LOG.debug("Subscribe to events for map: {}, key: {}", resourceName, key);
this.listeners.add(this.map.onAdd(key, this::onEvent).join());
this.listeners.add(this.map.onRemove(key, this::onEvent).join());
this.listeners.add(this.map.onUpdate(key, this::onEvent).join());
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingConsumer.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingConsumer.java
index 34590ab..f4beedd 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingConsumer.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingConsumer.java
@@ -29,6 +29,9 @@ import org.apache.camel.Processor;
import org.apache.camel.component.atomix.client.AbstractAtomixClientConsumer;
import org.apache.camel.component.atomix.client.AtomixClientConstants;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.component.atomix.client.AtomixClientConstants.CHANNEL_NAME;
import static org.apache.camel.component.atomix.client.AtomixClientConstants.MEMBER_NAME;
@@ -36,6 +39,8 @@ import static org.apache.camel.component.atomix.client.AtomixClientConstants.RES
public final class AtomixMessagingConsumer extends AbstractAtomixClientConsumer<AtomixMessagingEndpoint> {
+ private static final Logger LOG = LoggerFactory.getLogger(AtomixMessagingConsumer.class);
+
private final List<Listener<Message<Object>>> listeners;
private final String resultHeader;
private final String groupName;
@@ -71,7 +76,7 @@ public final class AtomixMessagingConsumer extends AbstractAtomixClientConsumer<
this.localMember = group.join(memberName).join();
this.consumer = localMember.messaging().consumer(channelName);
- log.debug("Subscribe to group: {}, member: {}, channel: {}", groupName, memberName, channelName);
+ LOG.debug("Subscribe to group: {}, member: {}, channel: {}", groupName, memberName, channelName);
this.listeners.add(consumer.onMessage(this::onMessage));
}
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumer.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumer.java
index aa19c44..88e2315 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumer.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueConsumer.java
@@ -25,9 +25,13 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.atomix.client.AbstractAtomixClientConsumer;
import org.apache.camel.component.atomix.client.AtomixClientConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class AtomixQueueConsumer extends AbstractAtomixClientConsumer<AtomixQueueEndpoint> {
+ private static final Logger LOG = LoggerFactory.getLogger(AtomixQueueConsumer.class);
+
private final List<Listener<DistributedQueue.ValueEvent<Object>>> listeners;
private final String resourceName;
private final String resultHeader;
@@ -53,7 +57,7 @@ public final class AtomixQueueConsumer extends AbstractAtomixClientConsumer<Atom
.join();
- log.debug("Subscribe to events for queue: {}", resourceName);
+ LOG.debug("Subscribe to events for queue: {}", resourceName);
this.listeners.add(this.queue.onAdd(this::onEvent).join());
this.listeners.add(this.queue.onRemove(this::onEvent).join());
}
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumer.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumer.java
index 9687258..1942d63 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumer.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetConsumer.java
@@ -25,9 +25,13 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.atomix.client.AbstractAtomixClientConsumer;
import org.apache.camel.component.atomix.client.AtomixClientConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class AtomixSetConsumer extends AbstractAtomixClientConsumer<AtomixSetEndpoint> {
+ private static final Logger LOG = LoggerFactory.getLogger(AtomixSetConsumer.class);
+
private final List<Listener<DistributedSet.ValueEvent<Object>>> listeners;
private final String resourceName;
private final String resultHeader;
@@ -53,7 +57,7 @@ public final class AtomixSetConsumer extends AbstractAtomixClientConsumer<Atomix
.join();
- log.debug("Subscribe to events for set: {}", resourceName);
+ LOG.debug("Subscribe to events for set: {}", resourceName);
this.listeners.add(this.set.onAdd(this::onEvent).join());
this.listeners.add(this.set.onRemove(this::onEvent).join());
}
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumer.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumer.java
index d39d691..5347929 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumer.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueConsumer.java
@@ -25,9 +25,13 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.atomix.client.AbstractAtomixClientConsumer;
import org.apache.camel.component.atomix.client.AtomixClientConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class AtomixValueConsumer extends AbstractAtomixClientConsumer<AtomixValueEndpoint> {
+ private static final Logger LOG = LoggerFactory.getLogger(AtomixValueConsumer.class);
+
private final List<Listener<DistributedValue.ChangeEvent<Object>>> listeners;
private final String resourceName;
private final String resultHeader;
@@ -53,7 +57,7 @@ public final class AtomixValueConsumer extends AbstractAtomixClientConsumer<Atom
.join();
- log.debug("Subscribe to events for value: {}", resourceName);
+ LOG.debug("Subscribe to events for value: {}", resourceName);
this.listeners.add(this.value.onChange(this::onEvent).join());
}
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterService.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterService.java
index a959d9f..e3acabf 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterService.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterService.java
@@ -24,9 +24,13 @@ import io.atomix.copycat.server.storage.StorageLevel;
import org.apache.camel.CamelContext;
import org.apache.camel.support.cluster.AbstractCamelClusterService;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class AtomixClusterService extends AbstractCamelClusterService<AtomixClusterView> {
+ private static final Logger LOG = LoggerFactory.getLogger(AtomixClusterService.class);
+
private Address address;
private AtomixClusterConfiguration configuration;
private AtomixReplica atomix;
@@ -140,7 +144,7 @@ public final class AtomixClusterService extends AbstractCamelClusterService<Atom
super.doStop();
if (atomix != null) {
- log.debug("Leaving atomix cluster replica {}", atomix);
+ LOG.debug("Leaving atomix cluster replica {}", atomix);
atomix.leave().join();
}
}
@@ -160,13 +164,13 @@ public final class AtomixClusterService extends AbstractCamelClusterService<Atom
atomix = AtomixClusterHelper.createReplica(getCamelContext(), address, configuration);
if (ObjectHelper.isNotEmpty(configuration.getNodes())) {
- log.debug("Bootstrap cluster on address {} for nodes: {}", address, configuration.getNodes());
+ LOG.debug("Bootstrap cluster on address {} for nodes: {}", address, configuration.getNodes());
this.atomix.bootstrap(configuration.getNodes()).join();
- log.debug("Bootstrap cluster done");
+ LOG.debug("Bootstrap cluster done");
} else {
- log.debug("Bootstrap cluster on address {}", address);
+ LOG.debug("Bootstrap cluster on address {}", address);
this.atomix.bootstrap().join();
- log.debug("Bootstrap cluster done");
+ LOG.debug("Bootstrap cluster done");
}
}
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterView.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterView.java
index 9ed1027..eb97a9d 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterView.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterView.java
@@ -31,9 +31,13 @@ import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.component.atomix.AtomixConfiguration;
import org.apache.camel.support.cluster.AbstractCamelClusterView;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
final class AtomixClusterView extends AbstractCamelClusterView {
+ private static final Logger LOG = LoggerFactory.getLogger(AtomixClusterView.class);
+
private final Atomix atomix;
private final AtomixLocalMember localMember;
private final AtomixConfiguration<?> configuration;
@@ -81,7 +85,7 @@ final class AtomixClusterView extends AbstractCamelClusterView {
@Override
protected void doStart() throws Exception {
if (!localMember.hasJoined()) {
- log.debug("Get group {}", getNamespace());
+ LOG.debug("Get group {}", getNamespace());
group = this.atomix.getGroup(
getNamespace(),
@@ -89,28 +93,28 @@ final class AtomixClusterView extends AbstractCamelClusterView {
new DistributedGroup.Options(configuration.getResourceOptions(getNamespace()))
).get();
- log.debug("Listen election events");
+ LOG.debug("Listen election events");
group.election().onElection(term -> {
if (isRunAllowed()) {
fireLeadershipChangedEvent(Optional.of(toClusterMember(term.leader())));
}
});
- log.debug("Listen join events");
+ LOG.debug("Listen join events");
group.onJoin(member -> {
if (isRunAllowed()) {
fireMemberAddedEvent(toClusterMember(member));
}
});
- log.debug("Listen leave events");
+ LOG.debug("Listen leave events");
group.onLeave(member -> {
if (isRunAllowed()) {
fireMemberRemovedEvent(toClusterMember(member));
}
});
- log.debug("Join group {}", getNamespace());
+ LOG.debug("Join group {}", getNamespace());
localMember.join();
}
}
@@ -175,11 +179,11 @@ final class AtomixClusterView extends AbstractCamelClusterView {
if (member == null && group != null) {
String id = getClusterService().getId();
if (ObjectHelper.isEmpty(id) || configuration.isEphemeral()) {
- log.debug("Joining group: {}", group);
+ LOG.debug("Joining group: {}", group);
member = group.join().join();
- log.debug("Group {} joined with id {}", group, member.id());
+ LOG.debug("Group {} joined with id {}", group, member.id());
} else {
- log.debug("Joining group: {}, with id: {}", group, id);
+ LOG.debug("Joining group: {}, with id: {}", group, id);
member = group.join(id).join();
}
}
@@ -191,7 +195,7 @@ final class AtomixClusterView extends AbstractCamelClusterView {
if (member != null) {
String id = member.id();
- log.debug("Member {} : leave group {}", id, group);
+ LOG.debug("Member {} : leave group {}", id, group);
member.leave().join();
group.remove(id).join();
diff --git a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java
index 28b6ae0..340dd69 100644
--- a/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java
+++ b/components/camel-aws-cw/src/main/java/org/apache/camel/component/aws/cw/CwProducer.java
@@ -32,12 +32,16 @@ import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Producer which sends messages to the AWS CloudWatch Service
*/
public class CwProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(CwProducer.class);
+
private transient String cwProducerToString;
public CwProducer(Endpoint endpoint) {
@@ -52,7 +56,7 @@ public class CwProducer extends DefaultProducer {
.withMetricData(metricData)
.withNamespace(determineNameSpace(exchange));
- log.info("Sending request [{}] from exchange [{}]...", request, exchange);
+ LOG.info("Sending request [{}] from exchange [{}]...", request, exchange);
getEndpoint().getCloudWatchClient().putMetricData(request);
}
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
index d691148..c1ccc4e 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddb/DdbEndpoint.java
@@ -40,6 +40,8 @@ import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.ScheduledPollEndpoint;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The aws-ddb component is used for storing and retrieving data from Amazon's DynamoDB service.
@@ -47,6 +49,8 @@ import org.apache.camel.util.ObjectHelper;
@UriEndpoint(firstVersion = "2.10.0", scheme = "aws-ddb", title = "AWS DynamoDB", syntax = "aws-ddb:tableName", producerOnly = true, label = "cloud,database,nosql")
public class DdbEndpoint extends ScheduledPollEndpoint {
+ private static final Logger LOG = LoggerFactory.getLogger(DdbEndpoint.class);
+
@UriParam
private DdbConfiguration configuration;
@@ -75,7 +79,7 @@ public class DdbEndpoint extends ScheduledPollEndpoint {
: createDdbClient();
String tableName = getConfiguration().getTableName();
- log.trace("Querying whether table [{}] already exists...", tableName);
+ LOG.trace("Querying whether table [{}] already exists...", tableName);
try {
DescribeTableRequest request = new DescribeTableRequest().withTableName(tableName);
@@ -84,17 +88,17 @@ public class DdbEndpoint extends ScheduledPollEndpoint {
waitForTableToBecomeAvailable(tableName);
}
- log.trace("Table [{}] already exists", tableName);
+ LOG.trace("Table [{}] already exists", tableName);
return;
} catch (ResourceNotFoundException e) {
- log.trace("Table [{}] doesn't exist yet", tableName);
- log.trace("Creating table [{}]...", tableName);
+ LOG.trace("Table [{}] doesn't exist yet", tableName);
+ LOG.trace("Creating table [{}]...", tableName);
TableDescription tableDescription = createTable(tableName);
if (!isTableActive(tableDescription)) {
waitForTableToBecomeAvailable(tableName);
}
- log.trace("Table [{}] created", tableName);
+ LOG.trace("Table [{}] created", tableName);
}
}
@@ -163,7 +167,7 @@ public class DdbEndpoint extends ScheduledPollEndpoint {
}
private void waitForTableToBecomeAvailable(String tableName) {
- log.trace("Waiting for [{}] to become ACTIVE...", tableName);
+ LOG.trace("Waiting for [{}] to become ACTIVE...", tableName);
long waitTime = 5 * 60 * 1000;
while (waitTime > 0) {
@@ -176,10 +180,10 @@ public class DdbEndpoint extends ScheduledPollEndpoint {
DescribeTableRequest request = new DescribeTableRequest().withTableName(tableName);
TableDescription tableDescription = getDdbClient().describeTable(request).getTable();
if (isTableActive(tableDescription)) {
- log.trace("Table [{}] became active", tableName);
+ LOG.trace("Table [{}] became active", tableName);
return;
}
- log.trace("Table [{}] not active yet", tableName);
+ LOG.trace("Table [{}] not active yet", tableName);
} catch (AmazonServiceException ase) {
if (!ase.getErrorCode().equalsIgnoreCase("ResourceNotFoundException")) {
throw ase;
diff --git a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumer.java b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumer.java
index 899e45e..6831e3a 100644
--- a/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumer.java
+++ b/components/camel-aws-ddb/src/main/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumer.java
@@ -32,9 +32,13 @@ import org.apache.camel.Processor;
import org.apache.camel.support.ScheduledBatchPollingConsumer;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DdbStreamConsumer extends ScheduledBatchPollingConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(DdbStreamConsumer.class);
+
private final ShardIteratorHandler shardIteratorHandler;
private String lastSeenSequenceNumber;
@@ -56,7 +60,7 @@ public class DdbStreamConsumer extends ScheduledBatchPollingConsumer {
.withLimit(getEndpoint().getConfiguration().getMaxResultsPerRequest());
result = getClient().getRecords(req);
} catch (ExpiredIteratorException e) {
- log.warn("Expired Shard Iterator, attempting to resume from {}", lastSeenSequenceNumber, e);
+ LOG.warn("Expired Shard Iterator, attempting to resume from {}", lastSeenSequenceNumber, e);
GetRecordsRequest req = new GetRecordsRequest()
.withShardIterator(shardIteratorHandler.getShardIterator(lastSeenSequenceNumber))
.withLimit(getEndpoint().getConfiguration().getMaxResultsPerRequest());
@@ -81,11 +85,11 @@ public class DdbStreamConsumer extends ScheduledBatchPollingConsumer {
while (!exchanges.isEmpty()) {
final Exchange exchange = ObjectHelper.cast(Exchange.class, exchanges.poll());
- log.trace("Processing exchange [{}] started.", exchange);
+ LOG.trace("Processing exchange [{}] started.", exchange);
getAsyncProcessor().process(exchange, new AsyncCallback() {
@Override
public void done(boolean doneSync) {
- log.trace("Processing exchange [{}] done.", exchange);
+ LOG.trace("Processing exchange [{}] done.", exchange);
}
});
processedExchanges++;
diff --git a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java
index 371b2d0..0f74a12 100644
--- a/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java
+++ b/components/camel-aws-ec2/src/main/java/org/apache/camel/component/aws/ec2/EC2Producer.java
@@ -50,13 +50,17 @@ import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Producer which sends messages to the Amazon EC2 Service
* <a href="http://aws.amazon.com/ec2/">AWS EC2</a>
*/
public class EC2Producer extends DefaultProducer {
-
+
+ private static final Logger LOG = LoggerFactory.getLogger(EC2Producer.class);
+
private transient String ec2ProducerToString;
public EC2Producer(Endpoint endpoint) {
@@ -193,10 +197,10 @@ public class EC2Producer extends DefaultProducer {
try {
result = ec2Client.runInstances(request);
} catch (AmazonServiceException ase) {
- log.trace("Run Instances command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Run Instances command returned the error code {}", ase.getErrorCode());
throw ase;
}
- log.trace("Creating and running instances with ami [{}] and instance type {}", ami, instanceType);
+ LOG.trace("Creating and running instances with ami [{}] and instance type {}", ami, instanceType);
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
@@ -214,10 +218,10 @@ public class EC2Producer extends DefaultProducer {
try {
result = ec2Client.startInstances(request);
} catch (AmazonServiceException ase) {
- log.trace("Start Instances command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Start Instances command returned the error code {}", ase.getErrorCode());
throw ase;
}
- log.trace("Starting instances with Ids [{}] ", Arrays.toString(instanceIds.toArray()));
+ LOG.trace("Starting instances with Ids [{}] ", Arrays.toString(instanceIds.toArray()));
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
@@ -235,10 +239,10 @@ public class EC2Producer extends DefaultProducer {
try {
result = ec2Client.stopInstances(request);
} catch (AmazonServiceException ase) {
- log.trace("Stop Instances command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Stop Instances command returned the error code {}", ase.getErrorCode());
throw ase;
}
- log.trace("Stopping instances with Ids [{}] ", Arrays.toString(instanceIds.toArray()));
+ LOG.trace("Stopping instances with Ids [{}] ", Arrays.toString(instanceIds.toArray()));
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
@@ -256,10 +260,10 @@ public class EC2Producer extends DefaultProducer {
try {
result = ec2Client.terminateInstances(request);
} catch (AmazonServiceException ase) {
- log.trace("Terminate Instances command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Terminate Instances command returned the error code {}", ase.getErrorCode());
throw ase;
}
- log.trace("Terminating instances with Ids [{}] ", Arrays.toString(instanceIds.toArray()));
+ LOG.trace("Terminating instances with Ids [{}] ", Arrays.toString(instanceIds.toArray()));
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
@@ -275,7 +279,7 @@ public class EC2Producer extends DefaultProducer {
try {
result = ec2Client.describeInstances(request);
} catch (AmazonServiceException ase) {
- log.trace("Describe Instances command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Describe Instances command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -293,7 +297,7 @@ public class EC2Producer extends DefaultProducer {
try {
result = ec2Client.describeInstanceStatus(request);
} catch (AmazonServiceException ase) {
- log.trace("Describe Instances Status command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Describe Instances Status command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -310,10 +314,10 @@ public class EC2Producer extends DefaultProducer {
throw new IllegalArgumentException("Instances Ids must be specified");
}
try {
- log.trace("Rebooting instances with Ids [{}] ", Arrays.toString(instanceIds.toArray()));
+ LOG.trace("Rebooting instances with Ids [{}] ", Arrays.toString(instanceIds.toArray()));
ec2Client.rebootInstances(request);
} catch (AmazonServiceException ase) {
- log.trace("Reboot Instances command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Reboot Instances command returned the error code {}", ase.getErrorCode());
throw ase;
}
}
@@ -331,10 +335,10 @@ public class EC2Producer extends DefaultProducer {
try {
result = ec2Client.monitorInstances(request);
} catch (AmazonServiceException ase) {
- log.trace("Monitor Instances command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Monitor Instances command returned the error code {}", ase.getErrorCode());
throw ase;
}
- log.trace("Start Monitoring instances with Ids [{}] ", Arrays.toString(instanceIds.toArray()));
+ LOG.trace("Start Monitoring instances with Ids [{}] ", Arrays.toString(instanceIds.toArray()));
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
@@ -352,10 +356,10 @@ public class EC2Producer extends DefaultProducer {
try {
result = ec2Client.unmonitorInstances(request);
} catch (AmazonServiceException ase) {
- log.trace("Unmonitor Instances command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Unmonitor Instances command returned the error code {}", ase.getErrorCode());
throw ase;
}
- log.trace("Stop Monitoring instances with Ids [{}] ", Arrays.toString(instanceIds.toArray()));
+ LOG.trace("Stop Monitoring instances with Ids [{}] ", Arrays.toString(instanceIds.toArray()));
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
@@ -380,10 +384,10 @@ public class EC2Producer extends DefaultProducer {
try {
result = ec2Client.createTags(request);
} catch (AmazonServiceException ase) {
- log.trace("Create tags command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Create tags command returned the error code {}", ase.getErrorCode());
throw ase;
}
- log.trace("Created tags [{}] on resources with Ids [{}] ", Arrays.toString(tags.toArray()), Arrays.toString(instanceIds.toArray()));
+ LOG.trace("Created tags [{}] on resources with Ids [{}] ", Arrays.toString(tags.toArray()), Arrays.toString(instanceIds.toArray()));
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
@@ -408,10 +412,10 @@ public class EC2Producer extends DefaultProducer {
try {
result = ec2Client.deleteTags(request);
} catch (AmazonServiceException ase) {
- log.trace("Delete tags command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Delete tags command returned the error code {}", ase.getErrorCode());
throw ase;
}
- log.trace("Delete tags [{}] on resources with Ids [{}] ", Arrays.toString(tags.toArray()), Arrays.toString(instanceIds.toArray()));
+ LOG.trace("Delete tags [{}] on resources with Ids [{}] ", Arrays.toString(tags.toArray()), Arrays.toString(instanceIds.toArray()));
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
diff --git a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSProducer.java b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSProducer.java
index deff48e..1a983df 100644
--- a/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSProducer.java
+++ b/components/camel-aws-ecs/src/main/java/org/apache/camel/component/aws/ecs/ECSProducer.java
@@ -32,6 +32,8 @@ import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Producer which sends messages to the Amazon ECS Service
@@ -39,6 +41,8 @@ import org.apache.camel.util.URISupport;
*/
public class ECSProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(ECSProducer.class);
+
private transient String ecsProducerToString;
public ECSProducer(Endpoint endpoint) {
@@ -100,7 +104,7 @@ public class ECSProducer extends DefaultProducer {
try {
result = ecsClient.listClusters();
} catch (AmazonServiceException ase) {
- log.trace("List Clusters command returned the error code {}", ase.getErrorCode());
+ LOG.trace("List Clusters command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -117,7 +121,7 @@ public class ECSProducer extends DefaultProducer {
try {
result = ecsClient.createCluster(request);
} catch (AmazonServiceException ase) {
- log.trace("Create Cluster command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Create Cluster command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -134,7 +138,7 @@ public class ECSProducer extends DefaultProducer {
try {
result = ecsClient.describeClusters(request);
} catch (AmazonServiceException ase) {
- log.trace("Describe Clusters command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Describe Clusters command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -153,7 +157,7 @@ public class ECSProducer extends DefaultProducer {
try {
result = ecsClient.deleteCluster(request);
} catch (AmazonServiceException ase) {
- log.trace("Delete Cluster command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Delete Cluster command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
diff --git a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSProducer.java b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSProducer.java
index b501ab3..a1e5dcf 100644
--- a/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSProducer.java
+++ b/components/camel-aws-eks/src/main/java/org/apache/camel/component/aws/eks/EKSProducer.java
@@ -33,6 +33,8 @@ import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Producer which sends messages to the Amazon EKS Service
@@ -40,6 +42,7 @@ import org.apache.camel.util.URISupport;
*/
public class EKSProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(EKSProducer.class);
private transient String eksProducerToString;
public EKSProducer(Endpoint endpoint) {
@@ -101,7 +104,7 @@ public class EKSProducer extends DefaultProducer {
try {
result = eksClient.listClusters(request);
} catch (AmazonServiceException ase) {
- log.trace("List Clusters command returned the error code {}", ase.getErrorCode());
+ LOG.trace("List Clusters command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -126,7 +129,7 @@ public class EKSProducer extends DefaultProducer {
try {
result = eksClient.createCluster(request);
} catch (AmazonServiceException ase) {
- log.trace("Create Cluster command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Create Cluster command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -145,7 +148,7 @@ public class EKSProducer extends DefaultProducer {
try {
result = eksClient.describeCluster(request);
} catch (AmazonServiceException ase) {
- log.trace("Describe Cluster command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Describe Cluster command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -164,7 +167,7 @@ public class EKSProducer extends DefaultProducer {
try {
result = eksClient.deleteCluster(request);
} catch (AmazonServiceException ase) {
- log.trace("Delete Cluster command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Delete Cluster command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
diff --git a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMProducer.java b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMProducer.java
index f62ff92..b1708fa 100644
--- a/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMProducer.java
+++ b/components/camel-aws-iam/src/main/java/org/apache/camel/component/aws/iam/IAMProducer.java
@@ -48,6 +48,8 @@ import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Producer which sends messages to the Amazon IAM Service
@@ -55,6 +57,7 @@ import org.apache.camel.util.URISupport;
*/
public class IAMProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(IAMProducer.class);
private transient String iamProducerToString;
public IAMProducer(Endpoint endpoint) {
@@ -138,7 +141,7 @@ public class IAMProducer extends DefaultProducer {
try {
result = iamClient.listAccessKeys();
} catch (AmazonServiceException ase) {
- log.trace("List Access Keys command returned the error code {}", ase.getErrorCode());
+ LOG.trace("List Access Keys command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -157,7 +160,7 @@ public class IAMProducer extends DefaultProducer {
try {
result = iamClient.createUser(request);
} catch (AmazonServiceException ase) {
- log.trace("Create user command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Create user command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -176,7 +179,7 @@ public class IAMProducer extends DefaultProducer {
try {
result = iamClient.deleteUser(request);
} catch (AmazonServiceException ase) {
- log.trace("Delete user command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Delete user command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -195,7 +198,7 @@ public class IAMProducer extends DefaultProducer {
try {
result = iamClient.getUser(request);
} catch (AmazonServiceException ase) {
- log.trace("get user command returned the error code {}", ase.getErrorCode());
+ LOG.trace("get user command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -207,7 +210,7 @@ public class IAMProducer extends DefaultProducer {
try {
result = iamClient.listUsers();
} catch (AmazonServiceException ase) {
- log.trace("List users command returned the error code {}", ase.getErrorCode());
+ LOG.trace("List users command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -224,7 +227,7 @@ public class IAMProducer extends DefaultProducer {
try {
result = iamClient.createAccessKey(request);
} catch (AmazonServiceException ase) {
- log.trace("Create Access Key command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Create Access Key command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -247,7 +250,7 @@ public class IAMProducer extends DefaultProducer {
try {
result = iamClient.deleteAccessKey(request);
} catch (AmazonServiceException ase) {
- log.trace("Delete Access Key command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Delete Access Key command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -276,7 +279,7 @@ public class IAMProducer extends DefaultProducer {
try {
result = iamClient.updateAccessKey(request);
} catch (AmazonServiceException ase) {
- log.trace("Update Access Key command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Update Access Key command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -299,7 +302,7 @@ public class IAMProducer extends DefaultProducer {
try {
result = iamClient.createGroup(request);
} catch (AmazonServiceException ase) {
- log.trace("Create Group command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Create Group command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -318,7 +321,7 @@ public class IAMProducer extends DefaultProducer {
try {
result = iamClient.deleteGroup(request);
} catch (AmazonServiceException ase) {
- log.trace("Delete Group command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Delete Group command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -330,7 +333,7 @@ public class IAMProducer extends DefaultProducer {
try {
result = iamClient.listGroups();
} catch (AmazonServiceException ase) {
- log.trace("List Groups command returned the error code {}", ase.getErrorCode());
+ LOG.trace("List Groups command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -355,7 +358,7 @@ public class IAMProducer extends DefaultProducer {
try {
result = iamClient.addUserToGroup(request);
} catch (AmazonServiceException ase) {
- log.trace("Add User To Group command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Add User To Group command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -380,7 +383,7 @@ public class IAMProducer extends DefaultProducer {
try {
result = iamClient.removeUserFromGroup(request);
} catch (AmazonServiceException ase) {
- log.trace("Remove User From Group command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Remove User From Group command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
diff --git a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseProducer.java b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseProducer.java
index 9ebec00..deece9a 100644
--- a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseProducer.java
+++ b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/firehose/KinesisFirehoseProducer.java
@@ -24,9 +24,13 @@ import com.amazonaws.services.kinesisfirehose.model.Record;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class KinesisFirehoseProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(KinesisFirehoseProducer.class);
+
public KinesisFirehoseProducer(KinesisFirehoseEndpoint endpoint) {
super(endpoint);
}
@@ -39,9 +43,9 @@ public class KinesisFirehoseProducer extends DefaultProducer {
@Override
public void process(Exchange exchange) throws Exception {
PutRecordRequest request = createRequest(exchange);
- log.trace("Sending request [{}] from exchange [{}]...", request, exchange);
+ LOG.trace("Sending request [{}] from exchange [{}]...", request, exchange);
PutRecordResult putRecordResult = getEndpoint().getClient().putRecord(request);
- log.trace("Received result [{}]", putRecordResult);
+ LOG.trace("Received result [{}]", putRecordResult);
Message message = getMessageForResponse(exchange);
message.setHeader(KinesisFirehoseConstants.RECORD_ID, putRecordResult.getRecordId());
}
diff --git a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisConsumer.java b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisConsumer.java
index 2a500ff..9a47456 100644
--- a/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisConsumer.java
+++ b/components/camel-aws-kinesis/src/main/java/org/apache/camel/component/aws/kinesis/KinesisConsumer.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.aws.kinesis;
import java.util.ArrayDeque;
-import java.util.Iterator;
import java.util.List;
import java.util.Queue;
@@ -37,9 +36,13 @@ import org.apache.camel.Processor;
import org.apache.camel.support.ScheduledBatchPollingConsumer;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class KinesisConsumer extends ScheduledBatchPollingConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(KinesisConsumer.class);
+
private String currentShardIterator;
private boolean isShardClosed;
@@ -64,12 +67,12 @@ public class KinesisConsumer extends ScheduledBatchPollingConsumer {
if (isShardClosed) {
switch (getEndpoint().getConfiguration().getShardClosed()) {
case ignore:
- log.warn("The shard {} is in closed state", currentShardIterator);
+ LOG.warn("The shard {} is in closed state", currentShardIterator);
break;
case silent:
break;
case fail:
- log.info("Shard Iterator reaches CLOSE status:{} {}", getEndpoint().getConfiguration().getStreamName(), getEndpoint().getConfiguration().getShardId());
+ LOG.info("Shard Iterator reaches CLOSE status:{} {}", getEndpoint().getConfiguration().getStreamName(), getEndpoint().getConfiguration().getShardId());
throw new ReachedClosedStatusException(getEndpoint().getConfiguration().getStreamName(), getEndpoint().getConfiguration().getShardId());
default:
throw new IllegalArgumentException("Unsupported shard closed strategy");
@@ -85,11 +88,11 @@ public class KinesisConsumer extends ScheduledBatchPollingConsumer {
while (!exchanges.isEmpty()) {
final Exchange exchange = ObjectHelper.cast(Exchange.class, exchanges.poll());
- log.trace("Processing exchange [{}] started.", exchange);
+ LOG.trace("Processing exchange [{}] started.", exchange);
getAsyncProcessor().process(exchange, new AsyncCallback() {
@Override
public void done(boolean doneSync) {
- log.trace("Processing exchange [{}] done.", exchange);
+ LOG.trace("Processing exchange [{}] done.", exchange);
}
});
processedExchanges++;
@@ -129,7 +132,7 @@ public class KinesisConsumer extends ScheduledBatchPollingConsumer {
shardId = res1.getStreamDescription().getShards().get(0).getShardId();
isShardClosed = res1.getStreamDescription().getShards().get(0).getSequenceNumberRange().getEndingSequenceNumber() != null;
}
- log.debug("ShardId is: {}", shardId);
+ LOG.debug("ShardId is: {}", shardId);
GetShardIteratorRequest req = new GetShardIteratorRequest().withStreamName(getEndpoint().getConfiguration().getStreamName()).withShardId(shardId)
.withShardIteratorType(getEndpoint().getConfiguration().getIteratorType());
@@ -141,7 +144,7 @@ public class KinesisConsumer extends ScheduledBatchPollingConsumer {
GetShardIteratorResult result = getClient().getShardIterator(req);
currentShardIterator = result.getShardIterator();
}
- log.debug("Shard Iterator is: {}", currentShardIterator);
+ LOG.debug("Shard Iterator is: {}", currentShardIterator);
return currentShardIterator;
}
diff --git a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSProducer.java b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSProducer.java
index 4247edc..f09e46f 100644
--- a/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSProducer.java
+++ b/components/camel-aws-kms/src/main/java/org/apache/camel/component/aws/kms/KMSProducer.java
@@ -36,6 +36,8 @@ import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Producer which sends messages to the Amazon KMS Service
@@ -43,6 +45,8 @@ import org.apache.camel.util.URISupport;
*/
public class KMSProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(KMSProducer.class);
+
private transient String kmsProducerToString;
public KMSProducer(Endpoint endpoint) {
@@ -114,7 +118,7 @@ public class KMSProducer extends DefaultProducer {
try {
result = kmsClient.listKeys(request);
} catch (AmazonServiceException ase) {
- log.trace("List Keys command returned the error code {}", ase.getErrorCode());
+ LOG.trace("List Keys command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -131,7 +135,7 @@ public class KMSProducer extends DefaultProducer {
try {
result = kmsClient.createKey(request);
} catch (AmazonServiceException ase) {
- log.trace("Create Key command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Create Key command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -150,7 +154,7 @@ public class KMSProducer extends DefaultProducer {
try {
result = kmsClient.disableKey(request);
} catch (AmazonServiceException ase) {
- log.trace("Disable Key command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Disable Key command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -173,7 +177,7 @@ public class KMSProducer extends DefaultProducer {
try {
result = kmsClient.scheduleKeyDeletion(request);
} catch (AmazonServiceException ase) {
- log.trace("Schedule Key Deletion command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Schedule Key Deletion command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -192,7 +196,7 @@ public class KMSProducer extends DefaultProducer {
try {
result = kmsClient.describeKey(request);
} catch (AmazonServiceException ase) {
- log.trace("Describe Key command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Describe Key command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -211,7 +215,7 @@ public class KMSProducer extends DefaultProducer {
try {
result = kmsClient.enableKey(request);
} catch (AmazonServiceException ase) {
- log.trace("Enable Key command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Enable Key command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
diff --git a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaProducer.java b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaProducer.java
index 1410c77..c949908 100644
--- a/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaProducer.java
+++ b/components/camel-aws-lambda/src/main/java/org/apache/camel/component/aws/lambda/LambdaProducer.java
@@ -72,6 +72,8 @@ import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Producer which sends messages to the Amazon Web Service Lambda <a
@@ -79,6 +81,8 @@ import org.apache.camel.util.ObjectHelper;
*/
public class LambdaProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(LambdaProducer.class);
+
public LambdaProducer(final Endpoint endpoint) {
super(endpoint);
}
@@ -150,7 +154,7 @@ public class LambdaProducer extends DefaultProducer {
try {
result = lambdaClient.getFunction(new GetFunctionRequest().withFunctionName(getEndpoint().getFunction()));
} catch (AmazonServiceException ase) {
- log.trace("getFunction command returned the error code {}", ase.getErrorCode());
+ LOG.trace("getFunction command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -162,7 +166,7 @@ public class LambdaProducer extends DefaultProducer {
try {
result = lambdaClient.deleteFunction(new DeleteFunctionRequest().withFunctionName(getEndpoint().getFunction()));
} catch (AmazonServiceException ase) {
- log.trace("deleteFunction command returned the error code {}", ase.getErrorCode());
+ LOG.trace("deleteFunction command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -174,7 +178,7 @@ public class LambdaProducer extends DefaultProducer {
try {
result = lambdaClient.listFunctions();
} catch (AmazonServiceException ase) {
- log.trace("listFunctions command returned the error code {}", ase.getErrorCode());
+ LOG.trace("listFunctions command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -189,7 +193,7 @@ public class LambdaProducer extends DefaultProducer {
.withPayload(exchange.getIn().getBody(String.class));
result = lambdaClient.invoke(request);
} catch (AmazonServiceException ase) {
- log.trace("invokeFunction command returned the error code {}", ase.getErrorCode());
+ LOG.trace("invokeFunction command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -324,7 +328,7 @@ public class LambdaProducer extends DefaultProducer {
result = lambdaClient.createFunction(request);
} catch (AmazonServiceException ase) {
- log.trace("createFunction command returned the error code {}", ase.getErrorCode());
+ LOG.trace("createFunction command returned the error code {}", ase.getErrorCode());
throw ase;
}
@@ -389,7 +393,7 @@ public class LambdaProducer extends DefaultProducer {
result = lambdaClient.updateFunctionCode(request);
} catch (AmazonServiceException ase) {
- log.trace("updateFunction command returned the error code {}", ase.getErrorCode());
+ LOG.trace("updateFunction command returned the error code {}", ase.getErrorCode());
throw ase;
}
@@ -421,7 +425,7 @@ public class LambdaProducer extends DefaultProducer {
}
result = lambdaClient.createEventSourceMapping(request);
} catch (AmazonServiceException ase) {
- log.trace("createEventSourceMapping command returned the error code {}", ase.getErrorCode());
+ LOG.trace("createEventSourceMapping command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -448,7 +452,7 @@ public class LambdaProducer extends DefaultProducer {
}
result = lambdaClient.deleteEventSourceMapping(request);
} catch (AmazonServiceException ase) {
- log.trace("deleteEventSourceMapping command returned the error code {}", ase.getErrorCode());
+ LOG.trace("deleteEventSourceMapping command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -470,7 +474,7 @@ public class LambdaProducer extends DefaultProducer {
}
result = lambdaClient.listEventSourceMappings(request);
} catch (AmazonServiceException ase) {
- log.trace("listEventSourceMapping command returned the error code {}", ase.getErrorCode());
+ LOG.trace("listEventSourceMapping command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -489,7 +493,7 @@ public class LambdaProducer extends DefaultProducer {
}
result = lambdaClient.listTags(request);
} catch (AmazonServiceException ase) {
- log.trace("listTags command returned the error code {}", ase.getErrorCode());
+ LOG.trace("listTags command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -514,7 +518,7 @@ public class LambdaProducer extends DefaultProducer {
}
result = lambdaClient.tagResource(request);
} catch (AmazonServiceException ase) {
- log.trace("listTags command returned the error code {}", ase.getErrorCode());
+ LOG.trace("listTags command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -539,7 +543,7 @@ public class LambdaProducer extends DefaultProducer {
}
result = lambdaClient.untagResource(request);
} catch (AmazonServiceException ase) {
- log.trace("untagResource command returned the error code {}", ase.getErrorCode());
+ LOG.trace("untagResource command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -560,7 +564,7 @@ public class LambdaProducer extends DefaultProducer {
}
result = lambdaClient.publishVersion(request);
} catch (AmazonServiceException ase) {
- log.trace("publishVersion command returned the error code {}", ase.getErrorCode());
+ LOG.trace("publishVersion command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -573,7 +577,7 @@ public class LambdaProducer extends DefaultProducer {
ListVersionsByFunctionRequest request = new ListVersionsByFunctionRequest().withFunctionName(getEndpoint().getFunction());
result = lambdaClient.listVersionsByFunction(request);
} catch (AmazonServiceException ase) {
- log.trace("publishVersion command returned the error code {}", ase.getErrorCode());
+ LOG.trace("publishVersion command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -597,7 +601,7 @@ public class LambdaProducer extends DefaultProducer {
}
result = lambdaClient.createAlias(request);
} catch (AmazonServiceException ase) {
- log.trace("createAlias command returned the error code {}", ase.getErrorCode());
+ LOG.trace("createAlias command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -615,7 +619,7 @@ public class LambdaProducer extends DefaultProducer {
request.setName(aliasName);
result = lambdaClient.deleteAlias(request);
} catch (AmazonServiceException ase) {
- log.trace("deleteAlias command returned the error code {}", ase.getErrorCode());
+ LOG.trace("deleteAlias command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -633,7 +637,7 @@ public class LambdaProducer extends DefaultProducer {
request.setName(aliasName);
result = lambdaClient.getAlias(request);
} catch (AmazonServiceException ase) {
- log.trace("getAlias command returned the error code {}", ase.getErrorCode());
+ LOG.trace("getAlias command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -651,7 +655,7 @@ public class LambdaProducer extends DefaultProducer {
request.withFunctionVersion(version);
result = lambdaClient.listAliases(request);
} catch (AmazonServiceException ase) {
- log.trace("listAliases command returned the error code {}", ase.getErrorCode());
+ LOG.trace("listAliases command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
diff --git a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
index bf9bef4..f02cdea 100644
--- a/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
+++ b/components/camel-aws-mq/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
@@ -42,6 +42,8 @@ import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Producer which sends messages to the Amazon MQ Service
@@ -49,6 +51,8 @@ import org.apache.camel.util.URISupport;
*/
public class MQProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(MQProducer.class);
+
private transient String mqProducerToString;
public MQProducer(Endpoint endpoint) {
@@ -116,7 +120,7 @@ public class MQProducer extends DefaultProducer {
try {
result = mqClient.listBrokers(request);
} catch (AmazonServiceException ase) {
- log.trace("List Brokers command returned the error code {}", ase.getErrorCode());
+ LOG.trace("List Brokers command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -178,7 +182,7 @@ public class MQProducer extends DefaultProducer {
try {
result = mqClient.createBroker(request);
} catch (AmazonServiceException ase) {
- log.trace("Create Broker command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Create Broker command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -198,7 +202,7 @@ public class MQProducer extends DefaultProducer {
try {
result = mqClient.deleteBroker(request);
} catch (AmazonServiceException ase) {
- log.trace("Delete Broker command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Delete Broker command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -218,7 +222,7 @@ public class MQProducer extends DefaultProducer {
try {
result = mqClient.rebootBroker(request);
} catch (AmazonServiceException ase) {
- log.trace("Reboot Broker command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Reboot Broker command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -245,7 +249,7 @@ public class MQProducer extends DefaultProducer {
try {
result = mqClient.updateBroker(request);
} catch (AmazonServiceException ase) {
- log.trace("Update Broker command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Update Broker command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -265,7 +269,7 @@ public class MQProducer extends DefaultProducer {
try {
result = mqClient.describeBroker(request);
} catch (AmazonServiceException ase) {
- log.trace("Reboot Broker command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Reboot Broker command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
diff --git a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKProducer.java b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKProducer.java
index bd8318b7..d1d3f7f 100644
--- a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKProducer.java
+++ b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKProducer.java
@@ -33,6 +33,8 @@ import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Producer which sends messages to the Amazon MSK Service
@@ -40,6 +42,8 @@ import org.apache.camel.util.URISupport;
*/
public class MSKProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(MSKProducer.class);
+
private transient String mskProducerToString;
public MSKProducer(Endpoint endpoint) {
@@ -101,7 +105,7 @@ public class MSKProducer extends DefaultProducer {
try {
result = mskClient.listClusters(request);
} catch (AmazonServiceException ase) {
- log.trace("List Clusters command returned the error code {}", ase.getErrorCode());
+ LOG.trace("List Clusters command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -138,7 +142,7 @@ public class MSKProducer extends DefaultProducer {
try {
result = mskClient.createCluster(request);
} catch (AmazonServiceException ase) {
- log.trace("Create Cluster command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Create Cluster command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -157,7 +161,7 @@ public class MSKProducer extends DefaultProducer {
try {
result = mskClient.deleteCluster(request);
} catch (AmazonServiceException ase) {
- log.trace("Delete Cluster command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Delete Cluster command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
@@ -176,7 +180,7 @@ public class MSKProducer extends DefaultProducer {
try {
result = mskClient.describeCluster(request);
} catch (AmazonServiceException ase) {
- log.trace("Delete Cluster command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Delete Cluster command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
diff --git a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
index b1d1b49..9c50779 100644
--- a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
+++ b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
@@ -40,6 +40,8 @@ import org.apache.camel.util.CastUtils;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Consumer of messages from the Amazon Web Service Simple Storage Service
@@ -47,6 +49,8 @@ import org.apache.camel.util.URISupport;
*/
public class S3Consumer extends ScheduledBatchPollingConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(S3Consumer.class);
+
private String marker;
private transient String s3ConsumerToString;
@@ -65,12 +69,12 @@ public class S3Consumer extends ScheduledBatchPollingConsumer {
Queue<Exchange> exchanges;
if (fileName != null) {
- log.trace("Getting object in bucket [{}] with file name [{}]...", bucketName, fileName);
+ LOG.trace("Getting object in bucket [{}] with file name [{}]...", bucketName, fileName);
S3Object s3Object = getAmazonS3Client().getObject(new GetObjectRequest(bucketName, fileName));
exchanges = createExchanges(s3Object);
} else {
- log.trace("Queueing objects in bucket [{}]...", bucketName);
+ LOG.trace("Queueing objects in bucket [{}]...", bucketName);
ListObjectsRequest listObjectsRequest = new ListObjectsRequest();
listObjectsRequest.setBucketName(bucketName);
@@ -83,20 +87,20 @@ public class S3Consumer extends ScheduledBatchPollingConsumer {
// if there was a marker from previous poll then use that to
// continue from where we left last time
if (marker != null) {
- log.trace("Resuming from marker: {}", marker);
+ LOG.trace("Resuming from marker: {}", marker);
listObjectsRequest.setMarker(marker);
}
ObjectListing listObjects = getAmazonS3Client().listObjects(listObjectsRequest);
if (listObjects.isTruncated()) {
marker = listObjects.getNextMarker();
- log.trace("Returned list is truncated, so setting next marker: {}", marker);
+ LOG.trace("Returned list is truncated, so setting next marker: {}", marker);
} else {
// no more data so clear marker
marker = null;
}
- if (log.isTraceEnabled()) {
- log.trace("Found {} objects in bucket [{}]...", listObjects.getObjectSummaries().size(), bucketName);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Found {} objects in bucket [{}]...", listObjects.getObjectSummaries().size(), bucketName);
}
exchanges = createExchanges(listObjects.getObjectSummaries());
@@ -112,8 +116,8 @@ public class S3Consumer extends ScheduledBatchPollingConsumer {
}
protected Queue<Exchange> createExchanges(List<S3ObjectSummary> s3ObjectSummaries) {
- if (log.isTraceEnabled()) {
- log.trace("Received {} messages in this poll", s3ObjectSummaries.size());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Received {} messages in this poll", s3ObjectSummaries.size());
}
Collection<S3Object> s3Objects = new ArrayList<>();
@@ -127,7 +131,7 @@ public class S3Consumer extends ScheduledBatchPollingConsumer {
answer.add(exchange);
}
} catch (Throwable e) {
- log.warn("Error getting S3Object due: {}", e.getMessage(), e);
+ LOG.warn("Error getting S3Object due: {}", e.getMessage(), e);
// ensure all previous gathered s3 objects are closed
// if there was an exception creating the exchanges in this batch
s3Objects.forEach(IOHelper::close);
@@ -168,11 +172,11 @@ public class S3Consumer extends ScheduledBatchPollingConsumer {
}
});
- log.trace("Processing exchange [{}]...", exchange);
+ LOG.trace("Processing exchange [{}]...", exchange);
getAsyncProcessor().process(exchange, new AsyncCallback() {
@Override
public void done(boolean doneSync) {
- log.trace("Processing exchange [{}] done.", exchange);
+ LOG.trace("Processing exchange [{}] done.", exchange);
}
});
}
@@ -191,11 +195,11 @@ public class S3Consumer extends ScheduledBatchPollingConsumer {
String bucketName = exchange.getIn().getHeader(S3Constants.BUCKET_NAME, String.class);
String key = exchange.getIn().getHeader(S3Constants.KEY, String.class);
- log.trace("Deleting object from bucket {} with key {}...", bucketName, key);
+ LOG.trace("Deleting object from bucket {} with key {}...", bucketName, key);
getAmazonS3Client().deleteObject(bucketName, key);
- log.trace("Deleted object from bucket {} with key {}...", bucketName, key);
+ LOG.trace("Deleted object from bucket {} with key {}...", bucketName, key);
}
} catch (AmazonClientException e) {
getExceptionHandler().handleException("Error occurred during deleting object. This exception is ignored.", exchange, e);
@@ -210,9 +214,9 @@ public class S3Consumer extends ScheduledBatchPollingConsumer {
protected void processRollback(Exchange exchange) {
Exception cause = exchange.getException();
if (cause != null) {
- log.warn("Exchange failed, so rolling back message status: {}", exchange, cause);
+ LOG.warn("Exchange failed, so rolling back message status: {}", exchange, cause);
} else {
- log.warn("Exchange failed, so rolling back message status: {}", exchange);
+ LOG.warn("Exchange failed, so rolling back message status: {}", exchange);
}
}
diff --git a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
index 5ed2efb..b8bbb9e 100644
--- a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
+++ b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
@@ -232,7 +232,7 @@ public class S3Producer extends DefaultProducer {
} else {
is = exchange.getIn().getMandatoryBody(InputStream.class);
if (objectMetadata.getContentLength() == 0 && ObjectHelper.isEmpty(exchange.getProperty(Exchange.CONTENT_LENGTH))) {
- log.debug("The content length is not defined. It needs to be determined by reading the data into memory");
+ LOG.debug("The content length is not defined. It needs to be determined by reading the data into memory");
baos = determineLengthInputStream(is);
objectMetadata.setContentLength(baos.size());
is = new ByteArrayInputStream(baos.toByteArray());
diff --git a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java
index 0ce967c..3f5a242 100644
--- a/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java
+++ b/components/camel-aws-ses/src/main/java/org/apache/camel/component/aws/ses/SesProducer.java
@@ -34,13 +34,17 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Producer which sends messages to the Amazon Simple Email Service
* <a href="http://aws.amazon.com/ses/">AWS SES</a>
*/
public class SesProducer extends DefaultProducer {
-
+
+ private static final Logger LOG = LoggerFactory.getLogger(SesProducer.class);
+
private transient String sesProducerToString;
public SesProducer(Endpoint endpoint) {
@@ -51,16 +55,16 @@ public class SesProducer extends DefaultProducer {
public void process(Exchange exchange) throws Exception {
if (!(exchange.getIn().getBody() instanceof javax.mail.Message)) {
SendEmailRequest request = createMailRequest(exchange);
- log.trace("Sending request [{}] from exchange [{}]...", request, exchange);
+ LOG.trace("Sending request [{}] from exchange [{}]...", request, exchange);
SendEmailResult result = getEndpoint().getSESClient().sendEmail(request);
- log.trace("Received result [{}]", result);
+ LOG.trace("Received result [{}]", result);
Message message = getMessageForResponse(exchange);
message.setHeader(SesConstants.MESSAGE_ID, result.getMessageId());
} else {
SendRawEmailRequest request = createRawMailRequest(exchange);
- log.trace("Sending request [{}] from exchange [{}]...", request, exchange);
+ LOG.trace("Sending request [{}] from exchange [{}]...", request, exchange);
SendRawEmailResult result = getEndpoint().getSESClient().sendRawEmail(request);
- log.trace("Received result [{}]", result);
+ LOG.trace("Received result [{}]", result);
Message message = getMessageForResponse(exchange);
message.setHeader(SesConstants.MESSAGE_ID, result.getMessageId());
}
@@ -105,7 +109,7 @@ public class SesProducer extends DefaultProducer {
try {
content.writeTo(byteOutput);
} catch (Exception e) {
- log.error("Cannot write to byte Array");
+ LOG.error("Cannot write to byte Array");
throw e;
}
byte[] messageByteArray = ((ByteArrayOutputStream)byteOutput).toByteArray();
diff --git a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
index 4732651..bc75eac 100644
--- a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
+++ b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
@@ -46,6 +46,8 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The aws-sns component is used for sending messages to an Amazon Simple Notification Topic.
@@ -54,6 +56,8 @@ import org.apache.camel.util.ObjectHelper;
producerOnly = true, label = "cloud,mobile,messaging")
public class SnsEndpoint extends DefaultEndpoint implements HeaderFilterStrategyAware {
+ private static final Logger LOG = LoggerFactory.getLogger(SnsEndpoint.class);
+
private AmazonSNS snsClient;
@UriPath(description = "Topic name or ARN")
@@ -119,7 +123,7 @@ public class SnsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
}
} while (nextToken != null);
} catch (final AmazonServiceException ase) {
- log.trace("The list topics operation return the following error code {}", ase.getErrorCode());
+ LOG.trace("The list topics operation return the following error code {}", ase.getErrorCode());
throw ase;
}
}
@@ -136,26 +140,26 @@ public class SnsEndpoint extends DefaultEndpoint implements HeaderFilterStrategy
}
}
- log.trace("Creating topic [{}] with request [{}]...", configuration.getTopicName(), request);
+ LOG.trace("Creating topic [{}] with request [{}]...", configuration.getTopicName(), request);
CreateTopicResult result = snsClient.createTopic(request);
configuration.setTopicArn(result.getTopicArn());
- log.trace("Topic created with Amazon resource name: {}", configuration.getTopicArn());
+ LOG.trace("Topic created with Amazon resource name: {}", configuration.getTopicArn());
}
if (ObjectHelper.isNotEmpty(configuration.getPolicy())) {
- log.trace("Updating topic [{}] with policy [{}]", configuration.getTopicArn(), configuration.getPolicy());
+ LOG.trace("Updating topic [{}] with policy [{}]", configuration.getTopicArn(), configuration.getPolicy());
snsClient.setTopicAttributes(new SetTopicAttributesRequest(configuration.getTopicArn(), "Policy", configuration.getPolicy()));
- log.trace("Topic policy updated");
+ LOG.trace("Topic policy updated");
}
if (configuration.isSubscribeSNStoSQS()) {
if (ObjectHelper.isNotEmpty(configuration.getAmazonSQSClient()) && ObjectHelper.isNotEmpty(configuration.getQueueUrl())) {
String subscriptionARN = Topics.subscribeQueue(snsClient, configuration.getAmazonSQSClient(), configuration.getTopicArn(), configuration.getQueueUrl());
- log.trace("Subscription of SQS Queue to SNS Topic done with Amazon resource name: {}", subscriptionARN);
+ LOG.trace("Subscription of SQS Queue to SNS Topic done with Amazon resource name: {}", subscriptionARN);
} else {
throw new IllegalArgumentException("Using the SubscribeSNStoSQS option require both AmazonSQSClient and Queue URL options");
}
diff --git a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
index 99273f1..55e082b 100644
--- a/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
+++ b/components/camel-aws-sns/src/main/java/org/apache/camel/component/aws/sns/SnsProducer.java
@@ -34,6 +34,8 @@ import org.apache.camel.Message;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Producer which sends messages to the Amazon Web Service Simple Notification Service
@@ -41,6 +43,8 @@ import org.apache.camel.util.URISupport;
*/
public class SnsProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(SnsProducer.class);
+
private transient String snsProducerToString;
public SnsProducer(Endpoint endpoint) {
@@ -57,11 +61,11 @@ public class SnsProducer extends DefaultProducer {
request.setMessage(exchange.getIn().getBody(String.class));
request.setMessageAttributes(this.translateAttributes(exchange.getIn().getHeaders(), exchange));
- log.trace("Sending request [{}] from exchange [{}]...", request, exchange);
+ LOG.trace("Sending request [{}] from exchange [{}]...", request, exchange);
PublishResult result = getEndpoint().getSNSClient().publish(request);
- log.trace("Received result [{}]", result);
+ LOG.trace("Received result [{}]", result);
Message message = getMessageForResponse(exchange);
message.setHeader(SnsConstants.MESSAGE_ID, result.getMessageId());
@@ -117,7 +121,7 @@ public class SnsProducer extends DefaultProducer {
result.put(entry.getKey(), mav);
} else {
// cannot translate the message header to message attribute value
- log.warn("Cannot put the message header key={}, value={} into Sns MessageAttribute", entry.getKey(), entry.getValue());
+ LOG.warn("Cannot put the message header key={}, value={} into Sns MessageAttribute", entry.getKey(), entry.getValue());
}
}
}
diff --git a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
index 3df7fa9..cbf03c0 100644
--- a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
+++ b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
@@ -45,6 +45,8 @@ import org.apache.camel.support.ScheduledBatchPollingConsumer;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Consumer of messages from the Amazon Web Service Simple Queue Service
@@ -52,6 +54,8 @@ import org.apache.camel.util.URISupport;
*/
public class SqsConsumer extends ScheduledBatchPollingConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(SqsConsumer.class);
+
private ScheduledExecutorService scheduledExecutor;
private transient String sqsConsumerToString;
private Collection<String> attributeNames;
@@ -88,19 +92,19 @@ public class SqsConsumer extends ScheduledBatchPollingConsumer {
request.setMessageAttributeNames(messageAttributeNames);
}
- log.trace("Receiving messages with request [{}]...", request);
+ LOG.trace("Receiving messages with request [{}]...", request);
ReceiveMessageResult messageResult;
try {
messageResult = getClient().receiveMessage(request);
} catch (QueueDoesNotExistException e) {
- log.info("Queue does not exist....recreating now...");
+ LOG.info("Queue does not exist....recreating now...");
reConnectToQueue();
messageResult = getClient().receiveMessage(request);
}
- if (log.isTraceEnabled()) {
- log.trace("Received {} messages", messageResult.getMessages().size());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Received {} messages", messageResult.getMessages().size());
}
Queue<Exchange> exchanges = createExchanges(messageResult.getMessages());
@@ -113,21 +117,21 @@ public class SqsConsumer extends ScheduledBatchPollingConsumer {
getEndpoint().createQueue(getClient());
}
} catch (QueueDeletedRecentlyException qdr) {
- log.debug("Queue recently deleted, will retry in 30 seconds.");
+ LOG.debug("Queue recently deleted, will retry in 30 seconds.");
try {
Thread.sleep(30000);
getEndpoint().createQueue(getClient());
} catch (Exception e) {
- log.warn("failed to retry queue connection.", e);
+ LOG.warn("failed to retry queue connection.", e);
}
} catch (Exception e) {
- log.warn("Could not connect to queue in amazon.", e);
+ LOG.warn("Could not connect to queue in amazon.", e);
}
}
protected Queue<Exchange> createExchanges(List<Message> messages) {
- if (log.isTraceEnabled()) {
- log.trace("Received {} messages in this poll", messages.size());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Received {} messages in this poll", messages.size());
}
Queue<Exchange> answer = new LinkedList<>();
@@ -160,8 +164,8 @@ public class SqsConsumer extends ScheduledBatchPollingConsumer {
int delay = visibilityTimeout.intValue() / 2;
int period = visibilityTimeout.intValue();
int repeatSeconds = Double.valueOf(visibilityTimeout.doubleValue() * 1.5).intValue();
- if (log.isDebugEnabled()) {
- log.debug("Scheduled TimeoutExtender task to start after {} delay, and run with {}/{} period/repeat (seconds), to extend exchangeId: {}", delay, period,
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Scheduled TimeoutExtender task to start after {} delay, and run with {}/{} period/repeat (seconds), to extend exchangeId: {}", delay, period,
repeatSeconds, exchange.getExchangeId());
}
final ScheduledFuture<?> scheduledFuture = this.scheduledExecutor.scheduleAtFixedRate(new TimeoutExtender(exchange, repeatSeconds), delay, period,
@@ -179,7 +183,7 @@ public class SqsConsumer extends ScheduledBatchPollingConsumer {
private void cancelExtender(Exchange exchange) {
// cancel task as we are done
- log.trace("Processing done so cancelling TimeoutExtender task for exchangeId: {}", exchange.getExchangeId());
+ LOG.trace("Processing done so cancelling TimeoutExtender task for exchangeId: {}", exchange.getExchangeId());
scheduledFuture.cancel(true);
}
});
@@ -201,8 +205,8 @@ public class SqsConsumer extends ScheduledBatchPollingConsumer {
}
});
- log.trace("Processing exchange [{}]...", exchange);
- getAsyncProcessor().process(exchange, doneSync -> log.trace("Processing exchange [{}] done.", exchange));
+ LOG.trace("Processing exchange [{}]...", exchange);
+ getAsyncProcessor().process(exchange, doneSync -> LOG.trace("Processing exchange [{}] done.", exchange));
}
return total;
@@ -220,11 +224,11 @@ public class SqsConsumer extends ScheduledBatchPollingConsumer {
String receiptHandle = exchange.getIn().getHeader(SqsConstants.RECEIPT_HANDLE, String.class);
DeleteMessageRequest deleteRequest = new DeleteMessageRequest(getQueueUrl(), receiptHandle);
- log.trace("Deleting message with receipt handle {}...", receiptHandle);
+ LOG.trace("Deleting message with receipt handle {}...", receiptHandle);
getClient().deleteMessage(deleteRequest);
- log.trace("Deleted message with receipt handle {}...", receiptHandle);
+ LOG.trace("Deleted message with receipt handle {}...", receiptHandle);
}
} catch (AmazonClientException e) {
getExceptionHandler().handleException("Error occurred during deleting message. This exception is ignored.", exchange, e);
@@ -314,15 +318,15 @@ public class SqsConsumer extends ScheduledBatchPollingConsumer {
repeatSeconds);
try {
- log.trace("Extending visibility window by {} seconds for exchange {}", this.repeatSeconds, this.exchange);
+ LOG.trace("Extending visibility window by {} seconds for exchange {}", this.repeatSeconds, this.exchange);
getEndpoint().getClient().changeMessageVisibility(request);
- log.debug("Extended visibility window by {} seconds for exchange {}", this.repeatSeconds, this.exchange);
+ LOG.debug("Extended visibility window by {} seconds for exchange {}", this.repeatSeconds, this.exchange);
} catch (ReceiptHandleIsInvalidException e) {
// Ignore.
} catch (MessageNotInflightException e) {
// Ignore.
} catch (Exception e) {
- log.warn("Extending visibility window failed for exchange " + exchange + ". Will not attempt to extend visibility further. This exception will be ignored.", e);
+ LOG.warn("Extending visibility window failed for exchange " + exchange + ". Will not attempt to extend visibility further. This exception will be ignored.", e);
}
}
}
diff --git a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
index 2dcfd2f..1d95af3 100644
--- a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
+++ b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
@@ -53,6 +53,8 @@ import org.apache.camel.support.DefaultScheduledPollConsumerScheduler;
import org.apache.camel.support.ScheduledPollEndpoint;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The aws-sqs component is used for sending and receiving messages to Amazon's
@@ -61,6 +63,8 @@ import org.apache.camel.util.ObjectHelper;
@UriEndpoint(firstVersion = "2.6.0", scheme = "aws-sqs", title = "AWS Simple Queue Service", syntax = "aws-sqs:queueNameOrArn", label = "cloud,messaging")
public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterStrategyAware {
+ private static final Logger LOG = LoggerFactory.getLogger(SqsEndpoint.class);
+
private AmazonSQS client;
private String queueUrl;
@@ -157,7 +161,7 @@ public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterSt
for (String url : listQueuesResult.getQueueUrls()) {
if (url.endsWith("/" + configuration.getQueueName())) {
queueUrl = url;
- log.trace("Queue available at '{}'.", queueUrl);
+ LOG.trace("Queue available at '{}'.", queueUrl);
break;
}
}
@@ -167,13 +171,13 @@ public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterSt
if (queueUrl == null && configuration.isAutoCreateQueue()) {
createQueue(client);
} else {
- log.debug("Using Amazon SQS queue url: {}", queueUrl);
+ LOG.debug("Using Amazon SQS queue url: {}", queueUrl);
updateQueueAttributes(client);
}
}
protected void createQueue(AmazonSQS client) {
- log.trace("Queue '{}' doesn't exist. Will create it...", configuration.getQueueName());
+ LOG.trace("Queue '{}' doesn't exist. Will create it...", configuration.getQueueName());
// creates a new queue, or returns the URL of an existing one
CreateQueueRequest request = new CreateQueueRequest(configuration.getQueueName());
@@ -211,12 +215,12 @@ public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterSt
request.getAttributes().put(QueueAttributeName.KmsDataKeyReusePeriodSeconds.name(), String.valueOf(getConfiguration().getKmsDataKeyReusePeriodSeconds()));
}
}
- log.trace("Creating queue [{}] with request [{}]...", configuration.getQueueName(), request);
+ LOG.trace("Creating queue [{}] with request [{}]...", configuration.getQueueName(), request);
CreateQueueResult queueResult = client.createQueue(request);
queueUrl = queueResult.getQueueUrl();
- log.trace("Queue created and available at: {}", queueUrl);
+ LOG.trace("Queue created and available at: {}", queueUrl);
}
private void updateQueueAttributes(AmazonSQS client) {
@@ -252,9 +256,9 @@ public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterSt
}
}
if (!request.getAttributes().isEmpty()) {
- log.trace("Updating queue '{}' with the provided queue attributes...", configuration.getQueueName());
+ LOG.trace("Updating queue '{}' with the provided queue attributes...", configuration.getQueueName());
client.setQueueAttributes(request);
- log.trace("Queue '{}' updated and available at {}'", configuration.getQueueName(), queueUrl);
+ LOG.trace("Queue '{}' updated and available at {}'", configuration.getQueueName(), queueUrl);
}
}
@@ -339,7 +343,7 @@ public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterSt
final String protocol = configuration.getProtocol();
if (protocol.equals("http")) {
- log.trace("Configuring AWS-SQS for HTTP protocol");
+ LOG.trace("Configuring AWS-SQS for HTTP protocol");
if (isClientConfigFound) {
clientConfiguration = clientConfiguration.withProtocol(Protocol.HTTP);
} else {
@@ -367,7 +371,7 @@ public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterSt
final String host = getFullyQualifiedAWSHost();
final String region = Regions.valueOf(configuration.getRegion()).getName();
- log.debug("Creating endpoint for host {} on region {}", host, region);
+ LOG.debug("Creating endpoint for host {} on region {}", host, region);
clientBuilder.withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(host, region));
client = clientBuilder.build();
diff --git a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
index 71c09b8..bd5fb94 100644
--- a/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
+++ b/components/camel-aws-sqs/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
@@ -43,6 +43,8 @@ import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Producer which sends messages to the Amazon Web Service Simple Queue
@@ -50,6 +52,8 @@ import org.apache.camel.util.URISupport;
*/
public class SqsProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(SqsProducer.class);
+
private transient String sqsProducerToString;
public SqsProducer(SqsEndpoint endpoint) throws NoFactoryAvailableException {
@@ -88,11 +92,11 @@ public class SqsProducer extends DefaultProducer {
addDelay(request, exchange);
configureFifoAttributes(request, exchange);
- log.trace("Sending request [{}] from exchange [{}]...", request, exchange);
+ LOG.trace("Sending request [{}] from exchange [{}]...", request, exchange);
SendMessageResult result = getClient().sendMessage(request);
- log.trace("Received result [{}]", result);
+ LOG.trace("Received result [{}]", result);
Message message = getMessageForResponse(exchange);
message.setHeader(SqsConstants.MESSAGE_ID, result.getMessageId());
@@ -181,13 +185,13 @@ public class SqsProducer extends DefaultProducer {
Integer headerValue = exchange.getIn().getHeader(SqsConstants.DELAY_HEADER, Integer.class);
Integer delayValue;
if (headerValue == null) {
- log.trace("Using the config delay");
+ LOG.trace("Using the config delay");
delayValue = getEndpoint().getConfiguration().getDelaySeconds();
} else {
- log.trace("Using the header delay");
+ LOG.trace("Using the header delay");
delayValue = headerValue;
}
- log.trace("found delay: {}", delayValue);
+ LOG.trace("found delay: {}", delayValue);
request.setDelaySeconds(delayValue == null ? Integer.valueOf(0) : delayValue);
}
@@ -195,13 +199,13 @@ public class SqsProducer extends DefaultProducer {
Integer headerValue = exchange.getIn().getHeader(SqsConstants.DELAY_HEADER, Integer.class);
Integer delayValue;
if (headerValue == null) {
- log.trace("Using the config delay");
+ LOG.trace("Using the config delay");
delayValue = getEndpoint().getConfiguration().getDelaySeconds();
} else {
- log.trace("Using the header delay");
+ LOG.trace("Using the header delay");
delayValue = headerValue;
}
- log.trace("found delay: {}", delayValue);
+ LOG.trace("found delay: {}", delayValue);
request.setDelaySeconds(delayValue == null ? Integer.valueOf(0) : delayValue);
}
@@ -282,7 +286,7 @@ public class SqsProducer extends DefaultProducer {
} else {
// cannot translate the message header to message attribute
// value
- log.warn("Cannot put the message header key={}, value={} into Sqs MessageAttribute", entry.getKey(), entry.getValue());
+ LOG.warn("Cannot put the message header key={}, value={} into Sqs MessageAttribute", entry.getKey(), entry.getValue());
}
}
}
diff --git a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFActivityProducer.java b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFActivityProducer.java
index e9c34d8..c0bb11c 100644
--- a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFActivityProducer.java
+++ b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFActivityProducer.java
@@ -23,7 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SWFActivityProducer extends DefaultProducer {
- private static final transient Logger LOGGER = LoggerFactory.getLogger(SWFActivityProducer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SWFActivityProducer.class);
private final CamelSWFActivityClient camelSWFClient;
private SWFEndpoint endpoint;
private SWFConfiguration configuration;
@@ -41,7 +41,7 @@ public class SWFActivityProducer extends DefaultProducer {
public void process(Exchange exchange) throws Exception {
String eventName = getEventName(exchange);
String version = getVersion(exchange);
- LOGGER.debug("scheduleActivity : " + eventName + " : " + version);
+ LOG.debug("scheduleActivity : " + eventName + " : " + version);
Object result = camelSWFClient.scheduleActivity(eventName, version, exchange.getIn().getBody());
endpoint.setResult(exchange, result);
diff --git a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java
index e01ada0..f841f1a 100644
--- a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java
+++ b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFWorkflowProducer.java
@@ -27,7 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SWFWorkflowProducer extends DefaultProducer {
- private static final transient Logger LOGGER = LoggerFactory.getLogger(SWFWorkflowProducer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SWFWorkflowProducer.class);
private final CamelSWFWorkflowClient camelSWFClient;
private SWFEndpoint endpoint;
private SWFConfiguration configuration;
@@ -43,7 +43,7 @@ public class SWFWorkflowProducer extends DefaultProducer {
@Override
public void process(Exchange exchange) throws Exception {
- LOGGER.debug("processing workflow task " + exchange);
+ LOG.debug("processing workflow task " + exchange);
try {
diff --git a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateProducer.java b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateProducer.java
index aff9644..bc10c8b 100644
--- a/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateProducer.java
+++ b/components/camel-aws-translate/src/main/java/org/apache/camel/component/aws/translate/TranslateProducer.java
@@ -28,6 +28,8 @@ import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Producer which sends messages to the Amazon Translate Service
@@ -35,6 +37,8 @@ import org.apache.camel.util.URISupport;
*/
public class TranslateProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(TranslateProducer.class);
+
private transient String translateProducerToString;
public TranslateProducer(Endpoint endpoint) {
@@ -115,7 +119,7 @@ public class TranslateProducer extends DefaultProducer {
try {
result = translateClient.translateText(request);
} catch (AmazonServiceException ase) {
- log.trace("Translate Text command returned the error code {}", ase.getErrorCode());
+ LOG.trace("Translate Text command returned the error code {}", ase.getErrorCode());
throw ase;
}
Message message = getMessageForResponse(exchange);
diff --git a/components/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/XRayTracer.java b/components/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/XRayTracer.java
index 9b07b73..541dda9 100644
--- a/components/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/XRayTracer.java
+++ b/components/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/XRayTracer.java
@@ -77,6 +77,7 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St
// Note that the Entity itself is not serializable, so don't share this object among different VMs!
public static final String XRAY_TRACE_ENTITY = "Camel-AWS-XRay-Trace-Entity";
+ private static final Logger LOG = LoggerFactory.getLogger(XRayTracer.class);
private static Map<String, SegmentDecorator> decorators = new HashMap<>();
@@ -128,13 +129,13 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St
}
if (null == tracingStrategy) {
- log.info("No tracing strategy available. Defaulting to no-op strategy");
+ LOG.info("No tracing strategy available. Defaulting to no-op strategy");
tracingStrategy = new NoopTracingStrategy();
}
camelContext.adapt(ExtendedCamelContext.class).addInterceptStrategy(tracingStrategy);
- log.debug("Starting XRay tracer");
+ LOG.debug("Starting XRay tracer");
}
@Override
@@ -144,7 +145,7 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St
ServiceHelper.stopAndShutdownService(eventNotifier);
camelContext.getRoutePolicyFactories().remove(this);
- log.debug("XRay tracer stopped");
+ LOG.debug("XRay tracer stopped");
}
/**
@@ -155,7 +156,7 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St
public void init(CamelContext camelContext) {
if (!camelContext.hasService(this)) {
try {
- log.debug("Initializing XRay tracer");
+ LOG.debug("Initializing XRay tracer");
// start this service eager so we init before Camel is starting up
camelContext.addService(this, true, true);
} catch (Exception e) {
@@ -218,7 +219,7 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St
if (!excludePatterns.isEmpty()) {
for (String pattern : excludePatterns) {
if (pattern.equals(routeId)) {
- log.debug("Ignoring route with ID {}", routeId);
+ LOG.debug("Ignoring route with ID {}", routeId);
return true;
}
}
@@ -266,7 +267,7 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St
if (event instanceof ExchangeSendingEvent) {
ExchangeSendingEvent ese = (ExchangeSendingEvent) event;
- log.trace("-> {} - target: {} (routeId: {})",
+ LOG.trace("-> {} - target: {} (routeId: {})",
event.getClass().getSimpleName(), ese.getEndpoint(),
ese.getExchange().getFromRouteId());
@@ -288,21 +289,21 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St
try {
Subsegment subsegment = AWSXRay.beginSubsegment(name);
sd.pre(subsegment, ese.getExchange(), ese.getEndpoint());
- log.trace("Creating new subsegment with ID {} and name {} (parent {}, references: {})",
+ LOG.trace("Creating new subsegment with ID {} and name {} (parent {}, references: {})",
subsegment.getId(), subsegment.getName(),
subsegment.getParentSegment().getId(), subsegment.getParentSegment().getReferenceCount());
ese.getExchange().setProperty(CURRENT_SEGMENT, subsegment);
} catch (AlreadyEmittedException aeEx) {
- log.warn("Ignoring starting of subsegment " + name + " as its parent segment"
+ LOG.warn("Ignoring starting of subsegment " + name + " as its parent segment"
+ " was already emitted to AWS.");
}
} else {
- log.trace("Ignoring creation of XRay subsegment as no segment exists in the current thread");
+ LOG.trace("Ignoring creation of XRay subsegment as no segment exists in the current thread");
}
} else if (event instanceof ExchangeSentEvent) {
ExchangeSentEvent ese = (ExchangeSentEvent) event;
- log.trace("-> {} - target: {} (routeId: {})",
+ LOG.trace("-> {} - target: {} (routeId: {})",
event.getClass().getSimpleName(), ese.getEndpoint(), ese.getExchange().getFromRouteId());
Entity entity = getTraceEntityFromExchange(ese.getExchange());
@@ -313,17 +314,17 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St
Subsegment subsegment = (Subsegment) entity;
sd.post(subsegment, ese.getExchange(), ese.getEndpoint());
subsegment.close();
- log.trace("Closing down subsegment with ID {} and name {}",
+ LOG.trace("Closing down subsegment with ID {} and name {}",
subsegment.getId(), subsegment.getName());
- log.trace("Setting trace entity for exchange {} to {}", ese.getExchange(), subsegment.getParent());
+ LOG.trace("Setting trace entity for exchange {} to {}", ese.getExchange(), subsegment.getParent());
ese.getExchange().setProperty(CURRENT_SEGMENT, subsegment.getParent());
} catch (AlreadyEmittedException aeEx) {
- log.warn("Ignoring close of subsegment " + entity.getName()
+ LOG.warn("Ignoring close of subsegment " + entity.getName()
+ " as its parent segment was already emitted to AWS");
}
}
} else {
- log.trace("Received event {} from source {}", event, event.getSource());
+ LOG.trace("Received event {} from source {}", event, event.getSource());
}
}
@@ -370,7 +371,7 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St
return;
}
- log.trace("=> RoutePolicy-Begin: Route: {} - RouteId: {}", routeId, route.getId());
+ LOG.trace("=> RoutePolicy-Begin: Route: {} - RouteId: {}", routeId, route.getId());
Entity entity = getTraceEntityFromExchange(exchange);
boolean createSegment = entity == null || !Objects.equals(entity.getName(), routeId);
@@ -391,19 +392,19 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St
segment.setParent(entity);
segment.setTraceId(traceID);
sd.pre(segment, exchange, route.getEndpoint());
- log.trace("Created new XRay segment {} with name {}", segment.getId(), segment.getName());
+ LOG.trace("Created new XRay segment {} with name {}", segment.getId(), segment.getName());
exchange.setProperty(CURRENT_SEGMENT, segment);
} else {
String segmentName = entity.getId();
try {
Subsegment subsegment = AWSXRay.beginSubsegment(route.getId());
sd.pre(subsegment, exchange, route.getEndpoint());
- log.trace("Creating new subsegment with ID {} and name {} (parent {}, references: {})",
+ LOG.trace("Creating new subsegment with ID {} and name {} (parent {}, references: {})",
subsegment.getId(), subsegment.getName(),
subsegment.getParentSegment().getId(), subsegment.getParentSegment().getReferenceCount());
exchange.setProperty(CURRENT_SEGMENT, subsegment);
} catch (AlreadyEmittedException aeEx) {
- log.warn("Ignoring opening of subsegment " + route.getId() + " as its parent segment "
+ LOG.warn("Ignoring opening of subsegment " + route.getId() + " as its parent segment "
+ segmentName + " was already emitted before.");
}
}
@@ -416,7 +417,7 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St
return;
}
- log.trace("=> RoutePolicy-Done: Route: {} - RouteId: {}", routeId, route.getId());
+ LOG.trace("=> RoutePolicy-Done: Route: {} - RouteId: {}", routeId, route.getId());
Entity entity = getTraceEntityFromExchange(exchange);
AWSXRay.setTraceEntity(entity);
@@ -424,14 +425,14 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St
SegmentDecorator sd = getSegmentDecorator(route.getEndpoint());
sd.post(entity, exchange, route.getEndpoint());
entity.close();
- log.trace("Closing down (sub)segment {} with name {} (parent {}, references: {})",
+ LOG.trace("Closing down (sub)segment {} with name {} (parent {}, references: {})",
entity.getId(), entity.getName(),
entity.getParentSegment().getId(), entity.getParentSegment().getReferenceCount());
exchange.setProperty(CURRENT_SEGMENT, entity.getParent());
} catch (AlreadyEmittedException aeEx) {
- log.warn("Ignoring closing of (sub)segment {} as the segment was already emitted.", route.getId());
+ LOG.warn("Ignoring closing of (sub)segment {} as the segment was already emitted.", route.getId());
} catch (Exception e) {
- log.warn("Error closing entity");
+ LOG.warn("Error closing entity");
} finally {
AWSXRay.setTraceEntity(null);
}
diff --git a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Producer.java b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Producer.java
index 2f3e58c..1db5875 100644
--- a/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Producer.java
+++ b/components/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Producer.java
@@ -24,6 +24,8 @@ import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import software.amazon.awssdk.awscore.exception.AwsServiceException;
import software.amazon.awssdk.services.translate.TranslateClient;
import software.amazon.awssdk.services.translate.model.TranslateTextRequest;
@@ -36,6 +38,7 @@ import software.amazon.awssdk.services.translate.model.TranslateTextResponse;
*/
public class Translate2Producer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(Translate2Producer.class);
private transient String translateProducerToString;
public Translate2Producer(Endpoint endpoint) {
@@ -116,7 +119,7 @@ public class Translate2Producer extends DefaultProducer {
try {
result = translateClient.translateText(request.build());
} catch (AwsServiceException ase) {
- log.trace("Translate Text command returned the error code {}", ase.getMessage());
+ LOG.trace("Translate Text command returned the error code {}", ase.getMessage());
throw ase;
}
Message message = getMessageForResponse(exchange);
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceConsumer.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceConsumer.java
index 1fa97b2..882a85a 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceConsumer.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceConsumer.java
@@ -37,7 +37,6 @@ public class BlobServiceConsumer extends ScheduledPollConsumer {
protected int poll() throws Exception {
Exchange exchange = super.getEndpoint().createExchange();
try {
- log.trace("Getting the blob content");
getBlob(exchange);
super.getAsyncProcessor().process(exchange);
return 1;
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceEndpoint.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceEndpoint.java
index ca92a93..10d2747 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceEndpoint.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceEndpoint.java
@@ -49,7 +49,6 @@ public class BlobServiceEndpoint extends DefaultEndpoint {
@Override
public Consumer createConsumer(Processor processor) throws Exception {
- log.trace("Creating a consumer");
if (getConfiguration().getBlobName() == null) {
throw new IllegalArgumentException("Blob name must be specified.");
}
@@ -60,7 +59,6 @@ public class BlobServiceEndpoint extends DefaultEndpoint {
@Override
public Producer createProducer() throws Exception {
- log.trace("Creating a producer");
if (getConfiguration().getBlobName() == null
&& getConfiguration().getOperation() != null
&& BlobServiceOperations.listBlobs != configuration.getOperation()) {
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceProducer.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceProducer.java
index dc88748..10ba0f3 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceProducer.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/blob/BlobServiceProducer.java
@@ -46,12 +46,16 @@ import org.apache.camel.component.azure.common.ExchangeUtil;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Producer which sends messages to the Azure Storage Blob Service
*/
public class BlobServiceProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(BlobServiceProducer.class);
+
public BlobServiceProducer(final Endpoint endpoint) {
super(endpoint);
}
@@ -114,7 +118,7 @@ public class BlobServiceProducer extends DefaultProducer {
private void listBlobs(Exchange exchange) throws Exception {
CloudBlobContainer client = BlobServiceUtil.createBlobContainerClient(getConfiguration());
BlobServiceRequestOptions opts = BlobServiceUtil.getRequestOptions(exchange);
- log.trace("Getting the blob list from the container [{}] from exchange [{}]...",
+ LOG.trace("Getting the blob list from the container [{}] from exchange [{}]...",
getConfiguration().getContainerName(), exchange);
BlobServiceConfiguration cfg = getConfiguration();
EnumSet<BlobListingDetails> details = null;
@@ -139,7 +143,7 @@ public class BlobServiceProducer extends DefaultProducer {
InputStream inputStream = getInputStreamFromExchange(exchange);
- log.trace("Putting a block blob [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
+ LOG.trace("Putting a block blob [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
try {
client.upload(inputStream, -1,
opts.getAccessCond(), opts.getRequestOpts(), opts.getOpContext());
@@ -165,7 +169,7 @@ public class BlobServiceProducer extends DefaultProducer {
configureCloudBlobForWrite(client);
BlobServiceRequestOptions opts = BlobServiceUtil.getRequestOptions(exchange);
- log.trace("Putting a blob [{}] from blocks from exchange [{}]...", getConfiguration().getBlobName(), exchange);
+ LOG.trace("Putting a blob [{}] from blocks from exchange [{}]...", getConfiguration().getBlobName(), exchange);
List<BlockEntry> blockEntries = new LinkedList<>();
for (BlobBlock blobBlock : blobBlocks) {
blockEntries.add(blobBlock.getBlockEntry());
@@ -196,7 +200,7 @@ public class BlobServiceProducer extends DefaultProducer {
CloudBlockBlob client = BlobServiceUtil.createBlockBlobClient(getConfiguration());
BlobServiceRequestOptions opts = BlobServiceUtil.getRequestOptions(exchange);
- log.trace("Putting a blob [{}] block list from exchange [{}]...", getConfiguration().getBlobName(), exchange);
+ LOG.trace("Putting a blob [{}] block list from exchange [{}]...", getConfiguration().getBlobName(), exchange);
client.commitBlockList(blockEntries,
opts.getAccessCond(), opts.getRequestOpts(), opts.getOpContext());
}
@@ -224,7 +228,7 @@ public class BlobServiceProducer extends DefaultProducer {
private void getBlobBlockList(Exchange exchange) throws Exception {
CloudBlockBlob client = BlobServiceUtil.createBlockBlobClient(getConfiguration());
BlobServiceRequestOptions opts = BlobServiceUtil.getRequestOptions(exchange);
- log.trace("Getting the blob block list [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
+ LOG.trace("Getting the blob block list [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
BlockListingFilter filter = exchange.getIn().getBody(BlockListingFilter.class);
if (filter == null) {
filter = BlockListingFilter.COMMITTED;
@@ -251,7 +255,7 @@ public class BlobServiceProducer extends DefaultProducer {
private void doCreateAppendBlob(CloudAppendBlob client, BlobServiceRequestOptions opts, Exchange exchange)
throws Exception {
- log.trace("Creating an append blob [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
+ LOG.trace("Creating an append blob [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
try {
client.createOrReplace(opts.getAccessCond(), opts.getRequestOpts(), opts.getOpContext());
} catch (StorageException ex) {
@@ -305,7 +309,7 @@ public class BlobServiceProducer extends DefaultProducer {
private void doCreatePageBlob(CloudPageBlob client, BlobServiceRequestOptions opts, Exchange exchange)
throws Exception {
- log.trace("Creating a page blob [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
+ LOG.trace("Creating a page blob [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
Long pageSize = getPageBlobSize(exchange);
try {
client.create(pageSize,
@@ -321,7 +325,7 @@ public class BlobServiceProducer extends DefaultProducer {
}
private void uploadPageBlob(Exchange exchange) throws Exception {
- log.trace("Updating a page blob [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
+ LOG.trace("Updating a page blob [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
CloudPageBlob client = BlobServiceUtil.createPageBlobClient(getConfiguration());
configureCloudBlobForWrite(client);
@@ -342,7 +346,7 @@ public class BlobServiceProducer extends DefaultProducer {
}
private void resizePageBlob(Exchange exchange) throws Exception {
- log.trace("Resizing a page blob [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
+ LOG.trace("Resizing a page blob [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
CloudPageBlob client = BlobServiceUtil.createPageBlobClient(getConfiguration());
BlobServiceRequestOptions opts = BlobServiceUtil.getRequestOptions(exchange);
@@ -351,7 +355,7 @@ public class BlobServiceProducer extends DefaultProducer {
}
private void clearPageBlob(Exchange exchange) throws Exception {
- log.trace("Clearing a page blob [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
+ LOG.trace("Clearing a page blob [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
CloudPageBlob client = BlobServiceUtil.createPageBlobClient(getConfiguration());
BlobServiceRequestOptions opts = BlobServiceUtil.getRequestOptions(exchange);
@@ -396,7 +400,7 @@ public class BlobServiceProducer extends DefaultProducer {
CloudPageBlob client = BlobServiceUtil.createPageBlobClient(getConfiguration());
BlobServiceUtil.configureCloudBlobForRead(client, getConfiguration());
BlobServiceRequestOptions opts = BlobServiceUtil.getRequestOptions(exchange);
- log.trace("Getting the page blob ranges [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
+ LOG.trace("Getting the page blob ranges [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
List<PageRange> ranges =
client.downloadPageRanges(opts.getAccessCond(), opts.getRequestOpts(), opts.getOpContext());
ExchangeUtil.getMessageForResponse(exchange).setBody(ranges);
@@ -417,7 +421,7 @@ public class BlobServiceProducer extends DefaultProducer {
private void doDeleteBlock(CloudBlob client, Exchange exchange) throws Exception {
- log.trace("Deleting a blob [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
+ LOG.trace("Deleting a blob [{}] from exchange [{}]...", getConfiguration().getBlobName(), exchange);
client.delete();
}
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceConsumer.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceConsumer.java
index e26ca47..de55bed 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceConsumer.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceConsumer.java
@@ -35,7 +35,6 @@ public class QueueServiceConsumer extends ScheduledPollConsumer {
protected int poll() throws Exception {
Exchange exchange = super.getEndpoint().createExchange();
try {
- log.trace("Retrieving a message");
retrieveMessage(exchange);
super.getAsyncProcessor().process(exchange);
return 1;
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceEndpoint.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceEndpoint.java
index d527547..4116093 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceEndpoint.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceEndpoint.java
@@ -49,7 +49,6 @@ public class QueueServiceEndpoint extends DefaultEndpoint {
@Override
public Consumer createConsumer(Processor processor) throws Exception {
- log.trace("Creating a consumer");
QueueServiceConsumer consumer = new QueueServiceConsumer(this, processor);
configureConsumer(consumer);
return consumer;
@@ -57,7 +56,6 @@ public class QueueServiceEndpoint extends DefaultEndpoint {
@Override
public Producer createProducer() throws Exception {
- log.trace("Creating a producer");
return new QueueServiceProducer(this);
}
diff --git a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceProducer.java b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceProducer.java
index d24deac..6d7d8eb 100644
--- a/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceProducer.java
+++ b/components/camel-azure/src/main/java/org/apache/camel/component/azure/queue/QueueServiceProducer.java
@@ -29,12 +29,16 @@ import org.apache.camel.component.azure.common.ExchangeUtil;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Producer which sends messages to the Azure Storage Queue Service
*/
public class QueueServiceProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(QueueServiceProducer.class);
+
public QueueServiceProducer(final Endpoint endpoint) {
super(endpoint);
}
@@ -97,7 +101,7 @@ public class QueueServiceProducer extends DefaultProducer {
}
private void doCreateQueue(CloudQueue client, QueueServiceRequestOptions opts, Exchange exchange) throws Exception {
- log.trace("Creating the queue [{}] from exchange [{}]...",
+ LOG.trace("Creating the queue [{}] from exchange [{}]...",
getConfiguration().getQueueName(), exchange);
client.createIfNotExists(opts.getRequestOpts(), opts.getOpContext());
ExchangeUtil.getMessageForResponse(exchange)
@@ -105,7 +109,7 @@ public class QueueServiceProducer extends DefaultProducer {
}
private void deleteQueue(Exchange exchange) throws Exception {
- log.trace("Deleting the queue [{}] from exchange [{}]...",
+ LOG.trace("Deleting the queue [{}] from exchange [{}]...",
getConfiguration().getQueueName(), exchange);
CloudQueue client = QueueServiceUtil.createQueueClient(getConfiguration());
QueueServiceRequestOptions opts = QueueServiceUtil.getRequestOptions(exchange);
@@ -113,7 +117,7 @@ public class QueueServiceProducer extends DefaultProducer {
}
private void addMessage(Exchange exchange) throws Exception {
- log.trace("Putting the message into the queue [{}] from exchange [{}]...",
+ LOG.trace("Putting the message into the queue [{}] from exchange [{}]...",
getConfiguration().getQueueName(), exchange);
CloudQueue client = QueueServiceUtil.createQueueClient(getConfiguration());
QueueServiceRequestOptions opts = QueueServiceUtil.getRequestOptions(exchange);
@@ -135,7 +139,7 @@ public class QueueServiceProducer extends DefaultProducer {
QueueServiceRequestOptions opts = QueueServiceUtil.getRequestOptions(exchange);
CloudQueueMessage message = getCloudQueueMessage(exchange);
- log.trace("Updating the message in the queue [{}] from exchange [{}]...",
+ LOG.trace("Updating the message in the queue [{}] from exchange [{}]...",
getConfiguration().getQueueName(), exchange);
EnumSet<MessageUpdateFields> fields = null;
@@ -154,7 +158,7 @@ public class QueueServiceProducer extends DefaultProducer {
}
private void deleteMessage(Exchange exchange) throws Exception {
- log.trace("Deleting the message from the queue [{}] from exchange [{}]...",
+ LOG.trace("Deleting the message from the queue [{}] from exchange [{}]...",
getConfiguration().getQueueName(), exchange);
CloudQueue client = QueueServiceUtil.createQueueClient(getConfiguration());
QueueServiceRequestOptions opts = QueueServiceUtil.getRequestOptions(exchange);
diff --git a/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeDataFormat.java b/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeDataFormat.java
index 07b3ad9..746334c 100644
--- a/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeDataFormat.java
+++ b/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/BarcodeDataFormat.java
@@ -43,6 +43,8 @@ import org.apache.camel.spi.DataFormatName;
import org.apache.camel.spi.annotations.Dataformat;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.service.ServiceSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* {@link DataFormat} to create (encode) and
@@ -54,6 +56,8 @@ import org.apache.camel.support.service.ServiceSupport;
@Dataformat("barcode")
public class BarcodeDataFormat extends ServiceSupport implements DataFormat, DataFormatName {
+ private static final Logger LOG = LoggerFactory.getLogger(BarcodeDataFormat.class);
+
/**
* The bean for the default parameters.
*/
@@ -235,7 +239,7 @@ public class BarcodeDataFormat extends ServiceSupport implements DataFormat, Dat
*/
public final void addToHintMap(final EncodeHintType hintType, final Object value) {
this.writerHintMap.put(hintType, value);
- log.info(String.format("Added '%s' with value '%s' to writer hint map.", hintType.toString(), value.toString()));
+ LOG.info(String.format("Added '%s' with value '%s' to writer hint map.", hintType.toString(), value.toString()));
}
/**
@@ -251,9 +255,9 @@ public class BarcodeDataFormat extends ServiceSupport implements DataFormat, Dat
public final void removeFromHintMap(final EncodeHintType hintType) {
if (this.writerHintMap.containsKey(hintType)) {
this.writerHintMap.remove(hintType);
- log.info(String.format("Removed '%s' from writer hint map.", hintType.toString()));
+ LOG.info(String.format("Removed '%s' from writer hint map.", hintType.toString()));
} else {
- log.warn(String.format("Could not find encode hint type '%s' in writer hint map.", hintType.toString()));
+ LOG.warn(String.format("Could not find encode hint type '%s' in writer hint map.", hintType.toString()));
}
}
@@ -263,9 +267,9 @@ public class BarcodeDataFormat extends ServiceSupport implements DataFormat, Dat
public final void removeFromHintMap(final DecodeHintType hintType) {
if (this.readerHintMap.containsKey(hintType)) {
this.readerHintMap.remove(hintType);
- log.info(String.format("Removed '%s' from reader hint map.", hintType.toString()));
+ LOG.info(String.format("Removed '%s' from reader hint map.", hintType.toString()));
} else {
- log.warn(String.format("Could not find decode hint type '%s' in reader hint map.", hintType.toString()));
+ LOG.warn(String.format("Could not find decode hint type '%s' in reader hint map.", hintType.toString()));
}
}
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java
index 1964498..ff273eb 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java
@@ -25,6 +25,8 @@ import org.apache.camel.NoSuchBeanException;
import org.apache.camel.Processor;
import org.apache.camel.support.AsyncProcessorSupport;
import org.apache.camel.support.service.ServiceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A {@link Processor} which converts the inbound exchange to a method
@@ -32,6 +34,8 @@ import org.apache.camel.support.service.ServiceHelper;
*/
public abstract class AbstractBeanProcessor extends AsyncProcessorSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractBeanProcessor.class);
+
private final BeanHolder beanHolder;
private transient Processor processor;
private transient boolean lookupProcessorDone;
@@ -106,8 +110,8 @@ public abstract class AbstractBeanProcessor extends AsyncProcessorSupport {
}
}
if (target != null) {
- if (log.isTraceEnabled()) {
- log.trace("Using a custom adapter as bean invocation: {}", target);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Using a custom adapter as bean invocation: {}", target);
}
try {
target.process(exchange);
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java
index 4929e22..e2d819b 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanComponent.java
@@ -25,6 +25,8 @@ import org.apache.camel.support.DefaultComponent;
import org.apache.camel.support.LRUCache;
import org.apache.camel.support.LRUCacheFactory;
import org.apache.camel.util.PropertiesHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The bean component is for invoking Java beans from Camel.
@@ -32,6 +34,8 @@ import org.apache.camel.util.PropertiesHelper;
@org.apache.camel.spi.annotations.Component("bean")
public class BeanComponent extends DefaultComponent {
+ private static final Logger LOG = LoggerFactory.getLogger(BeanComponent.class);
+
// use an internal soft cache for BeanInfo as they are costly to introspect
// for example the bean language using OGNL expression runs much faster reusing the BeanInfo from this cache
@SuppressWarnings("unchecked")
@@ -82,9 +86,9 @@ public class BeanComponent extends DefaultComponent {
@Override
protected void doShutdown() throws Exception {
- if (log.isDebugEnabled() && beanInfoCache instanceof LRUCache) {
+ if (LOG.isDebugEnabled() && beanInfoCache instanceof LRUCache) {
LRUCache cache = (LRUCache) this.beanInfoCache;
- log.debug("Clearing BeanInfo cache[size={}, hits={}, misses={}, evicted={}]", cache.size(), cache.getHits(), cache.getMisses(), cache.getEvicted());
+ LOG.debug("Clearing BeanInfo cache[size={}, hits={}, misses={}, evicted={}]", cache.size(), cache.getHits(), cache.getMisses(), cache.getEvicted());
}
beanInfoCache.clear();
}
diff --git a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkConsumer.java b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkConsumer.java
index 2a9ee42..47f7f1c 100644
--- a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkConsumer.java
+++ b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkConsumer.java
@@ -34,6 +34,8 @@ import org.apache.camel.component.beanstalk.processors.DeleteCommand;
import org.apache.camel.component.beanstalk.processors.ReleaseCommand;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.support.ScheduledPollConsumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* PollingConsumer to read Beanstalk jobs.
@@ -53,6 +55,8 @@ import org.apache.camel.support.ScheduledPollConsumer;
*/
public class BeanstalkConsumer extends ScheduledPollConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(BeanstalkConsumer.class);
+
private static final String[] STATS_KEY_STR = new String[]{"tube", "state"};
private static final String[] STATS_KEY_INT = new String[]{"age", "time-left", "timeouts", "releases", "buries", "kicks"};
@@ -85,8 +89,8 @@ public class BeanstalkConsumer extends ScheduledPollConsumer {
return null;
}
- if (log.isDebugEnabled()) {
- log.debug(String.format("Received job ID %d (data length %d)", job.getJobId(), job.getData().length));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(String.format("Received job ID %d (data length %d)", job.getJobId(), job.getData().length));
}
final Exchange exchange = getEndpoint().createExchange(ExchangePattern.InOnly);
@@ -221,7 +225,7 @@ public class BeanstalkConsumer extends ScheduledPollConsumer {
try {
executor.submit(new RunCommand(successCommand, exchange)).get();
} catch (Exception e) {
- log.error(String.format("Could not run completion of exchange %s", exchange), e);
+ LOG.error(String.format("Could not run completion of exchange %s", exchange), e);
}
}
@@ -230,7 +234,7 @@ public class BeanstalkConsumer extends ScheduledPollConsumer {
try {
executor.submit(new RunCommand(failureCommand, exchange)).get();
} catch (Exception e) {
- log.error(String.format("%s could not run failure of exchange %s", failureCommand.getClass().getName(), exchange), e);
+ LOG.error(String.format("%s could not run failure of exchange %s", failureCommand.getClass().getName(), exchange), e);
}
}
@@ -249,12 +253,12 @@ public class BeanstalkConsumer extends ScheduledPollConsumer {
try {
command.act(client, exchange);
} catch (BeanstalkException e) {
- log.warn(String.format("Post-processing %s of exchange %s failed, retrying.", command.getClass().getName(), exchange), e);
+ LOG.warn(String.format("Post-processing %s of exchange %s failed, retrying.", command.getClass().getName(), exchange), e);
resetClient();
command.act(client, exchange);
}
} catch (final Exception e) {
- log.error(String.format("%s could not post-process exchange %s", command.getClass().getName(), exchange), e);
+ LOG.error(String.format("%s could not post-process exchange %s", command.getClass().getName(), exchange), e);
exchange.setException(e);
}
}
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
index 7993a56..7453344 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
@@ -40,12 +40,16 @@ import org.osgi.framework.ServiceRegistration;
import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.container.BlueprintEvent;
import org.osgi.service.blueprint.container.BlueprintListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* OSGi Blueprint based {@link org.apache.camel.CamelContext}.
*/
public class BlueprintCamelContext extends DefaultCamelContext implements ServiceListener, BlueprintListener {
+ private static final Logger LOG = LoggerFactory.getLogger(BlueprintCamelContext.class);
+
protected final AtomicBoolean routeDefinitionValid = new AtomicBoolean(true);
private BundleContext bundleContext;
@@ -107,7 +111,7 @@ public class BlueprintCamelContext extends DefaultCamelContext implements Servic
@Override
public void doInit() throws Exception {
- log.trace("init {}", this);
+ LOG.trace("init {}", this);
// add service listener so we can be notified when blueprint container is done
// and we would be ready to start CamelContext
bundleContext.addServiceListener(this);
@@ -119,19 +123,19 @@ public class BlueprintCamelContext extends DefaultCamelContext implements Servic
}
public void destroy() throws Exception {
- log.trace("destroy {}", this);
+ LOG.trace("destroy {}", this);
// remove listener and stop this CamelContext
try {
bundleContext.removeServiceListener(this);
} catch (Exception e) {
- log.warn("Error removing ServiceListener: " + this + ". This exception is ignored.", e);
+ LOG.warn("Error removing ServiceListener: " + this + ". This exception is ignored.", e);
}
if (registration != null) {
try {
registration.unregister();
} catch (Exception e) {
- log.warn("Error unregistering service registration: " + registration + ". This exception is ignored.", e);
+ LOG.warn("Error unregistering service registration: " + registration + ". This exception is ignored.", e);
}
registration = null;
}
@@ -143,7 +147,7 @@ public class BlueprintCamelContext extends DefaultCamelContext implements Servic
@Override
public void blueprintEvent(BlueprintEvent event) {
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
String eventTypeString;
switch (event.getType()) {
@@ -173,16 +177,16 @@ public class BlueprintCamelContext extends DefaultCamelContext implements Servic
break;
}
- log.debug("Received BlueprintEvent[replay={} type={} bundle={}] {}", event.isReplay(), eventTypeString, event.getBundle().getSymbolicName(), event);
+ LOG.debug("Received BlueprintEvent[replay={} type={} bundle={}] {}", event.isReplay(), eventTypeString, event.getBundle().getSymbolicName(), event);
}
if (!event.isReplay() && this.getBundleContext().getBundle().getBundleId() == event.getBundle().getBundleId()) {
if (event.getType() == BlueprintEvent.CREATED) {
try {
- log.info("Attempting to start CamelContext: {}", this.getName());
+ LOG.info("Attempting to start CamelContext: {}", this.getName());
this.maybeStart();
} catch (Exception startEx) {
- log.error("Error occurred during starting CamelContext: {}", this.getName(), startEx);
+ LOG.error("Error occurred during starting CamelContext: {}", this.getName(), startEx);
}
}
}
@@ -190,7 +194,7 @@ public class BlueprintCamelContext extends DefaultCamelContext implements Servic
@Override
public void serviceChanged(ServiceEvent event) {
- if (log.isTraceEnabled()) {
+ if (LOG.isTraceEnabled()) {
String eventTypeString;
switch (event.getType()) {
@@ -212,7 +216,7 @@ public class BlueprintCamelContext extends DefaultCamelContext implements Servic
}
// use trace logging as this is very noisy
- log.trace("Service: {} changed to: {}", event, eventTypeString);
+ LOG.trace("Service: {} changed to: {}", event, eventTypeString);
}
}
@@ -246,10 +250,10 @@ public class BlueprintCamelContext extends DefaultCamelContext implements Servic
}
private void maybeStart() throws Exception {
- log.trace("maybeStart: {}", this);
+ LOG.trace("maybeStart: {}", this);
if (!routeDefinitionValid.get()) {
- log.trace("maybeStart: {} is skipping since CamelRoute definition is not correct.", this);
+ LOG.trace("maybeStart: {} is skipping since CamelRoute definition is not correct.", this);
return;
}
@@ -270,16 +274,16 @@ public class BlueprintCamelContext extends DefaultCamelContext implements Servic
// when blueprint loading the bundle
boolean skip = "true".equalsIgnoreCase(System.getProperty("skipStartingCamelContext"));
if (skip) {
- log.trace("maybeStart: {} is skipping as System property skipStartingCamelContext is set", this);
+ LOG.trace("maybeStart: {} is skipping as System property skipStartingCamelContext is set", this);
return;
}
if (!isStarted() && !isStarting()) {
- log.debug("Starting {}", this);
+ LOG.debug("Starting {}", this);
start();
} else {
// ignore as Camel is already started
- log.trace("Ignoring maybeStart() as {} is already started", this);
+ LOG.trace("Ignoring maybeStart() as {} is already started", this);
}
}
diff --git a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConsumer.java b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConsumer.java
index 2732e27..0080209 100644
--- a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConsumer.java
+++ b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConsumer.java
@@ -31,12 +31,16 @@ import org.apache.camel.support.component.AbstractApiConsumer;
import org.apache.camel.support.component.ApiConsumerHelper;
import org.apache.camel.support.component.ApiMethod;
import org.apache.camel.support.component.ApiMethodHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The Box consumer.
*/
public class BoxConsumer extends AbstractApiConsumer<BoxApiName, BoxConfiguration> implements EventListener {
+ private static final Logger LOG = LoggerFactory.getLogger(BoxConsumer.class);
+
private static final String LISTENER_PROPERTY = "listener";
private BoxAPIConnection boxConnection;
@@ -72,10 +76,10 @@ public class BoxConsumer extends AbstractApiConsumer<BoxApiName, BoxConfiguratio
public void onEvent(BoxEvent event) {
try {
// Convert Events to exchange and process
- log.debug("Processed {} event for {}", ApiConsumerHelper.getResultsProcessed(this, event, false),
+ LOG.debug("Processed {} event for {}", ApiConsumerHelper.getResultsProcessed(this, event, false),
boxConnection);
} catch (Exception e) {
- log.info("Received exception consuming event: ", e);
+ LOG.info("Received exception consuming event: ", e);
}
}
diff --git a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepository.java b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepository.java
index 81e4ffa..23cca1b 100644
--- a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepository.java
+++ b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/processor/aggregate/CaffeineAggregationRepository.java
@@ -28,9 +28,13 @@ import org.apache.camel.spi.RecoverableAggregationRepository;
import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.DefaultExchangeHolder;
import org.apache.camel.support.service.ServiceSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CaffeineAggregationRepository extends ServiceSupport implements RecoverableAggregationRepository {
+ private static final Logger LOG = LoggerFactory.getLogger(CaffeineAggregationRepository.class);
+
private CamelContext camelContext;
private Cache<String, DefaultExchangeHolder> cache;
private boolean allowSerializedHeaders;
@@ -123,7 +127,7 @@ public class CaffeineAggregationRepository extends ServiceSupport implements Rec
@Override
public Exchange add(final CamelContext camelContext, final String key, final Exchange exchange) {
- log.trace("Adding an Exchange with ID {} for key {} in a thread-safe manner.", exchange.getExchangeId(), key);
+ LOG.trace("Adding an Exchange with ID {} for key {} in a thread-safe manner.", exchange.getExchangeId(), key);
final DefaultExchangeHolder oldHolder = cache.getIfPresent(key);
final DefaultExchangeHolder newHolder = DefaultExchangeHolder.marshal(exchange, true, allowSerializedHeaders);
@@ -140,13 +144,13 @@ public class CaffeineAggregationRepository extends ServiceSupport implements Rec
@Override
public void remove(CamelContext camelContext, String key, Exchange exchange) {
- log.trace("Removing an exchange with ID {} for key {}", exchange.getExchangeId(), key);
+ LOG.trace("Removing an exchange with ID {} for key {}", exchange.getExchangeId(), key);
cache.invalidate(key);
}
@Override
public void confirm(CamelContext camelContext, String exchangeId) {
- log.trace("Confirming an exchange with ID {}.", exchangeId);
+ LOG.trace("Confirming an exchange with ID {}.", exchangeId);
cache.invalidate(exchangeId);
}
@@ -159,15 +163,15 @@ public class CaffeineAggregationRepository extends ServiceSupport implements Rec
@Override
public Set<String> scan(CamelContext camelContext) {
- log.trace("Scanning for exchanges to recover in {} context", camelContext.getName());
+ LOG.trace("Scanning for exchanges to recover in {} context", camelContext.getName());
Set<String> scanned = Collections.unmodifiableSet(getKeys());
- log.trace("Found {} keys for exchanges to recover in {} context", scanned.size(), camelContext.getName());
+ LOG.trace("Found {} keys for exchanges to recover in {} context", scanned.size(), camelContext.getName());
return scanned;
}
@Override
public Exchange recover(CamelContext camelContext, String exchangeId) {
- log.trace("Recovering an Exchange with ID {}.", exchangeId);
+ LOG.trace("Recovering an Exchange with ID {}.", exchangeId);
return useRecovery ? unmarshallExchange(camelContext, cache.getIfPresent(exchangeId)) : null;
}
diff --git a/components/camel-cbor/src/main/java/org/apache/camel/component/cbor/CBORDataFormat.java b/components/camel-cbor/src/main/java/org/apache/camel/component/cbor/CBORDataFormat.java
index 7b257ed..610d595 100644
--- a/components/camel-cbor/src/main/java/org/apache/camel/component/cbor/CBORDataFormat.java
+++ b/components/camel-cbor/src/main/java/org/apache/camel/component/cbor/CBORDataFormat.java
@@ -39,10 +39,14 @@ import org.apache.camel.spi.DataFormatName;
import org.apache.camel.spi.annotations.Dataformat;
import org.apache.camel.support.ObjectHelper;
import org.apache.camel.support.service.ServiceSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Dataformat("cbor")
public class CBORDataFormat extends ServiceSupport implements DataFormat, DataFormatName {
+ private static final Logger LOG = LoggerFactory.getLogger(CBORDataFormat.class);
+
private CamelContext camelContext;
private ObjectMapper objectMapper;
private Class<?> unmarshalType;
@@ -297,15 +301,15 @@ public class CBORDataFormat extends ServiceSupport implements DataFormat, DataFo
Set<ObjectMapper> set = camelContext.getRegistry().findByType(ObjectMapper.class);
if (set.size() == 1) {
objectMapper = set.iterator().next();
- log.info("Found single ObjectMapper in Registry to use: {}", objectMapper);
+ LOG.info("Found single ObjectMapper in Registry to use: {}", objectMapper);
} else if (set.size() > 1) {
- log.debug("Found {} ObjectMapper in Registry cannot use as default as there are more than one instance.", set.size());
+ LOG.debug("Found {} ObjectMapper in Registry cannot use as default as there are more than one instance.", set.size());
}
}
if (objectMapper == null) {
CBORFactory factory = new CBORFactory();
objectMapper = new ObjectMapper(factory);
- log.debug("Creating new ObjectMapper to use: {}", objectMapper);
+ LOG.debug("Creating new ObjectMapper to use: {}", objectMapper);
}
}
@@ -369,7 +373,6 @@ public class CBORDataFormat extends ServiceSupport implements DataFormat, DataFo
@Override
protected void doStop() throws Exception {
- // TODO Auto-generated method stub
-
+ // noop
}
}
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java
index 47751ce..5d5326b 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionErrorHandler.java
@@ -38,6 +38,8 @@ import org.apache.camel.support.AsyncCallbackToCompletableFutureAdapter;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Does transactional execution according given policy. This class is based on
@@ -49,6 +51,8 @@ import org.apache.camel.util.ObjectHelper;
public class TransactionErrorHandler extends ErrorHandlerSupport
implements AsyncProcessor, ShutdownPrepared, Navigate<Processor> {
+ private static final Logger LOG = LoggerFactory.getLogger(TransactionErrorHandler.class);
+
protected final Processor output;
protected volatile boolean preparingShutdown;
@@ -156,16 +160,16 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
Boolean onlyLast = (Boolean) exchange.removeProperty(Exchange.ROLLBACK_ONLY_LAST);
if (onlyLast != null && onlyLast) {
// we only want this logged at debug level
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
// log exception if there was a cause exception so we have the
// stack trace
Exception cause = exchange.getException();
if (cause != null) {
- log.debug("Transaction rollback ({}) redelivered({}) for {} "
+ LOG.debug("Transaction rollback ({}) redelivered({}) for {} "
+ "due exchange was marked for rollbackOnlyLast and caught: ",
transactionKey, redelivered, ids, cause);
} else {
- log.debug("Transaction rollback ({}) redelivered({}) for {} "
+ LOG.debug("Transaction rollback ({}) redelivered({}) for {} "
+ "due exchange was marked for rollbackOnlyLast",
transactionKey, redelivered, ids);
}
@@ -212,8 +216,8 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
// throw runtime exception to force rollback (which works
// best to rollback with Spring transaction manager)
- if (log.isTraceEnabled()) {
- log.trace("Throwing runtime exception to force transaction to rollback on {}",
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Throwing runtime exception to force transaction to rollback on {}",
transactionPolicy);
}
throw rce;
@@ -244,8 +248,8 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
* Logs the transaction begin
*/
private void logTransactionBegin(String redelivered, String ids) {
- if (log.isDebugEnabled()) {
- log.debug("Transaction begin ({}) redelivered({}) for {})",
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Transaction begin ({}) redelivered({}) for {})",
transactionKey, redelivered, ids);
}
}
@@ -261,7 +265,7 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
// committed this time
if (rollbackLoggingLevel == LoggingLevel.INFO || rollbackLoggingLevel == LoggingLevel.WARN
|| rollbackLoggingLevel == LoggingLevel.ERROR) {
- log.info("Transaction commit ({}) redelivered({}) for {})",
+ LOG.info("Transaction commit ({}) redelivered({}) for {})",
transactionKey, redelivered, ids);
// return after we have logged
return;
@@ -269,7 +273,7 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
}
// log non redelivered by default at DEBUG level
- log.debug("Transaction commit ({}) redelivered({}) for {})", transactionKey, redelivered, ids);
+ LOG.debug("Transaction commit ({}) redelivered({}) for {})", transactionKey, redelivered, ids);
}
/**
@@ -278,44 +282,44 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
private void logTransactionRollback(String redelivered, String ids, Throwable e, boolean rollbackOnly) {
if (rollbackLoggingLevel == LoggingLevel.OFF) {
return;
- } else if (rollbackLoggingLevel == LoggingLevel.ERROR && log.isErrorEnabled()) {
+ } else if (rollbackLoggingLevel == LoggingLevel.ERROR && LOG.isErrorEnabled()) {
if (rollbackOnly) {
- log.error("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly",
+ LOG.error("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly",
transactionKey, redelivered, ids);
} else {
- log.error("Transaction rollback ({}) redelivered({}) for {} caught: {}",
+ LOG.error("Transaction rollback ({}) redelivered({}) for {} caught: {}",
transactionKey, redelivered, ids, e.getMessage());
}
- } else if (rollbackLoggingLevel == LoggingLevel.WARN && log.isWarnEnabled()) {
+ } else if (rollbackLoggingLevel == LoggingLevel.WARN && LOG.isWarnEnabled()) {
if (rollbackOnly) {
- log.warn("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly",
+ LOG.warn("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly",
transactionKey, redelivered, ids);
} else {
- log.warn("Transaction rollback ({}) redelivered({}) for {} caught: {}",
+ LOG.warn("Transaction rollback ({}) redelivered({}) for {} caught: {}",
transactionKey, redelivered, ids, e.getMessage());
}
- } else if (rollbackLoggingLevel == LoggingLevel.INFO && log.isInfoEnabled()) {
+ } else if (rollbackLoggingLevel == LoggingLevel.INFO && LOG.isInfoEnabled()) {
if (rollbackOnly) {
- log.info("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly",
+ LOG.info("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly",
transactionKey, redelivered, ids);
} else {
- log.info("Transaction rollback ({}) redelivered({}) for {} caught: {}",
+ LOG.info("Transaction rollback ({}) redelivered({}) for {} caught: {}",
transactionKey, redelivered, ids, e.getMessage());
}
- } else if (rollbackLoggingLevel == LoggingLevel.DEBUG && log.isDebugEnabled()) {
+ } else if (rollbackLoggingLevel == LoggingLevel.DEBUG && LOG.isDebugEnabled()) {
if (rollbackOnly) {
- log.debug("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly",
+ LOG.debug("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly",
transactionKey, redelivered, ids);
} else {
- log.debug("Transaction rollback ({}) redelivered({}) for {} caught: {}",
+ LOG.debug("Transaction rollback ({}) redelivered({}) for {} caught: {}",
transactionKey, redelivered, ids, e.getMessage());
}
- } else if (rollbackLoggingLevel == LoggingLevel.TRACE && log.isTraceEnabled()) {
+ } else if (rollbackLoggingLevel == LoggingLevel.TRACE && LOG.isTraceEnabled()) {
if (rollbackOnly) {
- log.trace("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly",
+ LOG.trace("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly",
transactionKey, redelivered, ids);
} else {
- log.trace("Transaction rollback ({}) redelivered({}) for {} caught: {}",
+ LOG.trace("Transaction rollback ({}) redelivered({}) for {} caught: {}",
transactionKey, redelivered, ids, e.getMessage());
}
}
@@ -376,7 +380,7 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
@Override
public void prepareShutdown(boolean suspendOnly, boolean forced) {
// prepare for shutdown, eg do not allow redelivery if configured
- log.trace("Prepare shutdown on error handler {}", this);
+ LOG.trace("Prepare shutdown on error handler {}", this);
preparingShutdown = true;
}
}
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMComponent.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMComponent.java
index 083cd5b..b1d2cab 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMComponent.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMComponent.java
@@ -52,7 +52,6 @@ public class CMComponent extends DefaultComponent {
setProperties(endpoint, parameters);
// Validate configuration
- log.debug("Validating uri based configuration");
final Set<ConstraintViolation<CMConfiguration>> constraintViolations = getValidator().validate(endpoint.getConfiguration());
if (constraintViolations.size() > 0) {
final StringBuffer msg = new StringBuffer();
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMProducer.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMProducer.java
index e5bef34..a2cfc8f 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMProducer.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMProducer.java
@@ -28,12 +28,15 @@ import org.apache.camel.component.cm.exceptions.HostUnavailableException;
import org.apache.camel.support.DefaultProducer;
import org.apache.http.client.methods.HttpHead;
import org.apache.http.impl.client.HttpClientBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* is the exchange processor. Sends a validated sms message to CM Endpoints.
*/
public class CMProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(CMProducer.class);
private Validator validator;
/**
@@ -58,29 +61,29 @@ public class CMProducer extends DefaultProducer {
final SMSMessage smsMessage = exchange.getIn().getMandatoryBody(SMSMessage.class);
// Validates Payload - SMSMessage
- log.trace("Validating SMSMessage instance provided: {}", smsMessage);
+ LOG.trace("Validating SMSMessage instance provided: {}", smsMessage);
final Set<ConstraintViolation<SMSMessage>> constraintViolations = getValidator().validate(smsMessage);
if (constraintViolations.size() > 0) {
final StringBuffer msg = new StringBuffer();
for (final ConstraintViolation<SMSMessage> cv : constraintViolations) {
msg.append(String.format("- Invalid value for %s: %s", cv.getPropertyPath().toString(), cv.getMessage()));
}
- log.debug(msg.toString());
+ LOG.debug(msg.toString());
throw new InvalidPayloadRuntimeException(exchange, SMSMessage.class);
}
- log.trace("SMSMessage instance is valid: {}", smsMessage);
+ LOG.trace("SMSMessage instance is valid: {}", smsMessage);
// We have a valid (immutable) SMSMessage instance, lets extend to
// CMMessage
// This is the instance we will use to build the XML document to be
// sent to CM SMS GW.
final CMMessage cmMessage = new CMMessage(smsMessage.getPhoneNumber(), smsMessage.getMessage());
- log.debug("CMMessage instance build from valid SMSMessage instance");
+ LOG.debug("CMMessage instance build from valid SMSMessage instance");
if (smsMessage.getFrom() == null || smsMessage.getFrom().isEmpty()) {
String df = getConfiguration().getDefaultFrom();
cmMessage.setSender(df);
- log.debug("Dynamic sender is set to default dynamic sender: {}", df);
+ LOG.debug("Dynamic sender is set to default dynamic sender: {}", df);
}
// Remember, this can be null.
@@ -93,7 +96,7 @@ public class CMProducer extends DefaultProducer {
// for abnormal situations.
sender.send(cmMessage);
- log.debug("Request accepted by CM Host: {}", cmMessage);
+ LOG.debug("Request accepted by CM Host: {}", cmMessage);
}
@Override
@@ -102,15 +105,15 @@ public class CMProducer extends DefaultProducer {
// log at debug level for singletons, for prototype scoped log at trace
// level to not spam logs
- log.debug("Starting CMProducer");
+ LOG.debug("Starting CMProducer");
final CMConfiguration configuration = getConfiguration();
if (configuration.isTestConnectionOnStartup()) {
try {
- log.debug("Checking connection - {}", getEndpoint().getCMUrl());
+ LOG.debug("Checking connection - {}", getEndpoint().getCMUrl());
HttpClientBuilder.create().build().execute(new HttpHead(getEndpoint().getCMUrl()));
- log.debug("Connection to {}: OK", getEndpoint().getCMUrl());
+ LOG.debug("Connection to {}: OK", getEndpoint().getCMUrl());
} catch (final Exception e) {
throw new HostUnavailableException(String.format("Connection to %s: NOT AVAILABLE", getEndpoint().getCMUrl()), e);
}
@@ -119,7 +122,7 @@ public class CMProducer extends DefaultProducer {
// keep starting
super.doStart();
- log.debug("CMProducer started");
+ LOG.debug("CMProducer started");
}
@Override
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISConsumer.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISConsumer.java
index fd4240b..1dfe2d1 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISConsumer.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISConsumer.java
@@ -23,12 +23,16 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.support.ScheduledPollConsumer;
import org.apache.chemistry.opencmis.client.api.OperationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The CMIS consumer.
*/
public class CMISConsumer extends ScheduledPollConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(CMISConsumer.class);
+
private final CMISSessionFacadeFactory sessionFacadeFactory;
private CMISSessionFacade sessionFacade;
@@ -57,7 +61,7 @@ public class CMISConsumer extends ScheduledPollConsumer {
Exchange exchange = getEndpoint().createExchange();
exchange.getIn().setHeaders(properties);
exchange.getIn().setBody(inputStream);
- log.debug("Polling node : {}", properties.get("cmis:name"));
+ LOG.debug("Polling node: {}", properties.get("cmis:name"));
getProcessor().process(exchange);
return 1;
}
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java
index 609b130..8440e53 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java
@@ -47,12 +47,16 @@ import org.apache.chemistry.opencmis.commons.data.ContentStream;
import org.apache.chemistry.opencmis.commons.enums.Action;
import org.apache.chemistry.opencmis.commons.enums.UnfileObject;
import org.apache.chemistry.opencmis.commons.enums.VersioningState;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The CMIS producer.
*/
public class CMISProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(CMISProducer.class);
+
private final CMISSessionFacadeFactory sessionFacadeFactory;
private CMISSessionFacade sessionFacade;
@@ -294,7 +298,7 @@ public class CMISProducer extends DefaultProducer {
}
try {
- log.info("Moving document from " + sourceFolder.getName() + " to " + targetFolder.getName());
+ LOG.info("Moving document from " + sourceFolder.getName() + " to " + targetFolder.getName());
return document.move(sourceFolder, targetFolder);
} catch (Exception e) {
throw new CamelCmisException("Cannot move document to folder " + targetFolder.getName() + " : " + e.getMessage(), e);
@@ -511,7 +515,7 @@ public class CMISProducer extends DefaultProducer {
if (!cmisProperties.containsKey(PropertyIds.OBJECT_TYPE_ID)) {
cmisProperties.put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_FOLDER);
}
- log.debug("Creating folder with properties: {}", cmisProperties);
+ LOG.debug("Creating folder with properties: {}", cmisProperties);
return parentFolder.createFolder(cmisProperties);
}
@@ -524,7 +528,7 @@ public class CMISProducer extends DefaultProducer {
if (getSessionFacade().isObjectTypeVersionable((String) cmisProperties.get(PropertyIds.OBJECT_TYPE_ID))) {
versioningState = VersioningState.MAJOR;
}
- log.debug("Creating document with properties: {}", cmisProperties);
+ LOG.debug("Creating document with properties: {}", cmisProperties);
return parentFolder.createDocument(cmisProperties, contentStream, versioningState);
}
diff --git a/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusProducer.java b/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusProducer.java
index 82f0dd7..072a0e0 100644
--- a/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusProducer.java
+++ b/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusProducer.java
@@ -33,12 +33,16 @@ import org.apache.camel.spi.UnitOfWork;
import org.apache.camel.support.DefaultAsyncProducer;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The control bus producer.
*/
public class ControlBusProducer extends DefaultAsyncProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(ControlBusProducer.class);
+
private final CamelLogger logger;
public ControlBusProducer(Endpoint endpoint, CamelLogger logger) {
@@ -170,24 +174,24 @@ public class ControlBusProducer extends DefaultAsyncProducer {
try {
if ("start".equals(action)) {
- log.debug("Starting route: {}", id);
+ LOG.debug("Starting route: {}", id);
getEndpoint().getCamelContext().getRouteController().startRoute(id);
} else if ("stop".equals(action)) {
- log.debug("Stopping route: {}", id);
+ LOG.debug("Stopping route: {}", id);
getEndpoint().getCamelContext().getRouteController().stopRoute(id);
} else if ("suspend".equals(action)) {
- log.debug("Suspending route: {}", id);
+ LOG.debug("Suspending route: {}", id);
getEndpoint().getCamelContext().getRouteController().suspendRoute(id);
} else if ("resume".equals(action)) {
- log.debug("Resuming route: {}", id);
+ LOG.debug("Resuming route: {}", id);
getEndpoint().getCamelContext().getRouteController().resumeRoute(id);
} else if ("restart".equals(action)) {
- log.debug("Restarting route: {}", id);
+ LOG.debug("Restarting route: {}", id);
getEndpoint().getCamelContext().getRouteController().stopRoute(id);
int delay = getEndpoint().getRestartDelay();
if (delay > 0) {
try {
- log.debug("Sleeping {} ms before starting route: {}", delay, id);
+ LOG.debug("Sleeping {} ms before starting route: {}", delay, id);
Thread.sleep(delay);
} catch (InterruptedException e) {
// ignore
@@ -195,13 +199,13 @@ public class ControlBusProducer extends DefaultAsyncProducer {
}
getEndpoint().getCamelContext().getRouteController().startRoute(id);
} else if ("status".equals(action)) {
- log.debug("Route status: {}", id);
+ LOG.debug("Route status: {}", id);
ServiceStatus status = getEndpoint().getCamelContext().getRouteController().getRouteStatus(id);
if (status != null) {
result = status.name();
}
} else if ("stats".equals(action)) {
- log.debug("Route stats: {}", id);
+ LOG.debug("Route stats: {}", id);
// camel context or per route
String name = getEndpoint().getCamelContext().getManagementName();
diff --git a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java
index 6db26ea..5202d04 100644
--- a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java
+++ b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java
@@ -24,6 +24,9 @@ import com.couchbase.client.protocol.views.ViewRow;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.support.DefaultScheduledPollConsumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.component.couchbase.CouchbaseConstants.HEADER_DESIGN_DOCUMENT_NAME;
import static org.apache.camel.component.couchbase.CouchbaseConstants.HEADER_ID;
@@ -32,6 +35,8 @@ import static org.apache.camel.component.couchbase.CouchbaseConstants.HEADER_VIE
public class CouchbaseConsumer extends DefaultScheduledPollConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(CouchbaseConsumer.class);
+
private final CouchbaseEndpoint endpoint;
private final CouchbaseClient client;
private final View view;
@@ -75,13 +80,13 @@ public class CouchbaseConsumer extends DefaultScheduledPollConsumer {
@Override
protected void doStart() throws Exception {
- log.info("Starting Couchbase consumer");
+ LOG.info("Starting Couchbase consumer");
super.doStart();
}
@Override
protected void doStop() throws Exception {
- log.info("Stopping Couchbase consumer");
+ LOG.info("Stopping Couchbase consumer");
super.doStop();
if (client != null) {
client.shutdown();
@@ -91,10 +96,10 @@ public class CouchbaseConsumer extends DefaultScheduledPollConsumer {
@Override
protected synchronized int poll() throws Exception {
ViewResponse result = client.query(view, query);
- log.info("Received result set from Couchbase");
+ LOG.info("Received result set from Couchbase");
- if (log.isTraceEnabled()) {
- log.trace("ViewResponse = {}", result);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("ViewResponse = {}", result);
}
String consumerProcessedStrategy = endpoint.getConsumerProcessedStrategy();
@@ -116,17 +121,17 @@ public class CouchbaseConsumer extends DefaultScheduledPollConsumer {
exchange.getIn().setHeader(HEADER_VIEWNAME, viewName);
if ("delete".equalsIgnoreCase(consumerProcessedStrategy)) {
- if (log.isTraceEnabled()) {
- log.trace("Deleting doc with ID {}", id);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Deleting doc with ID {}", id);
}
client.delete(id);
} else if ("filter".equalsIgnoreCase(consumerProcessedStrategy)) {
- if (log.isTraceEnabled()) {
- log.trace("Filtering out ID {}", id);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Filtering out ID {}", id);
}
// add filter for already processed docs
} else {
- log.trace("No strategy set for already processed docs, beware of duplicates!");
+ LOG.trace("No strategy set for already processed docs, beware of duplicates!");
}
logDetails(id, doc, key, designDocumentName, viewName, exchange);
@@ -143,14 +148,14 @@ public class CouchbaseConsumer extends DefaultScheduledPollConsumer {
private void logDetails(String id, Object doc, String key, String designDocumentName, String viewName, Exchange exchange) {
- if (log.isTraceEnabled()) {
- log.trace("Created exchange = {}", exchange);
- log.trace("Added Document in body = {}", doc);
- log.trace("Adding to Header");
- log.trace("ID = {}", id);
- log.trace("Key = {}", key);
- log.trace("Design Document Name = {}", designDocumentName);
- log.trace("View Name = {}", viewName);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Created exchange = {}", exchange);
+ LOG.trace("Added Document in body = {}", doc);
+ LOG.trace("Adding to Header");
+ LOG.trace("ID = {}", id);
+ LOG.trace("Key = {}", key);
+ LOG.trace("Design Document Name = {}", designDocumentName);
+ LOG.trace("View Name = {}", viewName);
}
}
diff --git a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java
index cffb3aa..7fe4c58 100644
--- a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java
+++ b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseProducer.java
@@ -25,6 +25,9 @@ import net.spy.memcached.ReplicateTo;
import net.spy.memcached.internal.OperationFuture;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultProducer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.component.couchbase.CouchbaseConstants.COUCHBASE_DELETE;
import static org.apache.camel.component.couchbase.CouchbaseConstants.COUCHBASE_GET;
@@ -37,9 +40,10 @@ import static org.apache.camel.component.couchbase.CouchbaseConstants.HEADER_TTL
* Couchbase producer generates various type of operations. PUT, GET, and DELETE
* are currently supported
*/
-
public class CouchbaseProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(CouchbaseProducer.class);
+
private CouchbaseEndpoint endpoint;
private CouchbaseClientIF client;
private long startId;
@@ -114,15 +118,15 @@ public class CouchbaseProducer extends DefaultProducer {
}
if (endpoint.getOperation().equals(COUCHBASE_PUT)) {
- log.info("Type of operation: PUT");
+ LOG.debug("Type of operation: PUT");
Object obj = exchange.getIn().getBody();
exchange.getOut().setBody(setDocument(id, ttl, obj, persistTo, replicateTo));
} else if (endpoint.getOperation().equals(COUCHBASE_GET)) {
- log.info("Type of operation: GET");
+ LOG.debug("Type of operation: GET");
Object result = client.get(id);
exchange.getOut().setBody(result);
} else if (endpoint.getOperation().equals(COUCHBASE_DELETE)) {
- log.info("Type of operation: DELETE");
+ LOG.debug("Type of operation: DELETE");
Future<Boolean> result = client.delete(id);
exchange.getOut().setBody(result.get());
}
@@ -156,7 +160,7 @@ public class CouchbaseProducer extends DefaultProducer {
if (retryAttempts <= 0) {
throw e;
} else {
- log.info("Unable to save Document, retrying in " + producerRetryPause + "ms (" + retryAttempts + ")");
+ LOG.info("Unable to save Document, retrying in " + producerRetryPause + "ms (" + retryAttempts + ")");
Thread.sleep(producerRetryPause);
return setDocument(id, expiry, obj, retryAttempts - 1, persistTo, replicateTo);
}
diff --git a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbConsumer.java b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbConsumer.java
index ca0c0e0..2e6d606 100644
--- a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbConsumer.java
+++ b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbConsumer.java
@@ -20,9 +20,13 @@ import java.util.concurrent.ExecutorService;
import org.apache.camel.Processor;
import org.apache.camel.support.DefaultConsumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CouchDbConsumer extends DefaultConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(CouchDbConsumer.class);
+
private final CouchDbClientWrapper couchClient;
private final CouchDbEndpoint endpoint;
private ExecutorService executor;
@@ -37,7 +41,7 @@ public class CouchDbConsumer extends DefaultConsumer {
@Override
protected void doStart() throws Exception {
super.doStart();
- log.info("Starting CouchDB consumer");
+ LOG.info("Starting CouchDB consumer");
executor = endpoint.getCamelContext().getExecutorServiceManager().newFixedThreadPool(this, endpoint.getEndpointUri(), 1);
task = new CouchDbChangesetTracker(endpoint, this, couchClient);
@@ -47,7 +51,7 @@ public class CouchDbConsumer extends DefaultConsumer {
@Override
protected void doStop() throws Exception {
super.doStop();
- log.info("Stopping CouchDB consumer");
+ LOG.info("Stopping CouchDB consumer");
if (task != null) {
task.stop();
}
diff --git a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbProducer.java b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbProducer.java
index 4346112..80a4c79 100644
--- a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbProducer.java
+++ b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbProducer.java
@@ -25,9 +25,13 @@ import org.apache.camel.InvalidPayloadException;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
import org.lightcouch.Response;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CouchDbProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(CouchDbProducer.class);
+
private final CouchDbClientWrapper couchClient;
public CouchDbProducer(CouchDbEndpoint endpoint, CouchDbClientWrapper couchClient) {
@@ -45,8 +49,8 @@ public class CouchDbProducer extends DefaultProducer {
throw new CouchDbException("Could not save document [unknown reason]", exchange);
}
- if (log.isTraceEnabled()) {
- log.trace("Document saved [_id={}, _rev={}]", save.getId(), save.getRev());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Document saved [_id={}, _rev={}]", save.getId(), save.getRev());
}
exchange.getIn().setHeader(CouchDbConstants.HEADER_DOC_REV, save.getRev());
exchange.getIn().setHeader(CouchDbConstants.HEADER_DOC_ID, save.getId());
@@ -57,8 +61,8 @@ public class CouchDbProducer extends DefaultProducer {
throw new CouchDbException("Could not delete document [unknown reason]", exchange);
}
- if (log.isTraceEnabled()) {
- log.trace("Document saved [_id={}, _rev={}]", delete.getId(), delete.getRev());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Document saved [_id={}, _rev={}]", delete.getId(), delete.getRev());
}
exchange.getIn().setHeader(CouchDbConstants.HEADER_DOC_REV, delete.getRev());
exchange.getIn().setHeader(CouchDbConstants.HEADER_DOC_ID, delete.getId());
@@ -70,8 +74,8 @@ public class CouchDbProducer extends DefaultProducer {
}
Object response = getElement(docId);
- if (log.isTraceEnabled()) {
- log.trace("Document retrieved [_id={}]", docId);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Document retrieved [_id={}]", docId);
}
exchange.getIn().setBody(response);
diff --git a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/CryptoCmsComponent.java b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/CryptoCmsComponent.java
index 20ebcd9..b28efb9 100644
--- a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/CryptoCmsComponent.java
+++ b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/CryptoCmsComponent.java
@@ -39,10 +39,14 @@ import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
import org.apache.camel.util.ObjectHelper;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Component("crypto-cms")
public class CryptoCmsComponent extends DefaultComponent {
+ private static final Logger LOG = LoggerFactory.getLogger(CryptoCmsComponent.class);
+
@Metadata(label = "advanced")
private SignedDataVerifierConfiguration signedDataVerifierConfiguration;
@@ -108,7 +112,7 @@ public class CryptoCmsComponent extends DefaultComponent {
processor = new EnvelopedDataDecryptor(config);
} else {
String error = "Endpoint uri " + uri + " is wrong configured. Operation " + scheme + " is not supported. Supported operations are: sign, verify, encrypt, decrypt";
- log.error(error);
+ LOG.error(error);
throw new IllegalStateException(error);
}
CryptoCmsEndpoint endpoint = new CryptoCmsEndpoint(uri, this, processor);
@@ -150,7 +154,7 @@ public class CryptoCmsComponent extends DefaultComponent {
@Override
protected void doStart() throws Exception { // NOPMD
if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null) {
- log.debug("Adding BouncyCastleProvider as security provider");
+ LOG.debug("Adding BouncyCastleProvider as security provider");
Security.addProvider(new BouncyCastleProvider());
}
super.doStart();
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java
index 95a83db..96be055 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java
@@ -21,9 +21,13 @@ import org.apache.camel.util.ObjectHelper;
import org.apache.cxf.BusFactory;
import org.osgi.framework.BundleContext;
import org.osgi.service.blueprint.container.BlueprintContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CxfBlueprintEndpoint extends CxfEndpoint {
+ private static final Logger LOG = LoggerFactory.getLogger(CxfBlueprintEndpoint.class);
+
private BlueprintContainer blueprintContainer;
private BundleContext bundleContext;
private BlueprintCamelContext blueprintCamelContext;
@@ -53,7 +57,7 @@ public class CxfBlueprintEndpoint extends CxfEndpoint {
@Override
protected void checkName(Object value, String name) {
if (ObjectHelper.isEmpty(value)) {
- log.warn("The " + name + " of " + this.getEndpointUri() + " is empty, cxf will try to load the first one in wsdl for you.");
+ LOG.warn("The " + name + " of " + this.getEndpointUri() + " is empty, cxf will try to load the first one in wsdl for you.");
}
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
index bb37fd7..b1066d9 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
@@ -27,6 +27,8 @@ import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.HeaderFilterStrategyComponent;
import org.apache.camel.util.PropertiesHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Defines the <a href="http://camel.apache.org/cxf.html">CXF Component</a>
@@ -34,6 +36,8 @@ import org.apache.camel.util.PropertiesHelper;
@Component("cxf")
public class CxfComponent extends HeaderFilterStrategyComponent implements SSLContextParametersAware {
+ private static final Logger LOG = LoggerFactory.getLogger(CxfComponent.class);
+
@Metadata(label = "advanced")
private Boolean allowStreaming;
@Metadata(label = "security", defaultValue = "false")
@@ -83,7 +87,7 @@ public class CxfComponent extends HeaderFilterStrategyComponent implements SSLCo
Object value = parameters.remove("setDefaultBus");
if (value != null) {
- log.warn("The option setDefaultBus is @deprecated, use name defaultBus instead");
+ LOG.warn("The option setDefaultBus is @deprecated, use name defaultBus instead");
if (!parameters.containsKey("defaultBus")) {
parameters.put("defaultBus", value);
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
index 7f16c41..7e28829 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
@@ -22,6 +22,8 @@ import java.util.Map;
import javax.xml.ws.WebFault;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
import org.apache.camel.AsyncCallback;
@@ -57,6 +59,8 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
*/
public class CxfConsumer extends DefaultConsumer implements Suspendable {
+ private static final Logger LOG = LoggerFactory.getLogger(CxfConsumer.class);
+
private Server server;
private CxfEndpoint cxfEndpoint;
@@ -150,14 +154,14 @@ public class CxfConsumer extends DefaultConsumer implements Suspendable {
// we receive a CXF request when this method is called
@Override
public Object invoke(Exchange cxfExchange, Object o) {
- log.trace("Received CXF Request: {}", cxfExchange);
+ LOG.trace("Received CXF Request: {}", cxfExchange);
Continuation continuation;
if (!endpoint.isSynchronous() && isAsyncInvocationSupported(cxfExchange)
&& (continuation = getContinuation(cxfExchange)) != null) {
- log.trace("Calling the Camel async processors.");
+ LOG.trace("Calling the Camel async processors.");
return asyncInvoke(cxfExchange, continuation);
} else {
- log.trace("Calling the Camel sync processors.");
+ LOG.trace("Calling the Camel sync processors.");
return syncInvoke(cxfExchange);
}
}
@@ -165,13 +169,13 @@ public class CxfConsumer extends DefaultConsumer implements Suspendable {
// NOTE this code cannot work with CXF 2.2.x and JMSContinuation
// as it doesn't break out the interceptor chain when we call it
private Object asyncInvoke(Exchange cxfExchange, final Continuation continuation) {
- log.trace("asyncInvoke continuation: {}", continuation);
+ LOG.trace("asyncInvoke continuation: {}", continuation);
synchronized (continuation) {
if (continuation.isNew()) {
final org.apache.camel.Exchange camelExchange = prepareCamelExchange(cxfExchange);
// Now we don't set up the timeout value
- log.trace("Suspending continuation of exchangeId: {}", camelExchange.getExchangeId());
+ LOG.trace("Suspending continuation of exchangeId: {}", camelExchange.getExchangeId());
// The continuation could be called before the suspend is called
continuation.suspend(cxfEndpoint.getContinuationTimeout());
@@ -183,7 +187,7 @@ public class CxfConsumer extends DefaultConsumer implements Suspendable {
public void done(boolean doneSync) {
// make sure the continuation resume will not be called before the suspend method in other thread
synchronized (continuation) {
- 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.resume();
}
@@ -232,14 +236,14 @@ public class CxfConsumer extends DefaultConsumer implements Suspendable {
org.apache.camel.Exchange camelExchange = prepareCamelExchange(cxfExchange);
try {
try {
- log.trace("Processing +++ START +++");
+ LOG.trace("Processing +++ START +++");
// send Camel exchange to the target processor
getProcessor().process(camelExchange);
} catch (Exception e) {
throw new Fault(e);
}
- log.trace("Processing +++ END +++");
+ LOG.trace("Processing +++ END +++");
setResponseBack(cxfExchange, camelExchange);
} catch (Exception ex) {
doneUoW(camelExchange);
@@ -270,7 +274,7 @@ public class CxfConsumer extends DefaultConsumer implements Suspendable {
if (boi != null) {
camelExchange.setProperty(BindingOperationInfo.class.getName(), boi);
- log.trace("Set exchange property: BindingOperationInfo: {}", boi);
+ LOG.trace("Set exchange property: BindingOperationInfo: {}", boi);
// set the message exchange patter with the boi
if (boi.getOperationInfo().isOneWay()) {
camelExchange.setPattern(ExchangePattern.InOnly);
@@ -284,7 +288,7 @@ public class CxfConsumer extends DefaultConsumer implements Suspendable {
// set data format mode in Camel exchange
camelExchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, dataFormat);
- 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()));
@@ -303,7 +307,7 @@ public class CxfConsumer extends DefaultConsumer implements Suspendable {
try {
CxfConsumer.this.createUoW(camelExchange);
} catch (Exception e) {
- log.error("Error processing request", e);
+ LOG.error("Error processing request", e);
throw new Fault(e);
}
return camelExchange;
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 2f164b8..66b67ca 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -43,6 +43,8 @@ import javax.xml.ws.Provider;
import javax.xml.ws.WebServiceProvider;
import javax.xml.ws.handler.Handler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -120,6 +122,8 @@ import org.apache.cxf.wsdl.WSDLManager;
@UriEndpoint(firstVersion = "1.0.0", scheme = "cxf", title = "CXF", syntax = "cxf:beanId:address", label = "soap,webservice")
public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, HeaderFilterStrategyAware, Service, Cloneable {
+ private static final Logger LOG = LoggerFactory.getLogger(CxfEndpoint.class);
+
@UriParam(label = "advanced")
protected Bus bus;
@@ -317,7 +321,7 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
sfb.getFeatures().add(feature);
}
} else {
- log.debug("Ignore DataFormat mode {} since SEI class is annotated with WebServiceProvider", getDataFormat());
+ LOG.debug("Ignore DataFormat mode {} since SEI class is annotated with WebServiceProvider", getDataFormat());
}
if (isLoggingFeatureEnabled()) {
@@ -345,7 +349,7 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
} else {
sfb.setProperties(getProperties());
}
- log.debug("ServerFactoryBean: {} added properties: {}", sfb, getProperties());
+ LOG.debug("ServerFactoryBean: {} added properties: {}", sfb, getProperties());
}
if (this.isSkipPayloadMessagePartCheck()) {
if (sfb.getProperties() == null) {
@@ -531,7 +535,7 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
} else {
factoryBean.setProperties(getProperties());
}
- log.debug("ClientFactoryBean: {} added properties: {}", factoryBean, getProperties());
+ LOG.debug("ClientFactoryBean: {} added properties: {}", factoryBean, getProperties());
}
// setup the basic authentication property
@@ -635,7 +639,7 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
void checkName(Object value, String name) {
if (ObjectHelper.isEmpty(value)) {
- log.warn("The " + name + " of " + this.getEndpointUri() + " is empty, cxf will try to load the first one in wsdl for you.");
+ LOG.warn("The " + name + " of " + this.getEndpointUri() + " is empty, cxf will try to load the first one in wsdl for you.");
}
}
@@ -935,12 +939,12 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
if (bus == null) {
bus = CxfEndpointUtils.createBus(getCamelContext());
this.createBus = true;
- log.debug("Using DefaultBus {}", bus);
+ LOG.debug("Using DefaultBus {}", bus);
}
if (!getBusHasBeenCalled.getAndSet(true) && defaultBus) {
BusFactory.setDefaultBus(bus);
- log.debug("Set bus {} as thread default bus", bus);
+ LOG.debug("Set bus {} as thread default bus", bus);
}
return bus;
}
@@ -1006,7 +1010,7 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
this.properties);
} catch (Throwable e) {
// TODO: Why dont't we rethrown this exception
- log.warn("Error setting CamelContext. This exception will be ignored.", e);
+ LOG.warn("Error setting CamelContext. This exception will be ignored.", e);
}
}
}
@@ -1028,7 +1032,7 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
this.properties);
} catch (Throwable e) {
// TODO: Why dont't we rethrown this exception
- log.warn("Error setting properties. This exception will be ignored.", e);
+ LOG.warn("Error setting properties. This exception will be ignored.", e);
}
}
}
@@ -1061,7 +1065,7 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
protected void doStop() throws Exception {
// we should consider to shutdown the bus if the bus is created by cxfEndpoint
if (createBus && bus != null) {
- log.info("shutdown the bus ... {}", bus);
+ LOG.info("shutdown the bus ... {}", bus);
getBus().shutdown(false);
// clean up the bus to create a new one if the endpoint is started again
bus = null;
@@ -1241,7 +1245,7 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
}
} catch (XMLStreamException e) {
//ignore
- log.warn("Error finding the start element.", e);
+ LOG.warn("Error finding the start element.", e);
return null;
}
return r.getLocalName();
@@ -1436,7 +1440,7 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
try {
return new URI(uriString);
} catch (URISyntaxException e) {
- log.error("cannot determine request URI", e);
+ LOG.error("cannot determine request URI", e);
return null;
}
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
index 2c350a8..36e1f79 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
@@ -45,6 +45,8 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.BindingMessageInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* CxfProducer binds a Camel exchange to a CXF exchange, acts as a CXF
@@ -53,6 +55,8 @@ import org.apache.cxf.service.model.BindingOperationInfo;
*/
public class CxfProducer extends DefaultAsyncProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(CxfProducer.class);
+
private Client client;
private CxfEndpoint endpoint;
@@ -96,7 +100,7 @@ public class CxfProducer extends DefaultAsyncProducer {
// so we don't delegate the sync process call to the async process
@Override
public boolean process(Exchange camelExchange, AsyncCallback callback) {
- log.trace("Process exchange: {} in an async way.", camelExchange);
+ LOG.trace("Process exchange: {} in an async way.", camelExchange);
try {
// create CXF exchange
@@ -135,7 +139,7 @@ public class CxfProducer extends DefaultAsyncProducer {
*/
@Override
public void process(Exchange camelExchange) throws Exception {
- log.trace("Process exchange: {} in sync way.", camelExchange);
+ LOG.trace("Process exchange: {} in sync way.", camelExchange);
// create CXF exchange
ExchangeImpl cxfExchange = new ExchangeImpl();
@@ -167,7 +171,7 @@ public class CxfProducer extends DefaultAsyncProducer {
endpoint.getCookieHandler().storeCookies(camelExchange, endpoint.getRequestUri(camelExchange), cxfHeaders);
}
} catch (IOException e) {
- log.error("Cannot store cookies", e);
+ LOG.error("Cannot store cookies", e);
}
}
// bind the CXF response to Camel exchange
@@ -188,7 +192,7 @@ public class CxfProducer extends DefaultAsyncProducer {
// set data format mode in exchange
DataFormat dataFormat = endpoint.getDataFormat();
camelExchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, dataFormat);
- log.trace("Set Camel Exchange property: {}={}", DataFormat.class.getName(), dataFormat);
+ LOG.trace("Set Camel Exchange property: {}={}", DataFormat.class.getName(), dataFormat);
if (endpoint.isMergeProtocolHeaders()) {
camelExchange.setProperty(CxfConstants.CAMEL_CXF_PROTOCOL_HEADERS_MERGED, Boolean.TRUE);
@@ -200,7 +204,7 @@ public class CxfProducer extends DefaultAsyncProducer {
// don't let CXF ClientImpl close the input stream
if (dataFormat.dealias() == DataFormat.RAW) {
cxfExchange.put(Client.KEEP_CONDUIT_ALIVE, true);
- 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
@@ -223,7 +227,7 @@ public class CxfProducer extends DefaultAsyncProducer {
requestContext.put(Message.PROTOCOL_HEADERS, transportHeaders);
}
} catch (IOException e) {
- log.warn("Cannot load cookies", e);
+ LOG.warn("Cannot load cookies", e);
}
}
@@ -249,13 +253,13 @@ public class CxfProducer extends DefaultAsyncProducer {
// store the original boi in the exchange
camelExchange.setProperty(BindingOperationInfo.class.getName(), boi);
- 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();
- log.trace("Unwrapped BOI {}", boi);
+ LOG.trace("Unwrapped BOI {}", boi);
}
}
return boi;
@@ -352,10 +356,10 @@ public class CxfProducer extends DefaultAsyncProducer {
params[0] = exchange.getIn().getBody();
}
- if (log.isTraceEnabled()) {
+ 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]);
}
}
}
@@ -378,11 +382,11 @@ public class CxfProducer extends DefaultAsyncProducer {
BindingOperationInfo answer = null;
String lp = ex.getIn().getHeader(CxfConstants.OPERATION_NAME, String.class);
if (lp == null) {
- log.debug("CxfProducer cannot find the {} from message header, trying with defaultOperationName", CxfConstants.OPERATION_NAME);
+ LOG.debug("CxfProducer cannot find the {} from message header, trying with defaultOperationName", CxfConstants.OPERATION_NAME);
lp = endpoint.getDefaultOperationName();
}
if (lp == null) {
- log.debug("CxfProducer cannot find the {} from message header and there is no DefaultOperationName setting, CxfProducer will pick up the first available operation.",
+ LOG.debug("CxfProducer cannot find the {} from message header and there is no DefaultOperationName setting, CxfProducer will pick up the first available operation.",
CxfConstants.OPERATION_NAME);
Collection<BindingOperationInfo> bois =
client.getEndpoint().getEndpointInfo().getBinding().getOperations();
@@ -399,12 +403,12 @@ public class CxfProducer extends DefaultAsyncProducer {
}
if (ns == null) {
ns = client.getEndpoint().getService().getName().getNamespaceURI();
- 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);
- log.trace("Operation qname = {}", qname);
+ LOG.trace("Operation qname = {}", qname);
answer = client.getEndpoint().getEndpointInfo().getBinding().getOperation(qname);
if (answer == null) {
diff --git a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetTestEndpoint.java b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetTestEndpoint.java
index 5851f81..b05c152 100644
--- a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetTestEndpoint.java
+++ b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetTestEndpoint.java
@@ -32,6 +32,8 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.support.EndpointHelper;
import org.apache.camel.support.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The dataset-test component extends the mock component by on startup to pull messages from another endpoint to set the expected message bodies.
@@ -45,6 +47,8 @@ import org.apache.camel.support.ObjectHelper;
@UriEndpoint(firstVersion = "1.3.0", scheme = "dataset-test", title = "DataSet Test", syntax = "dataset-test:name", producerOnly = true, label = "core,testing", lenientProperties = true)
public class DataSetTestEndpoint extends MockEndpoint {
+ private static final Logger LOG = LoggerFactory.getLogger(DataSetTestEndpoint.class);
+
private Endpoint expectedMessageEndpoint;
@UriPath(description = "Name of endpoint to lookup in the registry to use for polling messages used for testing") @Metadata(required = true)
@@ -68,7 +72,7 @@ public class DataSetTestEndpoint extends MockEndpoint {
@Override
protected void doStart() throws Exception {
- log.debug("Consuming expected messages from: {}", expectedMessageEndpoint);
+ LOG.debug("Consuming expected messages from: {}", expectedMessageEndpoint);
final List<Object> expectedBodies = new ArrayList<>();
EndpointHelper.pollEndpoint(expectedMessageEndpoint, new Processor() {
@@ -83,7 +87,7 @@ public class DataSetTestEndpoint extends MockEndpoint {
Iterator<?> it = ObjectHelper.createIterator(body, delimiter, false, true);
while (it.hasNext()) {
Object line = it.next();
- log.trace("Received message body {}", line);
+ LOG.trace("Received message body {}", line);
expectedBodies.add(line);
}
} else {
@@ -92,7 +96,7 @@ public class DataSetTestEndpoint extends MockEndpoint {
}
}, timeout);
- log.info("Received: {} expected message(s) from: {}", expectedBodies.size(), expectedMessageEndpoint);
+ LOG.info("Received: {} expected message(s) from: {}", expectedBodies.size(), expectedMessageEndpoint);
if (anyOrder) {
expectedBodiesReceivedInAnyOrder(expectedBodies);
} else {
diff --git a/components/camel-direct/src/main/java/org/apache/camel/component/direct/DirectProducer.java b/components/camel-direct/src/main/java/org/apache/camel/component/direct/DirectProducer.java
index 68f6775..a9f4033 100644
--- a/components/camel-direct/src/main/java/org/apache/camel/component/direct/DirectProducer.java
+++ b/components/camel-direct/src/main/java/org/apache/camel/component/direct/DirectProducer.java
@@ -19,12 +19,16 @@ package org.apache.camel.component.direct;
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultAsyncProducer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The direct producer.
*/
public class DirectProducer extends DefaultAsyncProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(DirectProducer.class);
+
private final DirectEndpoint endpoint;
public DirectProducer(DirectEndpoint endpoint) {
@@ -39,7 +43,7 @@ public class DirectProducer extends DefaultAsyncProducer {
if (endpoint.isFailIfNoConsumers()) {
throw new DirectConsumerNotAvailableException("No consumers available on endpoint: " + endpoint, exchange);
} else {
- log.debug("message ignored, no consumers available on endpoint: {}", endpoint);
+ LOG.debug("message ignored, no consumers available on endpoint: {}", endpoint);
}
} else {
consumer.getProcessor().process(exchange);
@@ -54,7 +58,7 @@ public class DirectProducer extends DefaultAsyncProducer {
if (endpoint.isFailIfNoConsumers()) {
exchange.setException(new DirectConsumerNotAvailableException("No consumers available on endpoint: " + endpoint, exchange));
} else {
- log.debug("message ignored, no consumers available on endpoint: {}", endpoint);
+ LOG.debug("message ignored, no consumers available on endpoint: {}", endpoint);
}
callback.done(true);
return true;
diff --git a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmBlockingProducer.java b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmBlockingProducer.java
index fe05b41..ff1cf26 100644
--- a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmBlockingProducer.java
+++ b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmBlockingProducer.java
@@ -20,6 +20,8 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultAsyncProducer;
import org.apache.camel.util.StopWatch;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The direct producer.
@@ -37,6 +39,8 @@ import org.apache.camel.util.StopWatch;
*/
public class DirectVmBlockingProducer extends DefaultAsyncProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(DirectVmBlockingProducer.class);
+
private final DirectVmEndpoint endpoint;
public DirectVmBlockingProducer(DirectVmEndpoint endpoint) {
@@ -85,8 +89,8 @@ public class DirectVmBlockingProducer extends DefaultAsyncProducer {
while (!done) {
// sleep a bit to give chance for the consumer to be ready
Thread.sleep(500);
- if (log.isDebugEnabled()) {
- log.debug("Waited {} for consumer to be ready", watch.taken());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Waited {} for consumer to be ready", watch.taken());
}
answer = endpoint.getConsumer();
diff --git a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java
index 266d111..25654ae 100644
--- a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java
+++ b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java
@@ -22,12 +22,12 @@ import org.apache.camel.ExtendedExchange;
import org.apache.camel.Processor;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.processor.DelegateAsyncProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-/**
-*
-*/
public final class DirectVmProcessor extends DelegateAsyncProcessor {
+ private static final Logger LOG = LoggerFactory.getLogger(DirectVmProcessor.class);
private final DirectVmEndpoint endpoint;
public DirectVmProcessor(Processor processor, DirectVmEndpoint endpoint) {
@@ -46,7 +46,7 @@ public final class DirectVmProcessor extends DelegateAsyncProcessor {
// set TCCL to application context class loader if given
ClassLoader appClassLoader = endpoint.getCamelContext().getApplicationContextClassLoader();
if (appClassLoader != null) {
- log.trace("Setting Thread ContextClassLoader to {}", appClassLoader);
+ LOG.trace("Setting Thread ContextClassLoader to {}", appClassLoader);
Thread.currentThread().setContextClassLoader(appClassLoader);
changed = true;
}
@@ -58,7 +58,7 @@ public final class DirectVmProcessor extends DelegateAsyncProcessor {
try {
// restore TCCL if it was changed during processing
if (chgd) {
- log.trace("Restoring Thread ContextClassLoader to {}", current);
+ LOG.trace("Restoring Thread ContextClassLoader to {}", current);
Thread.currentThread().setContextClassLoader(current);
}
// make sure to copy results back
@@ -72,7 +72,7 @@ public final class DirectVmProcessor extends DelegateAsyncProcessor {
} finally {
// restore TCCL if it was changed during processing
if (changed) {
- log.trace("Restoring Thread ContextClassLoader to {}", current);
+ LOG.trace("Restoring Thread ContextClassLoader to {}", current);
Thread.currentThread().setContextClassLoader(current);
}
}
diff --git a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java
index 88fd51a..4ca9809 100644
--- a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java
+++ b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java
@@ -21,12 +21,16 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.support.DefaultAsyncProducer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The Direct-VM producer.
*/
public class DirectVmProducer extends DefaultAsyncProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(DirectVmProducer.class);
+
private DirectVmEndpoint endpoint;
public DirectVmProducer(DirectVmEndpoint endpoint) {
@@ -43,7 +47,7 @@ public class DirectVmProducer extends DefaultAsyncProducer {
if (endpoint.isFailIfNoConsumers()) {
exchange.setException(new DirectVmConsumerNotAvailableException("No consumers available on endpoint: " + endpoint, exchange));
} else {
- log.debug("message ignored, no consumers available on endpoint: {}", endpoint);
+ LOG.debug("message ignored, no consumers available on endpoint: {}", endpoint);
}
callback.done(true);
return true;
diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java
index 88ae473..4514dc9 100644
--- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java
+++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java
@@ -28,12 +28,16 @@ import org.apache.camel.WaitForTaskToComplete;
import org.apache.camel.support.DefaultAsyncProducer;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.SynchronizationAdapter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A Producer for the Disruptor component.
*/
public class DisruptorProducer extends DefaultAsyncProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(DisruptorProducer.class);
+
private final WaitForTaskToComplete waitForTaskToComplete;
private final long timeout;
@@ -87,13 +91,13 @@ public class DisruptorProducer extends DefaultAsyncProducer {
public void onDone(final Exchange response) {
// check for timeout, which then already would have invoked the latch
if (latch.getCount() == 0) {
- if (log.isTraceEnabled()) {
- log.trace("{}. Timeout occurred so response will be ignored: {}", this,
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("{}. Timeout occurred so response will be ignored: {}", this,
response.getMessage());
}
} else {
- if (log.isTraceEnabled()) {
- log.trace("{} with response: {}", this,
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("{} with response: {}", this,
response.getMessage());
}
try {
@@ -121,8 +125,8 @@ public class DisruptorProducer extends DefaultAsyncProducer {
doPublish(copy);
if (timeout > 0) {
- if (log.isTraceEnabled()) {
- log.trace("Waiting for task to complete using timeout (ms): {} at [{}]", timeout,
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Waiting for task to complete using timeout (ms): {} at [{}]", timeout,
endpoint.getEndpointUri());
}
// lets see if we can get the task done before the timeout
@@ -150,8 +154,8 @@ public class DisruptorProducer extends DefaultAsyncProducer {
latch.countDown();
}
} else {
- if (log.isTraceEnabled()) {
- log.trace("Waiting for task to complete (blocking) at [{}]", endpoint.getEndpointUri());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Waiting for task to complete (blocking) at [{}]", endpoint.getEndpointUri());
}
// no timeout then wait until its done
try {
@@ -174,7 +178,7 @@ public class DisruptorProducer extends DefaultAsyncProducer {
}
private void doPublish(Exchange exchange) {
- log.trace("Publishing Exchange to disruptor ringbuffer: {}", exchange);
+ LOG.trace("Publishing Exchange to disruptor ringbuffer: {}", exchange);
try {
if (blockWhenFull) {
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/consumer/DockerEventsConsumer.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/consumer/DockerEventsConsumer.java
index 9fed31a..ead73ae 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/consumer/DockerEventsConsumer.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/consumer/DockerEventsConsumer.java
@@ -29,9 +29,13 @@ import org.apache.camel.component.docker.DockerConstants;
import org.apache.camel.component.docker.DockerEndpoint;
import org.apache.camel.component.docker.DockerHelper;
import org.apache.camel.support.DefaultConsumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DockerEventsConsumer extends DefaultConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(DockerEventsConsumer.class);
+
private DockerEndpoint endpoint;
private DockerComponent component;
private EventsCmd eventsCmd;
@@ -80,18 +84,18 @@ public class DockerEventsConsumer extends DefaultConsumer {
@Override
public void onNext(Event event) {
- log.debug("Received Docker Event: {}", event);
+ LOG.debug("Received Docker Event: {}", event);
final Exchange exchange = getEndpoint().createExchange();
Message message = exchange.getIn();
message.setBody(event);
try {
- log.trace("Processing exchange [{}]...", exchange);
+ LOG.trace("Processing exchange [{}]...", exchange);
getAsyncProcessor().process(exchange, new AsyncCallback() {
@Override
public void done(boolean doneSync) {
- log.trace("Done processing exchange [{}]...", exchange);
+ LOG.trace("Done processing exchange [{}]...", exchange);
}
});
} catch (Exception e) {
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/AsyncDockerProducer.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/AsyncDockerProducer.java
index 2f0ede5..f7a0de5 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/AsyncDockerProducer.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/AsyncDockerProducer.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* The Docker producer.
*/
public class AsyncDockerProducer extends DefaultAsyncProducer {
- private static final Logger LOGGER = LoggerFactory.getLogger(AsyncDockerProducer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AsyncDockerProducer.class);
private DockerConfiguration configuration;
private DockerComponent component;
@@ -80,7 +80,7 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
DockerOperation operation = configuration.getOperation();
- Object result = null;
+ Object result;
switch (operation) {
@@ -90,7 +90,7 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
result = executeBuildImageRequest(client, message).exec(new BuildImageResultCallback() {
@Override
public void onNext(BuildResponseItem item) {
- log.trace("build image callback {}", item);
+ LOG.trace("build image callback {}", item);
super.onNext(item);
}
});
@@ -108,7 +108,7 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
result = executePullImageRequest(client, message).exec(new PullImageResultCallback() {
@Override
public void onNext(PullResponseItem item) {
- log.trace("pull image callback {}", item);
+ LOG.trace("pull image callback {}", item);
super.onNext(item);
}
});
@@ -124,7 +124,7 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
result = executePushImageRequest(client, message).exec(new PushImageResultCallback() {
@Override
public void onNext(PushResponseItem item) {
- log.trace("push image callback {}", item);
+ LOG.trace("push image callback {}", item);
super.onNext(item);
}
});
@@ -141,7 +141,7 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
result = executeAttachContainerRequest(client, message).exec(new AttachContainerResultCallback() {
@Override
public void onNext(Frame item) {
- log.trace("attach container callback {}", item);
+ LOG.trace("attach container callback {}", item);
super.onNext(item);
}
@@ -158,7 +158,7 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
result = executeLogContainerRequest(client, message).exec(new LogContainerResultCallback() {
@Override
public void onNext(Frame item) {
- log.trace("log container callback {}", item);
+ LOG.trace("log container callback {}", item);
super.onNext(item);
}
@@ -176,7 +176,7 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
result = executeWaitContainerRequest(client, message).exec(new WaitContainerResultCallback() {
@Override
public void onNext(WaitResponse item) {
- log.trace("wait contanier callback {}", item);
+ LOG.trace("wait contanier callback {}", item);
super.onNext(item);
}
@@ -195,7 +195,7 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
result = executeExecStartRequest(client, message).exec(new ExecStartResultCallback() {
@Override
public void onNext(Frame item) {
- log.trace("exec start callback {}", item);
+ LOG.trace("exec start callback {}", item);
super.onNext(item);
}
@@ -217,7 +217,7 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
exchange.getIn().setBody(result);
}
} catch (DockerException | InterruptedException | IOException e) {
- log.error(e.getMessage(), e);
+ LOG.error(e.getMessage(), e);
}
callback.done(false);
@@ -226,15 +226,10 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
/**
* Produces a build image request
- *
- * @param client
- * @param message
- * @return
- * @throws DockerException
*/
private BuildImageCmd executeBuildImageRequest(DockerClient client, Message message) throws DockerException {
- LOGGER.debug("Executing Docker Build Image Request");
+ LOG.debug("Executing Docker Build Image Request");
Object body = message.getBody();
@@ -278,14 +273,10 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
/**
* Produces a pull image request
- *
- * @param client
- * @param message
- * @return
*/
private PullImageCmd executePullImageRequest(DockerClient client, Message message) {
- LOGGER.debug("Executing Docker Pull Image Request");
+ LOG.debug("Executing Docker Pull Image Request");
String repository = DockerHelper.getProperty(DockerConstants.DOCKER_REPOSITORY, configuration, message, String.class);
@@ -315,14 +306,10 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
/**
* Produces a push image request
- *
- * @param client
- * @param message
- * @return
*/
private PushImageCmd executePushImageRequest(DockerClient client, Message message) {
- LOGGER.debug("Executing Docker Push Image Request");
+ LOG.debug("Executing Docker Push Image Request");
String name = DockerHelper.getProperty(DockerConstants.DOCKER_NAME, configuration, message, String.class);
@@ -348,14 +335,10 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
/**
* Produce a attach container request
- *
- * @param client
- * @param message
- * @return
*/
private AttachContainerCmd executeAttachContainerRequest(DockerClient client, Message message) {
- LOGGER.debug("Executing Docker Attach Container Request");
+ LOG.debug("Executing Docker Attach Container Request");
String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class);
@@ -399,14 +382,10 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
/**
* Produce a log container request
- *
- * @param client
- * @param message
- * @return
*/
private LogContainerCmd executeLogContainerRequest(DockerClient client, Message message) {
- LOGGER.debug("Executing Docker Log Container Request");
+ LOG.debug("Executing Docker Log Container Request");
String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class);
@@ -456,14 +435,10 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
/**
* Produce a wait container request
- *
- * @param client
- * @param message
- * @return
*/
private WaitContainerCmd executeWaitContainerRequest(DockerClient client, Message message) {
- LOGGER.debug("Executing Docker Wait Container Request");
+ LOG.debug("Executing Docker Wait Container Request");
String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class);
@@ -477,14 +452,10 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
/**
* Produces a exec start request
- *
- * @param client
- * @param message
- * @return
*/
private ExecStartCmd executeExecStartRequest(DockerClient client, Message message) {
- LOGGER.debug("Executing Docker Exec Start Request");
+ LOG.debug("Executing Docker Exec Start Request");
String execId = DockerHelper.getProperty(DockerConstants.DOCKER_EXEC_ID, configuration, message, String.class);
diff --git a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
index 14d60cb..99dcb5a 100644
--- a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
+++ b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
@@ -33,6 +33,8 @@ import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.support.ResourceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The dozer component provides the ability to map between Java beans using the Dozer mapping library.
@@ -40,6 +42,8 @@ import org.apache.camel.support.ResourceHelper;
@UriEndpoint(firstVersion = "2.15.0", scheme = "dozer", title = "Dozer", syntax = "dozer:name", producerOnly = true, label = "transformation")
public class DozerEndpoint extends DefaultEndpoint {
+ private static final Logger LOG = LoggerFactory.getLogger(DozerEndpoint.class);
+
// IDs for built-in custom converters used with the Dozer component
private static final String CUSTOM_MAPPING_ID = "_customMapping";
private static final String VARIABLE_MAPPING_ID = "_variableMapping";
@@ -109,7 +113,7 @@ public class DozerEndpoint extends DefaultEndpoint {
}
protected void initDozerBeanContainerAndMapper() throws Exception {
- log.info("Configuring {}...", Mapper.class.getName());
+ LOG.info("Configuring {}...", Mapper.class.getName());
// Validate endpoint parameters
if (configuration.getTargetModel() == null) {
diff --git a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerProducer.java b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerProducer.java
index f12291c..76d15c5 100644
--- a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerProducer.java
+++ b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerProducer.java
@@ -22,12 +22,16 @@ import org.apache.camel.spi.DataFormat;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.support.processor.MarshalProcessor;
import org.apache.camel.support.processor.UnmarshalProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Producer class for Dozer endpoints.
*/
public class DozerProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(DozerProducer.class);
+
private DozerEndpoint endpoint;
private UnmarshalProcessor unmarshaller;
private MarshalProcessor marshaller;
@@ -46,7 +50,7 @@ public class DozerProducer extends DefaultProducer {
// Unmarshal the source content only if an unmarshaller is configured.
String unmarshalId = endpoint.getConfiguration().getUnmarshalId();
if (unmarshalId != null) {
- log.debug("Unmarshalling input data using data format '{}'.", unmarshalId);
+ LOG.debug("Unmarshalling input data using data format '{}'.", unmarshalId);
resolveUnmarshaller(exchange, unmarshalId).process(exchange);
if (exchange.getException() != null) {
throw exchange.getException();
@@ -63,7 +67,7 @@ public class DozerProducer extends DefaultProducer {
// Convert to source model, if specified
String sourceType = endpoint.getConfiguration().getSourceModel();
if (sourceType != null) {
- log.debug("Converting to source model {}.", sourceType);
+ LOG.debug("Converting to source model {}.", sourceType);
Class<?> sourceModel = endpoint.getCamelContext()
.getClassResolver().resolveClass(sourceType);
if (sourceModel == null) {
@@ -73,7 +77,7 @@ public class DozerProducer extends DefaultProducer {
}
// Perform mappings
- log.debug("Mapping to target model {}.", targetModel.getName());
+ LOG.debug("Mapping to target model {}.", targetModel.getName());
Object targetObject = endpoint.getMapper().map(msg.getBody(), targetModel);
// Second pass to process literal mappings
endpoint.getMapper().map(endpoint.getVariableMapper(), targetObject);
@@ -91,7 +95,7 @@ public class DozerProducer extends DefaultProducer {
// Marshal the source content only if a marshaller is configured.
String marshalId = endpoint.getConfiguration().getMarshalId();
if (marshalId != null) {
- log.debug("Marshalling output data using data format '{}'.", marshalId);
+ LOG.debug("Marshalling output data using data format '{}'.", marshalId);
resolveMarshaller(exchange, marshalId).process(exchange);
if (exchange.getException() != null) {
throw exchange.getException();
diff --git a/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillProducer.java b/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillProducer.java
index b408f6d..a662894 100644
--- a/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillProducer.java
+++ b/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillProducer.java
@@ -24,12 +24,16 @@ import java.sql.Statement;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultProducer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A drill producer
*/
public class DrillProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(DrillProducer.class);
+
private DrillEndpoint endpoint;
private Connection connection;
@@ -83,9 +87,7 @@ public class DrillProducer extends DefaultProducer {
private void createJDBCConnection() throws ClassNotFoundException, SQLException {
Class.forName(DrillConstants.DRILL_DRIVER);
- // if(log.isDebugEnabled()) {
- log.info("connection url: {}", endpoint.toJDBCUri());
- // }
+ LOG.info("connection url: {}", endpoint.toJDBCUri());
this.connection = DriverManager.getConnection(endpoint.toJDBCUri());
}
diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxDelProducer.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxDelProducer.java
index 996e2ef..b340983 100644
--- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxDelProducer.java
+++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxDelProducer.java
@@ -42,7 +42,6 @@ public class DropboxDelProducer extends DropboxProducer {
exchange.getIn().setHeader(DropboxResultHeader.DELETED_PATH.name(), result.getEntry());
exchange.getIn().setBody(result.getEntry());
- log.debug("Deleted: {}", remotePath);
}
}
diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxMoveProducer.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxMoveProducer.java
index 5728f30..fcb890a 100644
--- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxMoveProducer.java
+++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxMoveProducer.java
@@ -43,8 +43,6 @@ public class DropboxMoveProducer extends DropboxProducer {
exchange.getIn().setHeader(DropboxResultHeader.MOVED_PATH.name(), result.getOldPath());
exchange.getIn().setBody(result.getNewPath());
-
- log.debug("Moved from {} to {}", remotePath, newRemotePath);
}
}
diff --git a/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/processor/aggregate/EhcacheAggregationRepository.java b/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/processor/aggregate/EhcacheAggregationRepository.java
index ad64afd..81e9a47 100644
--- a/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/processor/aggregate/EhcacheAggregationRepository.java
+++ b/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/processor/aggregate/EhcacheAggregationRepository.java
@@ -30,9 +30,13 @@ import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
import org.ehcache.Cache;
import org.ehcache.CacheManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class EhcacheAggregationRepository extends ServiceSupport implements RecoverableAggregationRepository {
+ private static final Logger LOG = LoggerFactory.getLogger(EhcacheAggregationRepository.class);
+
private CamelContext camelContext;
private CacheManager cacheManager;
private String cacheName;
@@ -143,7 +147,7 @@ public class EhcacheAggregationRepository extends ServiceSupport implements Reco
@Override
public Exchange add(final CamelContext camelContext, final String key, final Exchange exchange) {
- log.trace("Adding an Exchange with ID {} for key {} in a thread-safe manner.", exchange.getExchangeId(), key);
+ LOG.trace("Adding an Exchange with ID {} for key {} in a thread-safe manner.", exchange.getExchangeId(), key);
final DefaultExchangeHolder oldHolder = cache.get(key);
final DefaultExchangeHolder newHolder = DefaultExchangeHolder.marshal(exchange, true, allowSerializedHeaders);
@@ -160,13 +164,13 @@ public class EhcacheAggregationRepository extends ServiceSupport implements Reco
@Override
public void remove(CamelContext camelContext, String key, Exchange exchange) {
- log.trace("Removing an exchange with ID {} for key {}", exchange.getExchangeId(), key);
+ LOG.trace("Removing an exchange with ID {} for key {}", exchange.getExchangeId(), key);
cache.remove(key);
}
@Override
public void confirm(CamelContext camelContext, String exchangeId) {
- log.trace("Confirming an exchange with ID {}.", exchangeId);
+ LOG.trace("Confirming an exchange with ID {}.", exchangeId);
cache.remove(exchangeId);
}
@@ -180,15 +184,15 @@ public class EhcacheAggregationRepository extends ServiceSupport implements Reco
@Override
public Set<String> scan(CamelContext camelContext) {
- log.trace("Scanning for exchanges to recover in {} context", camelContext.getName());
+ LOG.trace("Scanning for exchanges to recover in {} context", camelContext.getName());
Set<String> scanned = Collections.unmodifiableSet(getKeys());
- log.trace("Found {} keys for exchanges to recover in {} context", scanned.size(), camelContext.getName());
+ LOG.trace("Found {} keys for exchanges to recover in {} context", scanned.size(), camelContext.getName());
return scanned;
}
@Override
public Exchange recover(CamelContext camelContext, String exchangeId) {
- log.trace("Recovering an Exchange with ID {}.", exchangeId);
+ LOG.trace("Recovering an Exchange with ID {}.", exchangeId);
return useRecovery ? unmarshallExchange(camelContext, cache.get(exchangeId)) : null;
}
diff --git a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
index 79dc42a..fd30e78 100644
--- a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
+++ b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
@@ -47,6 +47,9 @@ import org.elasticsearch.client.sniff.Sniffer;
import org.elasticsearch.client.sniff.SnifferBuilder;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.component.elasticsearch.ElasticsearchConstants.PARAM_SCROLL;
import static org.apache.camel.component.elasticsearch.ElasticsearchConstants.PARAM_SCROLL_KEEP_ALIVE_MS;
@@ -56,6 +59,8 @@ import static org.apache.camel.component.elasticsearch.ElasticsearchConstants.PA
*/
public class ElasticsearchProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(ElasticsearchProducer.class);
+
protected final ElasticsearchConfiguration configuration;
private RestClient client;
private Sniffer sniffer;
@@ -270,12 +275,12 @@ public class ElasticsearchProducer extends DefaultProducer {
private void startClient() throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException, UnknownHostException {
if (client == null) {
- log.info("Connecting to the ElasticSearch cluster: {}", configuration.getClusterName());
+ LOG.info("Connecting to the ElasticSearch cluster: {}", configuration.getClusterName());
if (configuration.getHostAddressesList() != null
&& !configuration.getHostAddressesList().isEmpty()) {
client = createClient();
} else {
- log.warn("Incorrect ip address and port parameters settings for ElasticSearch cluster");
+ LOG.warn("Incorrect ip address and port parameters settings for ElasticSearch cluster");
}
}
}
@@ -307,7 +312,7 @@ public class ElasticsearchProducer extends DefaultProducer {
@Override
protected void doStop() throws Exception {
if (client != null) {
- log.info("Disconnecting from ElasticSearch cluster: {}", configuration.getClusterName());
+ LOG.info("Disconnecting from ElasticSearch cluster: {}", configuration.getClusterName());
client.close();
if (sniffer != null) {
sniffer.close();
diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
index d04c809..8b24d4f 100644
--- a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
+++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
@@ -40,6 +40,8 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.support.ObjectHelper;
import org.apache.camel.support.ResourceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
import org.springframework.jdbc.core.namedparam.SqlParameterSource;
@@ -50,6 +52,8 @@ import org.springframework.jdbc.core.namedparam.SqlParameterSource;
label = "database,sql")
public class ElsqlEndpoint extends DefaultSqlEndpoint {
+ private static final Logger LOG = LoggerFactory.getLogger(ElsqlEndpoint.class);
+
private ElSql elSql;
private final NamedParameterJdbcTemplate namedJdbcTemplate;
@@ -82,7 +86,7 @@ public class ElsqlEndpoint extends DefaultSqlEndpoint {
final Exchange dummy = createExchange();
final SqlParameterSource param = new ElsqlSqlMapSource(dummy, null);
final String sql = elSql.getSql(elsqlName, new SpringSqlParams(param));
- log.debug("ElsqlConsumer @{} using sql: {}", elsqlName, sql);
+ LOG.debug("ElsqlConsumer @{} using sql: {}", elsqlName, sql);
final ElsqlConsumer consumer = new ElsqlConsumer(this, processor, namedJdbcTemplate, sql, param, preStategy, proStrategy);
consumer.setMaxMessagesPerPoll(getMaxMessagesPerPoll());
diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlProducer.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlProducer.java
index fdefbd7..bb37a50 100644
--- a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlProducer.java
+++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlProducer.java
@@ -35,6 +35,8 @@ import org.apache.camel.component.sql.SqlConstants;
import org.apache.camel.component.sql.SqlOutputType;
import org.apache.camel.component.sql.SqlPrepareStatementStrategy;
import org.apache.camel.support.DefaultProducer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.PreparedStatementCallback;
import org.springframework.jdbc.core.PreparedStatementCreator;
@@ -51,6 +53,8 @@ import static org.springframework.jdbc.support.JdbcUtils.closeStatement;
public class ElsqlProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(ElsqlProducer.class);
+
private final ElSql elSql;
private final String elSqlName;
private final NamedParameterJdbcTemplate jdbcTemplate;
@@ -80,7 +84,7 @@ public class ElsqlProducer extends DefaultProducer {
final SqlParameterSource param = new ElsqlSqlMapSource(exchange, data);
final String sql = elSql.getSql(elSqlName, new SpringSqlParams(param));
- log.debug("ElsqlProducer @{} using sql: {}", elSqlName, sql);
+ LOG.debug("ElsqlProducer @{} using sql: {}", elSqlName, sql);
// special for processing stream list (batch not supported)
final SqlOutputType outputType = getEndpoint().getOutputType();
@@ -89,7 +93,7 @@ public class ElsqlProducer extends DefaultProducer {
return;
}
- log.trace("jdbcTemplate.execute: {}", sql);
+ LOG.trace("jdbcTemplate.execute: {}", sql);
jdbcTemplate.execute(sql, param, new PreparedStatementCallback<Object>() {
@Override
public Object doInPreparedStatement(final PreparedStatement ps) throws SQLException, DataAccessException {
@@ -128,7 +132,7 @@ public class ElsqlProducer extends DefaultProducer {
exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders());
final SqlOutputType outputType = getEndpoint().getOutputType();
- log.trace("Got result list from query: {}, outputType={}", rs, outputType);
+ LOG.trace("Got result list from query: {}, outputType={}", rs, outputType);
if (outputType == SqlOutputType.SelectList) {
final List<?> data = getEndpoint().queryForList(rs, true);
// for noop=true we still want to enrich with the row count header
@@ -194,7 +198,7 @@ public class ElsqlProducer extends DefaultProducer {
}
protected void processStreamList(final Exchange exchange, final PreparedStatementCreator statementCreator, final String preparedQuery) throws Exception {
- log.trace("processStreamList: {}", preparedQuery);
+ LOG.trace("processStreamList: {}", preparedQuery);
// do not use the jdbcTemplate as it will auto-close connection/ps/rs when exiting the execute method
// and we need to keep the connection alive while routing and close it when the Exchange is done being routed
diff --git a/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java b/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java
index e21c490..50c34fc 100644
--- a/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java
+++ b/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminConsumer.java
@@ -26,9 +26,13 @@ import org.osgi.framework.ServiceRegistration;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class EventAdminConsumer extends DefaultConsumer implements EventHandler {
+ private static final Logger LOG = LoggerFactory.getLogger(EventAdminConsumer.class);
+
private final EventAdminEndpoint endpoint;
private ServiceRegistration<?> registration;
@@ -43,7 +47,7 @@ public class EventAdminConsumer extends DefaultConsumer implements EventHandler
// TODO: populate exchange headers
exchange.getIn().setBody(event);
- log.trace("EventAdmin {} is firing", endpoint.getTopic());
+ LOG.trace("EventAdmin {} is firing", endpoint.getTopic());
try {
getProcessor().process(exchange);
// log exception if an exception occurred and was not handled
diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
index 123483e..54b41ea 100644
--- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
+++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookConsumer.java
@@ -41,6 +41,9 @@ import org.apache.camel.component.facebook.data.FacebookMethodsTypeHelper.MatchT
import org.apache.camel.component.facebook.data.FacebookPropertiesHelper;
import org.apache.camel.component.facebook.data.ReadingBuilder;
import org.apache.camel.support.ScheduledPollConsumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.component.facebook.FacebookConstants.FACEBOOK_DATE_FORMAT;
import static org.apache.camel.component.facebook.FacebookConstants.READING_PREFIX;
@@ -55,6 +58,8 @@ import static org.apache.camel.component.facebook.data.FacebookMethodsTypeHelper
*/
public class FacebookConsumer extends ScheduledPollConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(FacebookConsumer.class);
+
private static final String SINCE_PREFIX = "since=";
private final FacebookEndpoint endpoint;
@@ -93,10 +98,10 @@ public class FacebookConsumer extends ScheduledPollConsumer {
} catch (UnsupportedEncodingException e) {
throw new RuntimeCamelException(String.format("Error decoding %s.since with value %s due to: %s", READING_PREFIX, strSince, e.getMessage()), e);
}
- log.debug("Using supplied property {}since value {}", READING_PREFIX, this.sinceTime);
+ LOG.debug("Using supplied property {}since value {}", READING_PREFIX, this.sinceTime);
}
if (queryString.contains("until=")) {
- log.debug("Overriding configured property {}until", READING_PREFIX);
+ LOG.debug("Overriding configured property {}until", READING_PREFIX);
}
}
this.endpointProperties = Collections.unmodifiableMap(properties);
@@ -132,7 +137,7 @@ public class FacebookConsumer extends ScheduledPollConsumer {
result = filteredMethods.get(0);
} else {
result = getHighestPriorityMethod(filteredMethods);
- log.warn("Using highest priority method {} from methods {}", method, filteredMethods);
+ LOG.warn("Using highest priority method {} from methods {}", method, filteredMethods);
}
return result;
}
diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
index 494d5d6..dbce597 100644
--- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
+++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/FacebookEndpoint.java
@@ -38,6 +38,9 @@ import org.apache.camel.spi.UriPath;
import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.component.facebook.data.FacebookMethodsTypeHelper.convertToGetMethod;
import static org.apache.camel.component.facebook.data.FacebookMethodsTypeHelper.convertToSearchMethod;
@@ -54,6 +57,8 @@ import static org.apache.camel.component.facebook.data.FacebookPropertiesHelper.
@UriEndpoint(firstVersion = "2.14.0", scheme = "facebook", title = "Facebook", syntax = "facebook:methodName", label = "social")
public class FacebookEndpoint extends DefaultEndpoint implements FacebookConstants {
+ private static final Logger LOG = LoggerFactory.getLogger(FacebookEndpoint.class);
+
private FacebookNameStyle nameStyle;
@UriPath(name = "methodName", description = "What operation to perform") @Metadata(required = true)
@@ -158,10 +163,10 @@ public class FacebookEndpoint extends DefaultEndpoint implements FacebookConstan
}
// log missing/extra properties for debugging
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
final Set<String> missing = getMissingProperties(method, nameStyle, arguments);
if (!missing.isEmpty()) {
- log.debug("Method {} could use one or more properties from {}", method, missing);
+ LOG.debug("Method {} could use one or more properties from {}", method, missing);
}
}
}
diff --git a/components/camel-file-watch/src/main/java/org/apache/camel/component/file/watch/FileWatchConsumer.java b/components/camel-file-watch/src/main/java/org/apache/camel/component/file/watch/FileWatchConsumer.java
index 908e876..5f9d0be 100644
--- a/components/camel-file-watch/src/main/java/org/apache/camel/component/file/watch/FileWatchConsumer.java
+++ b/components/camel-file-watch/src/main/java/org/apache/camel/component/file/watch/FileWatchConsumer.java
@@ -36,12 +36,16 @@ import org.apache.camel.component.file.watch.utils.PathUtils;
import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.util.AntPathMatcher;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The file-watch consumer.
*/
public class FileWatchConsumer extends DefaultConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(FileWatchConsumer.class);
+
private ExecutorService watchDirExecutorService;
private ExecutorService pollExecutorService;
private LinkedBlockingQueue<FileEvent> eventQueue;
@@ -79,7 +83,7 @@ public class FileWatchConsumer extends DefaultConsumer {
DirectoryWatcher.Builder watcherBuilder = DirectoryWatcher.builder()
.path(this.baseDirectory)
- .logger(log)
+ .logger(LOG)
.listener(new FileWatchDirectoryChangeListener());
if (!System.getProperty("os.name").toLowerCase().contains("mac")) {
@@ -172,7 +176,7 @@ public class FileWatchConsumer extends DefaultConsumer {
return false;
}
} catch (IOException e) {
- log.warn(String.format("Exception occurred during executing filter. Filtering file %s out.", fileEvent.getEventPath()), e);
+ LOG.warn(String.format("Exception occurred during executing filter. Filtering file %s out.", fileEvent.getEventPath()), e);
return false;
}
}
@@ -197,7 +201,7 @@ public class FileWatchConsumer extends DefaultConsumer {
@Override
public void onEvent(DirectoryChangeEvent directoryChangeEvent) {
if (directoryChangeEvent.eventType() == DirectoryChangeEvent.EventType.OVERFLOW) {
- log.warn("OVERFLOW occurred, some events may be lost. Consider increasing of option 'pollThreads'");
+ LOG.warn("OVERFLOW occurred, some events may be lost. Consider increasing of option 'pollThreads'");
return;
}
FileEvent fileEvent = new FileEvent(directoryChangeEvent);
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/FileConsumer.java b/components/camel-file/src/main/java/org/apache/camel/component/file/FileConsumer.java
index 220ba4f..4c382bc 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/FileConsumer.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/FileConsumer.java
@@ -33,12 +33,15 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* File consumer.
*/
public class FileConsumer extends GenericFileConsumer<File> {
+ private static final Logger LOG = LoggerFactory.getLogger(FileConsumer.class);
private String endpointPath;
private Set<String> extendedAttributes;
@@ -54,33 +57,33 @@ public class FileConsumer extends GenericFileConsumer<File> {
@Override
protected boolean pollDirectory(String fileName, List<GenericFile<File>> fileList, int depth) {
- log.trace("pollDirectory from fileName: {}", fileName);
+ LOG.trace("pollDirectory from fileName: {}", fileName);
depth++;
File directory = new File(fileName);
if (!directory.exists() || !directory.isDirectory()) {
- log.debug("Cannot poll as directory does not exists or its not a directory: {}", directory);
+ LOG.debug("Cannot poll as directory does not exists or its not a directory: {}", directory);
if (getEndpoint().isDirectoryMustExist()) {
throw new GenericFileOperationFailedException("Directory does not exist: " + directory);
}
return true;
}
- if (log.isTraceEnabled()) {
- log.trace("Polling directory: {}, absolute path: {}", directory.getPath(), directory.getAbsolutePath());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Polling directory: {}, absolute path: {}", directory.getPath(), directory.getAbsolutePath());
}
File[] dirFiles = directory.listFiles();
if (dirFiles == null || dirFiles.length == 0) {
// no files in this directory to poll
- if (log.isTraceEnabled()) {
- log.trace("No files found in directory: {}", directory.getPath());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("No files found in directory: {}", directory.getPath());
}
return true;
} else {
// we found some files
- if (log.isTraceEnabled()) {
- log.trace("Found {} in directory: {}", dirFiles.length, directory.getPath());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Found {} in directory: {}", dirFiles.length, directory.getPath());
}
}
List<File> files = Arrays.asList(dirFiles);
@@ -95,8 +98,8 @@ public class FileConsumer extends GenericFileConsumer<File> {
}
// trace log as Windows/Unix can have different views what the file is?
- if (log.isTraceEnabled()) {
- log.trace("Found file: {} [isAbsolute: {}, isDirectory: {}, isFile: {}, isHidden: {}]",
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Found file: {} [isAbsolute: {}, isDirectory: {}, isFile: {}, isHidden: {}]",
file, file.isAbsolute(), file.isDirectory(), file.isFile(), file.isHidden());
}
@@ -115,7 +118,7 @@ public class FileConsumer extends GenericFileConsumer<File> {
} else {
// Windows can report false to a file on a share so regard it always as a file (if its not a directory)
if (depth >= endpoint.minDepth && isValidFile(gf, false, files)) {
- log.trace("Adding valid file: {}", file);
+ LOG.trace("Adding valid file: {}", file);
// matched file so add
if (extendedAttributes != null) {
Path path = file.toPath();
@@ -142,8 +145,8 @@ public class FileConsumer extends GenericFileConsumer<File> {
allAttributes.put(attribute, Files.getAttribute(path, attribute));
}
} catch (IOException e) {
- if (log.isDebugEnabled()) {
- log.debug("Unable to read attribute {} on file {}", attribute, file, e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Unable to read attribute {} on file {}", attribute, file, e);
}
}
}
@@ -169,7 +172,7 @@ public class FileConsumer extends GenericFileConsumer<File> {
return true;
}
}
- log.trace("Done file: {} does not exist", doneFileName);
+ LOG.trace("Done file: {} does not exist", doneFileName);
return false;
}
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/FileEndpoint.java b/components/camel-file/src/main/java/org/apache/camel/component/file/FileEndpoint.java
index 95a0ef1..322a6d3 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/FileEndpoint.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/FileEndpoint.java
@@ -38,6 +38,8 @@ import org.apache.camel.spi.UriPath;
import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The file component is used for reading or writing files.
@@ -45,6 +47,8 @@ import org.apache.camel.util.ObjectHelper;
@UriEndpoint(firstVersion = "1.0.0", scheme = "file", title = "File", syntax = "file:directoryName", label = "core,file")
public class FileEndpoint extends GenericFileEndpoint<File> {
+ private static final Logger LOG = LoggerFactory.getLogger(FileEndpoint.class);
+
private static final Integer CHMOD_WRITE_MASK = 02;
private static final Integer CHMOD_READ_MASK = 04;
private static final Integer CHMOD_EXECUTE_MASK = 01;
@@ -89,11 +93,11 @@ public class FileEndpoint extends GenericFileEndpoint<File> {
// auto create starting directory if needed
if (!file.exists() && !file.isDirectory()) {
if (isAutoCreate()) {
- log.debug("Creating non existing starting directory: {}", file);
+ LOG.debug("Creating non existing starting directory: {}", file);
boolean absolute = FileUtil.isAbsolute(file);
boolean created = operations.buildDirectory(file.getPath(), absolute);
if (!created) {
- log.warn("Cannot auto create starting directory: {}", file);
+ LOG.warn("Cannot auto create starting directory: {}", file);
}
} else if (isStartingDirectoryMustExist()) {
throw new FileNotFoundException("Starting directory does not exist: " + file);
@@ -114,13 +118,13 @@ public class FileEndpoint extends GenericFileEndpoint<File> {
// if noop=true then idempotent should also be configured
if (isNoop() && !isIdempotentSet()) {
- log.info("Endpoint is configured with noop=true so forcing endpoint to be idempotent as well");
+ LOG.info("Endpoint is configured with noop=true so forcing endpoint to be idempotent as well");
setIdempotent(true);
}
// if idempotent and no repository set then create a default one
if (isIdempotentSet() && isIdempotent() && idempotentRepository == null) {
- log.info("Using default memory based idempotent repository with cache max size: {}", DEFAULT_IDEMPOTENT_CACHE_SIZE);
+ LOG.info("Using default memory based idempotent repository with cache max size: {}", DEFAULT_IDEMPOTENT_CACHE_SIZE);
idempotentRepository = MemoryIdempotentRepository.memoryIdempotentRepository(DEFAULT_IDEMPOTENT_CACHE_SIZE);
}
@@ -147,8 +151,8 @@ public class FileEndpoint extends GenericFileEndpoint<File> {
ObjectHelper.notNull(operations, "operations");
ObjectHelper.notNull(file, "file");
- if (log.isDebugEnabled()) {
- log.debug("Creating GenericFilePollingConsumer with queueSize: {} blockWhenFull: {} blockTimeout: {}",
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Creating GenericFilePollingConsumer with queueSize: {} blockWhenFull: {} blockTimeout: {}",
getPollingConsumerQueueSize(), isPollingConsumerBlockWhenFull(), getPollingConsumerBlockTimeout());
}
GenericFilePollingConsumer result = new GenericFilePollingConsumer(this);
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
index 56d52ff..2f2cd01 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
@@ -38,12 +38,16 @@ import org.apache.camel.util.CastUtils;
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.TimeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Base class for file consumers.
*/
public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(GenericFileConsumer.class);
+
protected GenericFileEndpoint<T> endpoint;
protected GenericFileOperations<T> operations;
protected GenericFileProcessStrategy<T> processStrategy;
@@ -113,7 +117,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
// before we poll is there anything we need to check?
// such as are we connected to the FTP Server still?
if (!prePollCheck()) {
- log.debug("Skipping poll as pre poll check returned false");
+ LOG.debug("Skipping poll as pre poll check returned false");
return 0;
}
@@ -129,19 +133,19 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
} catch (Exception e) {
// during poll directory we add files to the in progress repository, in case of any exception thrown after this work
// we must then drain the in progress files before rethrowing the exception
- log.debug("Error occurred during poll directory: {} due {}. Removing {} files marked as in-progress.", name, e.getMessage(), files.size());
+ LOG.debug("Error occurred during poll directory: {} due {}. Removing {} files marked as in-progress.", name, e.getMessage(), files.size());
removeExcessiveInProgressFiles(files);
throw e;
}
long delta = stop.taken();
- if (log.isDebugEnabled()) {
- log.debug("Took {} to poll: {}", TimeUtils.printDuration(delta), name);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Took {} to poll: {}", TimeUtils.printDuration(delta), name);
}
// log if we hit the limit
if (limitHit) {
- log.debug("Limiting maximum messages to poll at {} files as there were more messages in this poll.", maxMessagesPerPoll);
+ LOG.debug("Limiting maximum messages to poll at {} files as there were more messages in this poll.", maxMessagesPerPoll);
}
// sort files using file comparator if provided
@@ -172,7 +176,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
// we are not eager limiting, but we have configured a limit, so cut the list of files
if (!eagerLimitMaxMessagesPerPoll && maxMessagesPerPoll > 0) {
if (files.size() > maxMessagesPerPoll) {
- log.debug("Limiting maximum messages to poll at {} files as there were more messages in this poll.", maxMessagesPerPoll);
+ LOG.debug("Limiting maximum messages to poll at {} files as there were more messages in this poll.", maxMessagesPerPoll);
// must first remove excessive files from the in progress repository
removeExcessiveInProgressFiles(q, maxMessagesPerPoll);
}
@@ -181,7 +185,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
// consume files one by one
int total = exchanges.size();
if (total > 0) {
- log.debug("Total {} files to consume", total);
+ LOG.debug("Total {} files to consume", total);
}
int polledMessages = processBatch(CastUtils.cast(q));
@@ -198,7 +202,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
// limit if needed
if (maxMessagesPerPoll > 0 && total > maxMessagesPerPoll) {
- log.debug("Limiting to maximum messages to poll {} as there were {} messages in this poll.", maxMessagesPerPoll, total);
+ LOG.debug("Limiting to maximum messages to poll {} as there were {} messages in this poll.", maxMessagesPerPoll, total);
total = maxMessagesPerPoll;
}
@@ -350,7 +354,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
*/
protected boolean processExchange(final Exchange exchange) {
GenericFile<T> file = getExchangeFileProperty(exchange);
- log.trace("Processing file: {}", file);
+ LOG.trace("Processing file: {}", file);
// must extract the absolute name before the begin strategy as the file could potentially be pre moved
// and then the file name would be changed
@@ -368,7 +372,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
if (!begin) {
// no something was wrong, so we need to abort and remove the file from the in progress list
Exception abortCause = null;
- log.debug("{} cannot begin processing file: {}", endpoint, file);
+ LOG.debug("{} cannot begin processing file: {}", endpoint, file);
try {
// abort
processStrategy.abort(operations, endpoint, exchange, file);
@@ -403,7 +407,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
if (isRetrieveFile()) {
// retrieve the file using the stream
- log.trace("Retrieving file: {} from: {}", name, endpoint);
+ LOG.trace("Retrieving file: {} from: {}", name, endpoint);
// retrieve the file and check it was a success
boolean retrieved;
@@ -417,7 +421,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
if (!retrieved) {
if (ignoreCannotRetrieveFile(name, exchange, cause)) {
- log.trace("Cannot retrieve file {} maybe it does not exists. Ignoring.", name);
+ LOG.trace("Cannot retrieve file {} maybe it does not exists. Ignoring.", name);
// remove file from the in progress list as we could not retrieve it, but should ignore
endpoint.getInProgressRepository().remove(absoluteFileName);
return false;
@@ -433,9 +437,9 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
}
}
- log.trace("Retrieved file: {} from: {}", name, endpoint);
+ LOG.trace("Retrieved file: {} from: {}", name, endpoint);
} else {
- log.trace("Skipped retrieval of file: {} from: {}", name, endpoint);
+ LOG.trace("Skipped retrieval of file: {} from: {}", name, endpoint);
exchange.getIn().setBody(null);
}
@@ -443,7 +447,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
// (for instance to move the file after we have processed it)
exchange.adapt(ExtendedExchange.class).addOnCompletion(new GenericFileOnCompletion<>(endpoint, operations, processStrategy, target, absoluteFileName));
- log.debug("About to process file: {} using exchange: {}", target, exchange);
+ LOG.debug("About to process file: {} using exchange: {}", target, exchange);
if (endpoint.isSynchronous()) {
// process synchronously
@@ -495,7 +499,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
*/
protected boolean customProcessExchange(final Exchange exchange, final Processor processor) {
GenericFile<T> file = getExchangeFileProperty(exchange);
- log.trace("Custom processing file: {}", file);
+ LOG.trace("Custom processing file: {}", file);
// must extract the absolute name before the begin strategy as the file could potentially be pre moved
// and then the file name would be changed
@@ -505,8 +509,8 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
// process using the custom processor
processor.process(exchange);
} catch (Exception e) {
- if (log.isDebugEnabled()) {
- log.debug(endpoint + " error custom processing: " + file + " due to: " + e.getMessage() + ". This exception will be ignored.", e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(endpoint + " error custom processing: " + file + " due to: " + e.getMessage() + ". This exception will be ignored.", e);
}
handleException(e);
} finally {
@@ -531,7 +535,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
String absoluteFilePath = file.getAbsoluteFilePath();
if (!isMatched(file, isDirectory, files)) {
- log.trace("File did not match. Will skip this file: {}", file);
+ LOG.trace("File did not match. Will skip this file: {}", file);
return false;
}
@@ -542,8 +546,8 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
// check if file is already in progress
if (endpoint.getInProgressRepository().contains(absoluteFilePath)) {
- if (log.isTraceEnabled()) {
- log.trace("Skipping as file is already in progress: {}", file.getFileName());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Skipping as file is already in progress: {}", file.getFileName());
}
return false;
}
@@ -555,10 +559,10 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
if (endpoint.getIdempotentKey() != null) {
Exchange dummy = endpoint.createExchange(file);
key = endpoint.getIdempotentKey().evaluate(dummy, String.class);
- log.trace("Evaluated idempotentKey: {} for file: {}", key, file);
+ LOG.trace("Evaluated idempotentKey: {} for file: {}", key, file);
}
if (key != null && endpoint.getIdempotentRepository().contains(key)) {
- log.trace("This consumer is idempotent and the file has been consumed before matching idempotentKey: {}. Will skip this file: {}", key, file);
+ LOG.trace("This consumer is idempotent and the file has been consumed before matching idempotentKey: {}. Will skip this file: {}", key, file);
return false;
}
}
@@ -661,7 +665,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
// is it a done file name?
if (endpoint.isDoneFile(file.getFileNameOnly())) {
- log.trace("Skipping done file: {}", file);
+ LOG.trace("Skipping done file: {}", file);
return false;
}
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
index d47c718..bf26427 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
@@ -60,12 +60,12 @@ import org.slf4j.LoggerFactory;
*/
public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint implements BrowsableEndpoint {
+ private static final Logger LOG = LoggerFactory.getLogger(GenericFileEndpoint.class);
+
protected static final String DEFAULT_STRATEGYFACTORY_CLASS = "org.apache.camel.component.file.strategy.GenericFileProcessStrategyFactory";
protected static final int DEFAULT_IDEMPOTENT_CACHE_SIZE = 1000;
protected static final int DEFAULT_IN_PROGRESS_CACHE_SIZE = 50000;
- protected final Logger log = LoggerFactory.getLogger(getClass());
-
// common options
@UriParam(label = "advanced", defaultValue = "true")
@@ -261,7 +261,7 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
try {
ServiceHelper.stopService(consumer);
} catch (Exception e) {
- log.debug("Error stopping consumer used for browsing exchanges. This exception will be ignored", e);
+ LOG.debug("Error stopping consumer used for browsing exchanges. This exception will be ignored", e);
}
}
@@ -276,29 +276,29 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
Class<?> factory = null;
try {
FactoryFinder finder = getCamelContext().adapt(ExtendedCamelContext.class).getFactoryFinder("META-INF/services/org/apache/camel/component/");
- log.trace("Using FactoryFinder: {}", finder);
+ LOG.trace("Using FactoryFinder: {}", finder);
factory = finder.findClass(getScheme(), "strategy.factory.", CamelContext.class).orElse(null);
} catch (IOException e) {
- log.trace("No strategy factory defined in 'META-INF/services/org/apache/camel/component/'", e);
+ LOG.trace("No strategy factory defined in 'META-INF/services/org/apache/camel/component/'", e);
}
if (factory == null) {
// use default
try {
- log.trace("Using ClassResolver to resolve class: {}", DEFAULT_STRATEGYFACTORY_CLASS);
+ LOG.trace("Using ClassResolver to resolve class: {}", DEFAULT_STRATEGYFACTORY_CLASS);
factory = this.getCamelContext().getClassResolver().resolveClass(DEFAULT_STRATEGYFACTORY_CLASS);
} catch (Exception e) {
- log.trace("Cannot load class: {}", DEFAULT_STRATEGYFACTORY_CLASS, e);
+ LOG.trace("Cannot load class: {}", DEFAULT_STRATEGYFACTORY_CLASS, e);
}
// fallback and us this class loader
try {
- if (log.isTraceEnabled()) {
- log.trace("Using classloader: {} to resolve class: {}", this.getClass().getClassLoader(), DEFAULT_STRATEGYFACTORY_CLASS);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Using classloader: {} to resolve class: {}", this.getClass().getClassLoader(), DEFAULT_STRATEGYFACTORY_CLASS);
}
factory = this.getCamelContext().getClassResolver().resolveClass(DEFAULT_STRATEGYFACTORY_CLASS, this.getClass().getClassLoader());
} catch (Exception e) {
- if (log.isTraceEnabled()) {
- log.trace("Cannot load class: {} using classloader: " + this.getClass().getClassLoader(), DEFAULT_STRATEGYFACTORY_CLASS, e);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Cannot load class: {} using classloader: " + this.getClass().getClassLoader(), DEFAULT_STRATEGYFACTORY_CLASS, e);
}
}
@@ -310,7 +310,7 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
try {
Method factoryMethod = factory.getMethod("createGenericFileProcessStrategy", CamelContext.class, Map.class);
Map<String, Object> params = getParamsAsMap();
- log.debug("Parameters for Generic file process strategy {}", params);
+ LOG.debug("Parameters for Generic file process strategy {}", params);
return (GenericFileProcessStrategy<T>) ObjectHelper.invokeMethod(factoryMethod, null, getCamelContext(), params);
} catch (NoSuchMethodException e) {
throw new TypeNotPresentException(factory.getSimpleName() + ".createGenericFileProcessStrategy method not found", e);
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
index 44c527e..e74e744 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
*/
public class GenericFileOnCompletion<T> implements Synchronization {
- private final Logger log = LoggerFactory.getLogger(GenericFileOnCompletion.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GenericFileOnCompletion.class);
private GenericFileEndpoint<T> endpoint;
private GenericFileOperations<T> operations;
private GenericFileProcessStrategy<T> processStrategy;
@@ -72,7 +72,7 @@ public class GenericFileOnCompletion<T> implements Synchronization {
}
protected void onCompletion(Exchange exchange) {
- log.debug("Done processing file: {} using exchange: {}", file, exchange);
+ LOG.debug("Done processing file: {} using exchange: {}", file, exchange);
// commit or rollback
boolean committed = false;
@@ -123,7 +123,7 @@ public class GenericFileOnCompletion<T> implements Synchronization {
handleDoneFile(exchange);
try {
- log.trace("Commit file strategy: {} for file: {}", processStrategy, file);
+ LOG.trace("Commit file strategy: {} for file: {}", processStrategy, file);
processStrategy.commit(operations, endpoint, exchange, file);
} catch (Exception e) {
handleException("Error during commit", exchange, e);
@@ -140,8 +140,8 @@ public class GenericFileOnCompletion<T> implements Synchronization {
protected void processStrategyRollback(GenericFileProcessStrategy<T> processStrategy,
Exchange exchange, GenericFile<T> file) {
- if (log.isWarnEnabled()) {
- log.warn("Rollback file strategy: {} for file: {}", processStrategy, file);
+ if (LOG.isWarnEnabled()) {
+ LOG.warn("Rollback file strategy: {} for file: {}", processStrategy, file);
}
// only delete done file if moveFailed option is enabled, as otherwise on rollback,
@@ -170,9 +170,9 @@ public class GenericFileOnCompletion<T> implements Synchronization {
try {
// delete done file
boolean deleted = operations.deleteFile(doneFileName);
- log.trace("Done file: {} was deleted: {}", doneFileName, deleted);
+ LOG.trace("Done file: {} was deleted: {}", doneFileName, deleted);
if (!deleted) {
- log.warn("Done file: {} could not be deleted", doneFileName);
+ LOG.warn("Done file: {} could not be deleted", doneFileName);
}
} catch (Exception e) {
handleException("Error deleting done file: " + doneFileName, exchange, e);
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFilePollingConsumer.java b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFilePollingConsumer.java
index dffa628..084c35b 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFilePollingConsumer.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFilePollingConsumer.java
@@ -21,12 +21,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.PollingConsumerPollStrategy;
import org.apache.camel.support.EventDrivenPollingConsumer;
-import org.apache.camel.support.ScheduledBatchPollingConsumer;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.StopWatch;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GenericFilePollingConsumer extends EventDrivenPollingConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(GenericFilePollingConsumer.class);
private final long delay;
public GenericFilePollingConsumer(GenericFileEndpoint endpoint) throws Exception {
@@ -72,8 +74,8 @@ public class GenericFilePollingConsumer extends EventDrivenPollingConsumer {
@Override
public Exchange receiveNoWait() {
- if (log.isTraceEnabled()) {
- log.trace("receiveNoWait polling file: {}", getConsumer().getEndpoint());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("receiveNoWait polling file: {}", getConsumer().getEndpoint());
}
int polled = doReceive(0);
if (polled > 0) {
@@ -85,8 +87,8 @@ public class GenericFilePollingConsumer extends EventDrivenPollingConsumer {
@Override
public Exchange receive() {
- if (log.isTraceEnabled()) {
- log.trace("receive polling file: {}", getConsumer().getEndpoint());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("receive polling file: {}", getConsumer().getEndpoint());
}
int polled = doReceive(Long.MAX_VALUE);
if (polled > 0) {
@@ -98,8 +100,8 @@ public class GenericFilePollingConsumer extends EventDrivenPollingConsumer {
@Override
public Exchange receive(long timeout) {
- if (log.isTraceEnabled()) {
- log.trace("receive({}) polling file: {}", timeout, getConsumer().getEndpoint());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("receive({}) polling file: {}", timeout, getConsumer().getEndpoint());
}
int polled = doReceive(timeout);
if (polled > 0) {
@@ -126,9 +128,9 @@ public class GenericFilePollingConsumer extends EventDrivenPollingConsumer {
if (isRunAllowed()) {
if (retryCounter == -1) {
- log.trace("Starting to poll: {}", this.getEndpoint());
+ LOG.trace("Starting to poll: {}", this.getEndpoint());
} else {
- log.debug("Retrying attempt {} to poll: {}", retryCounter, this.getEndpoint());
+ LOG.debug("Retrying attempt {} to poll: {}", retryCounter, this.getEndpoint());
}
// mark we are polling which should also include the begin/poll/commit
@@ -136,7 +138,7 @@ public class GenericFilePollingConsumer extends EventDrivenPollingConsumer {
if (begin) {
retryCounter++;
polledMessages = getConsumer().poll();
- log.trace("Polled {} messages", polledMessages);
+ LOG.trace("Polled {} messages", polledMessages);
if (polledMessages == 0 && sendEmptyMessageWhenIdle) {
// send an "empty" exchange
@@ -148,11 +150,11 @@ public class GenericFilePollingConsumer extends EventDrivenPollingConsumer {
pollStrategy.commit(getConsumer(), getEndpoint(), polledMessages);
} else {
- log.debug("Cannot begin polling as pollStrategy returned false: {}", pollStrategy);
+ LOG.debug("Cannot begin polling as pollStrategy returned false: {}", pollStrategy);
}
}
- log.trace("Finished polling: {}", this.getEndpoint());
+ LOG.trace("Finished polling: {}", this.getEndpoint());
} catch (Exception e) {
try {
boolean retry = pollStrategy.rollback(getConsumer(), getEndpoint(), retryCounter, e);
@@ -201,7 +203,7 @@ public class GenericFilePollingConsumer extends EventDrivenPollingConsumer {
public void process(Exchange exchange) throws Exception {
Object name = exchange.getIn().getHeader(Exchange.FILE_NAME);
if (name != null) {
- log.debug("Received file: {}", name);
+ LOG.debug("Received file: {}", name);
}
super.process(exchange);
}
@@ -213,7 +215,7 @@ public class GenericFilePollingConsumer extends EventDrivenPollingConsumer {
*/
protected void processEmptyMessage() throws Exception {
Exchange exchange = getEndpoint().createExchange();
- log.debug("Sending empty message as there were no messages from polling: {}", this.getEndpoint());
+ LOG.debug("Sending empty message as there were no messages from polling: {}", this.getEndpoint());
process(exchange);
}
@@ -221,7 +223,7 @@ public class GenericFilePollingConsumer extends EventDrivenPollingConsumer {
if (delay <= 0) {
return;
}
- log.trace("Sleeping for: {} millis", delay);
+ LOG.trace("Sleeping for: {} millis", delay);
Thread.sleep(delay);
}
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileProducer.java b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
index 8e187db..97c3e60 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
@@ -38,7 +38,8 @@ import org.slf4j.LoggerFactory;
* Generic file producer
*/
public class GenericFileProducer<T> extends DefaultProducer {
- protected final Logger log = LoggerFactory.getLogger(getClass());
+ private static final Logger LOG = LoggerFactory.getLogger(GenericFileProducer.class);
+
protected final GenericFileEndpoint<T> endpoint;
protected GenericFileOperations<T> operations;
// assume writing to 100 different files concurrently at most for the same file producer
@@ -103,7 +104,7 @@ public class GenericFileProducer<T> extends DefaultProducer {
* @throws Exception is thrown if some error
*/
protected void processExchange(Exchange exchange, String target) throws Exception {
- log.trace("Processing file: {} for exchange: {}", target, exchange);
+ LOG.trace("Processing file: {} for exchange: {}", target, exchange);
try {
preWriteCheck(exchange);
@@ -117,7 +118,7 @@ public class GenericFileProducer<T> extends DefaultProducer {
// compute temporary name with the temp prefix
tempTarget = createTempFileName(exchange, target);
- log.trace("Writing using tempNameFile: {}", tempTarget);
+ LOG.trace("Writing using tempNameFile: {}", tempTarget);
//if we should eager delete target file before deploying temporary file
if (endpoint.getFileExist() != GenericFileExist.TryRename && endpoint.isEagerDeleteTargetFile()) {
@@ -129,11 +130,11 @@ public class GenericFileProducer<T> extends DefaultProducer {
targetExists = operations.existsFile(target);
if (targetExists) {
- log.trace("EagerDeleteTargetFile, target exists");
+ LOG.trace("EagerDeleteTargetFile, target exists");
if (endpoint.getFileExist() == GenericFileExist.Ignore) {
// ignore but indicate that the file was written
- log.trace("An existing file already exists: {}. Ignore and do not override it.", target);
+ LOG.trace("An existing file already exists: {}. Ignore and do not override it.", target);
return;
} else if (endpoint.getFileExist() == GenericFileExist.Fail) {
throw new GenericFileOperationFailedException("File already exist: " + target + ". Cannot write new file.");
@@ -143,7 +144,7 @@ public class GenericFileProducer<T> extends DefaultProducer {
} else if (endpoint.isEagerDeleteTargetFile() && endpoint.getFileExist() == GenericFileExist.Override) {
// we override the target so we do this by deleting it so the temp file can be renamed later
// with success as the existing target file have been deleted
- log.trace("Eagerly deleting existing file: {}", target);
+ LOG.trace("Eagerly deleting existing file: {}", target);
if (!operations.deleteFile(target)) {
throw new GenericFileOperationFailedException("Cannot delete file: " + target);
}
@@ -153,7 +154,7 @@ public class GenericFileProducer<T> extends DefaultProducer {
// delete any pre existing temp file
if (endpoint.getFileExist() != GenericFileExist.TryRename && operations.existsFile(tempTarget)) {
- log.trace("Deleting existing temp file: {}", tempTarget);
+ LOG.trace("Deleting existing temp file: {}", tempTarget);
if (!operations.deleteFile(tempTarget)) {
throw new GenericFileOperationFailedException("Cannot delete file: " + tempTarget);
}
@@ -173,18 +174,18 @@ public class GenericFileProducer<T> extends DefaultProducer {
targetExists = operations.existsFile(target);
if (targetExists) {
- log.trace("Not using EagerDeleteTargetFile, target exists");
+ LOG.trace("Not using EagerDeleteTargetFile, target exists");
if (endpoint.getFileExist() == GenericFileExist.Ignore) {
// ignore but indicate that the file was written
- log.trace("An existing file already exists: {}. Ignore and do not override it.", target);
+ LOG.trace("An existing file already exists: {}. Ignore and do not override it.", target);
return;
} else if (endpoint.getFileExist() == GenericFileExist.Fail) {
throw new GenericFileOperationFailedException("File already exist: " + target + ". Cannot write new file.");
} else if (endpoint.getFileExist() == GenericFileExist.Override) {
// we override the target so we do this by deleting it so the temp file can be renamed later
// with success as the existing target file have been deleted
- log.trace("Deleting existing file: {}", target);
+ LOG.trace("Deleting existing file: {}", target);
if (!operations.deleteFile(target)) {
throw new GenericFileOperationFailedException("Cannot delete file: " + target);
}
@@ -193,7 +194,7 @@ public class GenericFileProducer<T> extends DefaultProducer {
}
// now we are ready to rename the temp file to the target file
- log.trace("Renaming file: [{}] to: [{}]", tempTarget, target);
+ LOG.trace("Renaming file: [{}] to: [{}]", tempTarget, target);
boolean renamed = operations.renameFile(tempTarget, target);
if (!renamed) {
throw new GenericFileOperationFailedException("Cannot rename file from: " + tempTarget + " to: " + target);
@@ -209,7 +210,7 @@ public class GenericFileProducer<T> extends DefaultProducer {
Exchange empty = new DefaultExchange(exchange);
empty.getIn().setBody("");
- log.trace("Writing done file: [{}]", doneFileName);
+ LOG.trace("Writing done file: [{}]", doneFileName);
// delete any existing done file
if (operations.existsFile(doneFileName)) {
if (!operations.deleteFile(doneFileName)) {
@@ -287,21 +288,21 @@ public class GenericFileProducer<T> extends DefaultProducer {
boolean absolute = FileUtil.isAbsolute(file);
if (directory != null) {
if (!operations.buildDirectory(directory, absolute)) {
- log.debug("Cannot build directory [{}] (could be because of denied permissions)", directory);
+ LOG.debug("Cannot build directory [{}] (could be because of denied permissions)", directory);
}
}
}
// upload
- if (log.isTraceEnabled()) {
- log.trace("About to write [{}] to [{}] from exchange [{}]", fileName, getEndpoint(), exchange);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("About to write [{}] to [{}] from exchange [{}]", fileName, getEndpoint(), exchange);
}
boolean success = operations.storeFile(fileName, exchange, -1);
if (!success) {
throw new GenericFileOperationFailedException("Error writing file [" + fileName + "]");
}
- log.debug("Wrote [{}] to [{}]", fileName, getEndpoint());
+ LOG.debug("Wrote [{}] to [{}]", fileName, getEndpoint());
}
public String createFileName(Exchange exchange) {
@@ -327,7 +328,7 @@ public class GenericFileProducer<T> extends DefaultProducer {
}
if (value instanceof String && StringHelper.hasStartToken((String) value, "simple")) {
- log.warn("Simple expression: {} detected in header: {} of type String. This feature has been removed (see CAMEL-6748).", value, Exchange.FILE_NAME);
+ LOG.warn("Simple expression: {} detected in header: {} of type String. This feature has been removed (see CAMEL-6748).", value, Exchange.FILE_NAME);
}
// expression support
@@ -339,7 +340,7 @@ public class GenericFileProducer<T> extends DefaultProducer {
// evaluate the name as a String from the value
String name;
if (expression != null) {
- log.trace("Filename evaluated as expression: {}", expression);
+ LOG.trace("Filename evaluated as expression: {}", expression);
name = expression.evaluate(exchange, String.class);
} else {
name = exchange.getContext().getTypeConverter().convertTo(String.class, exchange, value);
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentChangedRepositoryReadLockStrategy.java b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentChangedRepositoryReadLockStrategy.java
index 9f00e0f..9c83f8f 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentChangedRepositoryReadLockStrategy.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentChangedRepositoryReadLockStrategy.java
@@ -32,6 +32,8 @@ import org.apache.camel.spi.CamelLogger;
import org.apache.camel.spi.IdempotentRepository;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A file read lock that uses an {@link IdempotentRepository} and {@link FileChangedExclusiveReadLockStrategy changed} as the lock strategy.
@@ -40,6 +42,8 @@ import org.apache.camel.util.ObjectHelper;
*/
public class FileIdempotentChangedRepositoryReadLockStrategy extends ServiceSupport implements GenericFileExclusiveReadLockStrategy<File>, CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(FileIdempotentChangedRepositoryReadLockStrategy.class);
+
private final FileChangedExclusiveReadLockStrategy changed;
private GenericFileEndpoint<File> endpoint;
private LoggingLevel readLockLoggingLevel = LoggingLevel.DEBUG;
@@ -63,7 +67,7 @@ public class FileIdempotentChangedRepositoryReadLockStrategy extends ServiceSupp
@Override
public void prepareOnStartup(GenericFileOperations<File> operations, GenericFileEndpoint<File> endpoint) throws Exception {
this.endpoint = endpoint;
- log.info("Using FileIdempotentRepositoryReadLockStrategy: {} on endpoint: {}", idempotentRepository, endpoint);
+ LOG.info("Using FileIdempotentRepositoryReadLockStrategy: {} on endpoint: {}", idempotentRepository, endpoint);
changed.prepareOnStartup(operations, endpoint);
}
@@ -81,7 +85,7 @@ public class FileIdempotentChangedRepositoryReadLockStrategy extends ServiceSupp
boolean answer = idempotentRepository.add(key);
if (!answer) {
// another node is processing the file so skip
- CamelLogger.log(log, readLockLoggingLevel, "Cannot acquire read lock. Will skip the file: " + file);
+ CamelLogger.log(LOG, readLockLoggingLevel, "Cannot acquire read lock. Will skip the file: " + file);
}
if (answer) {
@@ -114,15 +118,15 @@ public class FileIdempotentChangedRepositoryReadLockStrategy extends ServiceSupp
try {
changed.releaseExclusiveReadLockOnRollback(operations, file, exchange);
} catch (Exception e) {
- log.warn("Error during releasing exclusive readlock on rollback. This exception is ignored.", e);
+ LOG.warn("Error during releasing exclusive readlock on rollback. This exception is ignored.", e);
}
};
if (readLockIdempotentReleaseDelay > 0 && readLockIdempotentReleaseExecutorService != null) {
- log.debug("Scheduling readlock release task to run asynchronous delayed after {} millis", readLockIdempotentReleaseDelay);
+ LOG.debug("Scheduling readlock release task to run asynchronous delayed after {} millis", readLockIdempotentReleaseDelay);
readLockIdempotentReleaseExecutorService.schedule(r, readLockIdempotentReleaseDelay, TimeUnit.MILLISECONDS);
} else if (readLockIdempotentReleaseDelay > 0) {
- log.debug("Delaying readlock release task {} millis", readLockIdempotentReleaseDelay);
+ LOG.debug("Delaying readlock release task {} millis", readLockIdempotentReleaseDelay);
Thread.sleep(readLockIdempotentReleaseDelay);
r.run();
} else {
@@ -144,15 +148,15 @@ public class FileIdempotentChangedRepositoryReadLockStrategy extends ServiceSupp
try {
changed.releaseExclusiveReadLockOnCommit(operations, file, exchange);
} catch (Exception e) {
- log.warn("Error during releasing exclusive readlock on rollback. This exception is ignored.", e);
+ LOG.warn("Error during releasing exclusive readlock on rollback. This exception is ignored.", e);
}
};
if (readLockIdempotentReleaseDelay > 0 && readLockIdempotentReleaseExecutorService != null) {
- log.debug("Scheduling readlock release task to run asynchronous delayed after {} millis", readLockIdempotentReleaseDelay);
+ LOG.debug("Scheduling readlock release task to run asynchronous delayed after {} millis", readLockIdempotentReleaseDelay);
readLockIdempotentReleaseExecutorService.schedule(r, readLockIdempotentReleaseDelay, TimeUnit.MILLISECONDS);
} else if (readLockIdempotentReleaseDelay > 0) {
- log.debug("Delaying readlock release task {} millis", readLockIdempotentReleaseDelay);
+ LOG.debug("Delaying readlock release task {} millis", readLockIdempotentReleaseDelay);
Thread.sleep(readLockIdempotentReleaseDelay);
r.run();
} else {
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRenameRepositoryReadLockStrategy.java b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRenameRepositoryReadLockStrategy.java
index 6c644f8..b414e79 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRenameRepositoryReadLockStrategy.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRenameRepositoryReadLockStrategy.java
@@ -30,6 +30,8 @@ import org.apache.camel.spi.CamelLogger;
import org.apache.camel.spi.IdempotentRepository;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A file read lock that uses an {@link IdempotentRepository} and {@link FileRenameExclusiveReadLockStrategy rename} as the lock strategy.
@@ -38,6 +40,7 @@ import org.apache.camel.util.ObjectHelper;
*/
public class FileIdempotentRenameRepositoryReadLockStrategy extends ServiceSupport implements GenericFileExclusiveReadLockStrategy<File>, CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(FileIdempotentRenameRepositoryReadLockStrategy.class);
private final FileRenameExclusiveReadLockStrategy rename;
private GenericFileEndpoint<File> endpoint;
private LoggingLevel readLockLoggingLevel = LoggingLevel.DEBUG;
@@ -56,7 +59,7 @@ public class FileIdempotentRenameRepositoryReadLockStrategy extends ServiceSuppo
@Override
public void prepareOnStartup(GenericFileOperations<File> operations, GenericFileEndpoint<File> endpoint) throws Exception {
this.endpoint = endpoint;
- log.info("Using FileIdempotentRepositoryReadLockStrategy: {} on endpoint: {}", idempotentRepository, endpoint);
+ LOG.info("Using FileIdempotentRepositoryReadLockStrategy: {} on endpoint: {}", idempotentRepository, endpoint);
rename.prepareOnStartup(operations, endpoint);
}
@@ -74,7 +77,7 @@ public class FileIdempotentRenameRepositoryReadLockStrategy extends ServiceSuppo
boolean answer = idempotentRepository.add(key);
if (!answer) {
// another node is processing the file so skip
- CamelLogger.log(log, readLockLoggingLevel, "Cannot acquire read lock. Will skip the file: " + file);
+ CamelLogger.log(LOG, readLockLoggingLevel, "Cannot acquire read lock. Will skip the file: " + file);
}
if (answer) {
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRepositoryReadLockStrategy.java b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRepositoryReadLockStrategy.java
index 49e125b..8fbe17a 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRepositoryReadLockStrategy.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRepositoryReadLockStrategy.java
@@ -32,6 +32,8 @@ import org.apache.camel.spi.CamelLogger;
import org.apache.camel.spi.IdempotentRepository;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A file read lock that uses an {@link org.apache.camel.spi.IdempotentRepository} as the lock strategy. This allows to plugin and use existing
@@ -40,6 +42,7 @@ import org.apache.camel.util.ObjectHelper;
*/
public class FileIdempotentRepositoryReadLockStrategy extends ServiceSupport implements GenericFileExclusiveReadLockStrategy<File>, CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(FileIdempotentRepositoryReadLockStrategy.class);
private GenericFileEndpoint<File> endpoint;
private LoggingLevel readLockLoggingLevel = LoggingLevel.DEBUG;
private CamelContext camelContext;
@@ -55,7 +58,7 @@ public class FileIdempotentRepositoryReadLockStrategy extends ServiceSupport imp
@Override
public void prepareOnStartup(GenericFileOperations<File> operations, GenericFileEndpoint<File> endpoint) throws Exception {
this.endpoint = endpoint;
- log.info("Using FileIdempotentRepositoryReadLockStrategy: {} on endpoint: {}", idempotentRepository, endpoint);
+ LOG.info("Using FileIdempotentRepositoryReadLockStrategy: {} on endpoint: {}", idempotentRepository, endpoint);
}
@Override
@@ -71,7 +74,7 @@ public class FileIdempotentRepositoryReadLockStrategy extends ServiceSupport imp
boolean answer = idempotentRepository.add(key);
if (!answer) {
// another node is processing the file so skip
- CamelLogger.log(log, readLockLoggingLevel, "Cannot acquire read lock. Will skip the file: " + file);
+ CamelLogger.log(LOG, readLockLoggingLevel, "Cannot acquire read lock. Will skip the file: " + file);
}
return answer;
}
@@ -94,10 +97,10 @@ public class FileIdempotentRepositoryReadLockStrategy extends ServiceSupport imp
};
if (readLockIdempotentReleaseDelay > 0 && readLockIdempotentReleaseExecutorService != null) {
- log.debug("Scheduling readlock release task to run asynchronous delayed after {} millis", readLockIdempotentReleaseDelay);
+ LOG.debug("Scheduling readlock release task to run asynchronous delayed after {} millis", readLockIdempotentReleaseDelay);
readLockIdempotentReleaseExecutorService.schedule(r, readLockIdempotentReleaseDelay, TimeUnit.MILLISECONDS);
} else if (readLockIdempotentReleaseDelay > 0) {
- log.debug("Delaying readlock release task {} millis", readLockIdempotentReleaseDelay);
+ LOG.debug("Delaying readlock release task {} millis", readLockIdempotentReleaseDelay);
Thread.sleep(readLockIdempotentReleaseDelay);
r.run();
} else {
@@ -118,10 +121,10 @@ public class FileIdempotentRepositoryReadLockStrategy extends ServiceSupport imp
};
if (readLockIdempotentReleaseDelay > 0 && readLockIdempotentReleaseExecutorService != null) {
- log.debug("Scheduling readlock release task to run asynchronous delayed after {} millis", readLockIdempotentReleaseDelay);
+ LOG.debug("Scheduling readlock release task to run asynchronous delayed after {} millis", readLockIdempotentReleaseDelay);
readLockIdempotentReleaseExecutorService.schedule(r, readLockIdempotentReleaseDelay, TimeUnit.MILLISECONDS);
} else if (readLockIdempotentReleaseDelay > 0) {
- log.debug("Delaying readlock release task {} millis", readLockIdempotentReleaseDelay);
+ LOG.debug("Delaying readlock release task {} millis", readLockIdempotentReleaseDelay);
Thread.sleep(readLockIdempotentReleaseDelay);
r.run();
} else {
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/GenericFileDeleteProcessStrategy.java b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/GenericFileDeleteProcessStrategy.java
index 14bdf30..ebdcab6 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/GenericFileDeleteProcessStrategy.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/GenericFileDeleteProcessStrategy.java
@@ -22,9 +22,13 @@ import org.apache.camel.component.file.GenericFileEndpoint;
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.camel.component.file.GenericFileOperations;
import org.apache.camel.support.ExchangeHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GenericFileDeleteProcessStrategy<T> extends GenericFileProcessStrategySupport<T> {
+ private static final Logger LOG = LoggerFactory.getLogger(GenericFileDeleteProcessStrategy.class);
+
private GenericFileRenamer<T> failureRenamer;
private GenericFileRenamer<T> beginRenamer;
@@ -81,7 +85,7 @@ public class GenericFileDeleteProcessStrategy<T> extends GenericFileProcessStrat
if (!exits) {
deleted = true;
} else {
- log.trace("File was not deleted at this attempt will try again in 1 sec.: {}", file);
+ LOG.trace("File was not deleted at this attempt will try again in 1 sec.: {}", file);
// sleep a bit and try again
Thread.sleep(1000);
}
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategySupport.java b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategySupport.java
index dad767f..36966dc 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategySupport.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategySupport.java
@@ -31,11 +31,16 @@ import org.apache.camel.component.file.GenericFileProcessStrategy;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Base class for implementations of {@link GenericFileProcessStrategy}.
*/
public abstract class GenericFileProcessStrategySupport<T> extends ServiceSupport implements GenericFileProcessStrategy<T>, CamelContextAware {
+
+ private static final Logger LOG = LoggerFactory.getLogger(GenericFileProcessStrategySupport.class);
+
protected GenericFileExclusiveReadLockStrategy<T> exclusiveReadLockStrategy;
protected CamelContext camelContext;
@@ -126,7 +131,7 @@ public abstract class GenericFileProcessStrategySupport<T> extends ServiceSuppor
throw new GenericFileOperationFailedException("Cannot create directory: " + to.getParent() + " (could be because of denied permissions)");
}
- log.debug("Renaming file: {} to: {}", from, to);
+ LOG.debug("Renaming file: {} to: {}", from, to);
boolean renamed = operations.renameFile(from.getAbsoluteFilePath(), to.getAbsoluteFilePath());
if (!renamed) {
throw new GenericFileOperationFailedException("Cannot rename file: " + from + " to: " + to);
@@ -140,7 +145,7 @@ public abstract class GenericFileProcessStrategySupport<T> extends ServiceSuppor
File local = exchange.getIn().getHeader(Exchange.FILE_LOCAL_WORK_PATH, File.class);
if (local != null && local.exists()) {
boolean deleted = FileUtil.deleteFile(local);
- log.trace("Local work file: {} was deleted: {}", local, deleted);
+ LOG.trace("Local work file: {} was deleted: {}", local, deleted);
}
}
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
index a181195..1c6ff32 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
@@ -37,6 +37,8 @@ import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.URISupport;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* FTP consumer
@@ -44,6 +46,8 @@ import org.apache.commons.net.ftp.FTPFile;
@ManagedResource(description = "Managed FtpConsumer")
public class FtpConsumer extends RemoteFileConsumer<FTPFile> {
+ private static final Logger LOG = LoggerFactory.getLogger(FtpConsumer.class);
+
protected String endpointPath;
private transient String ftpConsumerToString;
@@ -66,13 +70,13 @@ public class FtpConsumer extends RemoteFileConsumer<FTPFile> {
try {
super.doStart();
if (endpoint.isAutoCreate()) {
- log.debug("Auto creating directory: {}", endpoint.getConfiguration().getDirectory());
+ LOG.debug("Auto creating directory: {}", endpoint.getConfiguration().getDirectory());
try {
connectIfNecessary();
operations.buildDirectory(endpoint.getConfiguration().getDirectory(), true);
} catch (GenericFileOperationFailedException e) {
// log a WARN as we want to start the consumer.
- log.warn("Error auto creating directory: " + endpoint.getConfiguration().getDirectory()
+ LOG.warn("Error auto creating directory: " + endpoint.getConfiguration().getDirectory()
+ " due " + e.getMessage() + ". This exception is ignored.", e);
}
}
@@ -114,7 +118,7 @@ public class FtpConsumer extends RemoteFileConsumer<FTPFile> {
@Override
protected boolean doPollDirectory(String absolutePath, String dirName, List<GenericFile<FTPFile>> fileList, int depth) {
- log.trace("doPollDirectory from absolutePath: {}, dirName: {}", absolutePath, dirName);
+ LOG.trace("doPollDirectory from absolutePath: {}, dirName: {}", absolutePath, dirName);
depth++;
@@ -132,7 +136,7 @@ public class FtpConsumer extends RemoteFileConsumer<FTPFile> {
dir = absolutePath;
}
- log.trace("Polling directory: {}", dir);
+ LOG.trace("Polling directory: {}", dir);
if (isUseList()) {
if (isStepwise()) {
files = operations.listFiles();
@@ -153,7 +157,7 @@ public class FtpConsumer extends RemoteFileConsumer<FTPFile> {
}
} catch (GenericFileOperationFailedException e) {
if (ignoreCannotRetrieveFile(null, null, e)) {
- log.debug("Cannot list files in directory {} due directory does not exists or file permission error.", dir);
+ LOG.debug("Cannot list files in directory {} due directory does not exists or file permission error.", dir);
} else {
throw e;
}
@@ -161,11 +165,11 @@ public class FtpConsumer extends RemoteFileConsumer<FTPFile> {
if (files == null || files.isEmpty()) {
// no files in this directory to poll
- log.trace("No files found in directory: {}", dir);
+ LOG.trace("No files found in directory: {}", dir);
return true;
} else {
// we found some files
- log.trace("Found {} in directory: {}", files.size(), dir);
+ LOG.trace("Found {} in directory: {}", files.size(), dir);
}
if (getEndpoint().isPreSort()) {
@@ -174,8 +178,8 @@ public class FtpConsumer extends RemoteFileConsumer<FTPFile> {
for (FTPFile file : files) {
- if (log.isTraceEnabled()) {
- log.trace("FtpFile[name={}, dir={}, file={}]", file.getName(), file.isDirectory(), file.isFile());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("FtpFile[name={}, dir={}, file={}]", file.getName(), file.isDirectory(), file.isFile());
}
// check if we can continue polling in files
@@ -201,7 +205,7 @@ public class FtpConsumer extends RemoteFileConsumer<FTPFile> {
fileList.add(remote);
}
} else {
- log.debug("Ignoring unsupported remote file type: {}", file);
+ LOG.debug("Ignoring unsupported remote file type: {}", file);
}
}
@@ -218,7 +222,7 @@ public class FtpConsumer extends RemoteFileConsumer<FTPFile> {
}
}
- log.trace("Done file: {} does not exist", doneFileName);
+ LOG.trace("Done file: {} does not exist", doneFileName);
return false;
}
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
index 04ed69d..144578d 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
@@ -37,6 +37,8 @@ import org.apache.camel.util.ObjectHelper;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPClientConfig;
import org.apache.commons.net.ftp.FTPFile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The ftp component is used for uploading or downloading files from FTP servers.
@@ -47,6 +49,9 @@ import org.apache.commons.net.ftp.FTPFile;
excludeProperties = "appendChars,readLockIdempotentReleaseAsync,readLockIdempotentReleaseAsyncPoolSize,readLockIdempotentReleaseDelay,readLockIdempotentReleaseExecutorService")
@ManagedResource(description = "Managed FtpEndpoint")
public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile> {
+
+ private static final Logger LOG = LoggerFactory.getLogger(FtpEndpoint.class);
+
protected int soTimeout;
protected int dataTimeout;
@@ -153,7 +158,7 @@ public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile>
}
int min = getCamelContext().getTypeConverter().mandatoryConvertTo(int.class, parts[0]);
int max = getCamelContext().getTypeConverter().mandatoryConvertTo(int.class, parts[1]);
- log.debug("Using active port range: {}-{}", min, max);
+ LOG.debug("Using active port range: {}-{}", min, max);
client.setActivePortRange(min, max);
}
@@ -186,8 +191,8 @@ public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile>
client.setDataTimeout(dataTimeout);
}
- if (log.isDebugEnabled()) {
- log.debug("Created FTPClient[connectTimeout: {}, soTimeout: {}, dataTimeout: {}, bufferSize: {}"
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Created FTPClient[connectTimeout: {}, soTimeout: {}, dataTimeout: {}, bufferSize: {}"
+ ", receiveDataSocketBufferSize: {}, sendDataSocketBufferSize: {}]: {}",
client.getConnectTimeout(), getSoTimeout(), dataTimeout, client.getBufferSize(),
client.getReceiveDataSocketBufferSize(), client.getSendDataSocketBufferSize(), client);
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
index 58ffbd9..829df4b 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
@@ -28,6 +28,7 @@ import javax.net.ssl.SSLSocket;
import javax.net.ssl.TrustManagerFactory;
import org.apache.camel.api.management.ManagedResource;
+import org.apache.camel.component.file.GenericFileEndpoint;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.jsse.SSLContextParameters;
@@ -36,6 +37,8 @@ import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPClientConfig;
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPSClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The ftps (FTP secure SSL/TLS) component is used for uploading or downloading files from FTP servers.
@@ -46,6 +49,8 @@ import org.apache.commons.net.ftp.FTPSClient;
excludeProperties = "appendChars,readLockIdempotentReleaseAsync,readLockIdempotentReleaseAsyncPoolSize,readLockIdempotentReleaseDelay,readLockIdempotentReleaseExecutorService")
@ManagedResource(description = "Managed FtpsEndpoint")
public class FtpsEndpoint extends FtpEndpoint<FTPFile> {
+ private static final Logger LOG = LoggerFactory.getLogger(FtpsEndpoint.class);
+
@UriParam
protected FtpsConfiguration configuration;
@UriParam(label = "security")
@@ -119,7 +124,7 @@ public class FtpsEndpoint extends FtpEndpoint<FTPFile> {
try {
keyStore.load(keyStoreFileInputStream, password.toCharArray());
} finally {
- IOHelper.close(keyStoreFileInputStream, "keyStore", log);
+ IOHelper.close(keyStoreFileInputStream, "keyStore", LOG);
}
KeyManagerFactory keyMgrFactory = KeyManagerFactory.getInstance(algorithm);
@@ -142,7 +147,7 @@ public class FtpsEndpoint extends FtpEndpoint<FTPFile> {
try {
trustStore.load(trustStoreFileInputStream, password.toCharArray());
} finally {
- IOHelper.close(trustStoreFileInputStream, "trustStore", log);
+ IOHelper.close(trustStoreFileInputStream, "trustStore", LOG);
}
TrustManagerFactory trustMgrFactory = TrustManagerFactory.getInstance(algorithm);
@@ -206,8 +211,8 @@ public class FtpsEndpoint extends FtpEndpoint<FTPFile> {
client.setDataTimeout(dataTimeout);
}
- if (log.isDebugEnabled()) {
- log.debug("Created FTPSClient[connectTimeout: {}, soTimeout: {}, dataTimeout: {}, bufferSize: {}"
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Created FTPSClient[connectTimeout: {}, soTimeout: {}, dataTimeout: {}, bufferSize: {}"
+ ", receiveDataSocketBufferSize: {}, sendDataSocketBufferSize: {}]: {}",
client.getConnectTimeout(), getSoTimeout(), dataTimeout, client.getBufferSize(),
client.getReceiveDataSocketBufferSize(), client.getSendDataSocketBufferSize(), client);
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
index 25573fb..9c364ad 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
@@ -28,11 +28,16 @@ import org.apache.camel.component.file.GenericFileConsumer;
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.camel.component.file.GenericFileProcessStrategy;
import org.apache.camel.support.SynchronizationAdapter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Base class for remote file consumers.
*/
public abstract class RemoteFileConsumer<T> extends GenericFileConsumer<T> {
+
+ private static final Logger LOG = LoggerFactory.getLogger(RemoteFileConsumer.class);
+
protected transient boolean loggedIn;
protected transient boolean loggedInWarning;
@@ -53,8 +58,8 @@ public abstract class RemoteFileConsumer<T> extends GenericFileConsumer<T> {
@Override
protected boolean prePollCheck() throws Exception {
- if (log.isTraceEnabled()) {
- log.trace("prePollCheck on {}", getEndpoint().getConfiguration().remoteServerInformation());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("prePollCheck on {}", getEndpoint().getConfiguration().remoteServerInformation());
}
try {
connectIfNecessary();
@@ -70,7 +75,7 @@ public abstract class RemoteFileConsumer<T> extends GenericFileConsumer<T> {
if (!loggedIn) {
String message = "Cannot connect/login to: " + remoteServer() + ". Will skip this poll.";
if (!loggedInWarning) {
- log.warn(message);
+ LOG.warn(message);
loggedInWarning = true;
}
return false;
@@ -84,15 +89,15 @@ public abstract class RemoteFileConsumer<T> extends GenericFileConsumer<T> {
@Override
protected void postPollCheck(int polledMessages) {
- if (log.isTraceEnabled()) {
- log.trace("postPollCheck on {}", getEndpoint().getConfiguration().remoteServerInformation());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("postPollCheck on {}", getEndpoint().getConfiguration().remoteServerInformation());
}
// if we did not poll any messages, but are configured to disconnect then we need to do this now
// as there is no exchanges to be routed that otherwise will disconnect from the last UoW
if (polledMessages == 0) {
if (getEndpoint().isDisconnect()) {
- log.trace("postPollCheck disconnect from: {}", getEndpoint());
+ LOG.trace("postPollCheck disconnect from: {}", getEndpoint());
disconnect();
}
}
@@ -110,7 +115,7 @@ public abstract class RemoteFileConsumer<T> extends GenericFileConsumer<T> {
exchange.adapt(ExtendedExchange.class).addOnCompletion(new SynchronizationAdapter() {
@Override
public void onDone(Exchange exchange) {
- log.trace("processExchange disconnect from: {}", getEndpoint());
+ LOG.trace("processExchange disconnect from: {}", getEndpoint());
disconnect();
}
@@ -153,14 +158,14 @@ public abstract class RemoteFileConsumer<T> extends GenericFileConsumer<T> {
// disconnect
try {
if (getOperations().isConnected()) {
- if (log.isDebugEnabled()) {
- log.debug("Disconnecting from: {}", remoteServer());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Disconnecting from: {}", remoteServer());
}
getOperations().disconnect();
}
} catch (GenericFileOperationFailedException e) {
// ignore just log a warning
- log.warn("Error occurred while disconnecting from " + remoteServer() + " due: " + e.getMessage() + ". This exception will be ignored.");
+ LOG.warn("Error occurred while disconnecting from " + remoteServer() + " due: " + e.getMessage() + ". This exception will be ignored.");
}
}
@@ -170,13 +175,13 @@ public abstract class RemoteFileConsumer<T> extends GenericFileConsumer<T> {
// disconnect
try {
- if (log.isDebugEnabled()) {
- log.debug("Force disconnecting from: {}", remoteServer());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Force disconnecting from: {}", remoteServer());
}
getOperations().forceDisconnect();
} catch (GenericFileOperationFailedException e) {
// ignore just log a warning
- log.warn("Error occurred while disconnecting from " + remoteServer() + " due: " + e.getMessage() + ". This exception will be ignored.");
+ LOG.warn("Error occurred while disconnecting from " + remoteServer() + " due: " + e.getMessage() + ". This exception will be ignored.");
}
}
@@ -187,18 +192,18 @@ public abstract class RemoteFileConsumer<T> extends GenericFileConsumer<T> {
isConnected = getOperations().sendNoop();
} catch (Exception ex) {
// here we just ignore the exception and try to reconnect
- if (log.isDebugEnabled()) {
- log.debug("Exception checking connection status: {}", ex.getMessage());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Exception checking connection status: {}", ex.getMessage());
}
}
if (!loggedIn || !isConnected) {
- if (log.isDebugEnabled()) {
- log.debug("Not connected/logged in, connecting to: {}", remoteServer());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Not connected/logged in, connecting to: {}", remoteServer());
}
loggedIn = getOperations().connect((RemoteFileConfiguration) endpoint.getConfiguration(), null);
if (loggedIn) {
- log.debug("Connected and logged in to: {}", remoteServer());
+ LOG.debug("Connected and logged in to: {}", remoteServer());
}
}
}
@@ -222,17 +227,17 @@ public abstract class RemoteFileConsumer<T> extends GenericFileConsumer<T> {
*/
protected boolean doSafePollSubDirectory(String absolutePath, String dirName, List<GenericFile<T>> fileList, int depth) {
try {
- log.trace("Polling sub directory: {} from: {}", absolutePath, endpoint);
+ LOG.trace("Polling sub directory: {} from: {}", absolutePath, endpoint);
//Try to poll the directory
return doPollDirectory(absolutePath, dirName, fileList, depth);
} catch (Exception e) {
- log.debug("Caught exception {}", e.getMessage());
+ LOG.debug("Caught exception {}", e.getMessage());
if (ignoreCannotRetrieveFile(absolutePath, null, e)) {
- log.trace("Ignoring file error {} for {}", e.getMessage(), absolutePath);
+ LOG.trace("Ignoring file error {} for {}", e.getMessage(), absolutePath);
//indicate no files in this directory to poll, continue with fileList
return true;
} else {
- log.trace("Not ignoring file error {} for {}", e.getMessage(), absolutePath);
+ LOG.trace("Not ignoring file error {} for {}", e.getMessage(), absolutePath);
if (e instanceof GenericFileOperationFailedException) {
throw (GenericFileOperationFailedException) e;
} else {
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
index f04f290..fdf7646 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
@@ -29,12 +29,16 @@ import org.apache.camel.component.file.GenericFileProducer;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
import org.apache.camel.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Remote file endpoint.
*/
public abstract class RemoteFileEndpoint<T> extends GenericFileEndpoint<T> {
+ private static final Logger LOG = LoggerFactory.getLogger(RemoteFileEndpoint.class);
+
@UriParam(label = "advanced")
private int maximumReconnectAttempts = 3;
@UriParam(label = "advanced")
@@ -114,13 +118,13 @@ public abstract class RemoteFileEndpoint<T> extends GenericFileEndpoint<T> {
// if noop=true then idempotent should also be configured
if (isNoop() && !isIdempotentSet()) {
- log.info("Endpoint is configured with noop=true so forcing endpoint to be idempotent as well");
+ LOG.info("Endpoint is configured with noop=true so forcing endpoint to be idempotent as well");
setIdempotent(true);
}
// if idempotent and no repository set then create a default one
if (isIdempotentSet() && isIdempotent() && idempotentRepository == null) {
- log.info("Using default memory based idempotent repository with cache max size: {}", DEFAULT_IDEMPOTENT_CACHE_SIZE);
+ LOG.info("Using default memory based idempotent repository with cache max size: {}", DEFAULT_IDEMPOTENT_CACHE_SIZE);
idempotentRepository = MemoryIdempotentRepository.memoryIdempotentRepository(DEFAULT_IDEMPOTENT_CACHE_SIZE);
}
@@ -138,8 +142,8 @@ public abstract class RemoteFileEndpoint<T> extends GenericFileEndpoint<T> {
@Override
public PollingConsumer createPollingConsumer() throws Exception {
- if (log.isDebugEnabled()) {
- log.debug("Creating GenericFilePollingConsumer with queueSize: {} blockWhenFull: {} blockTimeout: {}",
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Creating GenericFilePollingConsumer with queueSize: {} blockWhenFull: {} blockTimeout: {}",
getPollingConsumerQueueSize(), isPollingConsumerBlockWhenFull(), getPollingConsumerBlockTimeout());
}
GenericFilePollingConsumer result = new GenericFilePollingConsumer(this);
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
index 329886a..9ba3f17 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
@@ -20,12 +20,15 @@ import org.apache.camel.Exchange;
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.camel.component.file.GenericFileProducer;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Generic remote file producer for all the FTP variations.
*/
public class RemoteFileProducer<T> extends GenericFileProducer<T> {
+ private static final Logger LOG = LoggerFactory.getLogger(RemoteFileProducer.class);
private boolean loggedIn;
private transient String remoteFileProducerToString;
@@ -80,14 +83,14 @@ public class RemoteFileProducer<T> extends GenericFileProducer<T> {
loggedIn = false;
if (isStopping() || isStopped()) {
// if we are stopping then ignore any exception during a poll
- log.debug("Exception occurred during stopping: {}", exception.getMessage());
+ LOG.debug("Exception occurred during stopping: {}", exception.getMessage());
} else {
- log.warn("Writing file failed with: {}", exception.getMessage());
+ LOG.warn("Writing file failed with: {}", exception.getMessage());
try {
disconnect();
} catch (Exception e) {
// ignore exception
- log.debug("Ignored exception during disconnect: {}", e.getMessage());
+ LOG.debug("Ignored exception during disconnect: {}", e.getMessage());
}
// rethrow the original exception*/
throw exception;
@@ -97,7 +100,7 @@ public class RemoteFileProducer<T> extends GenericFileProducer<T> {
public void disconnect() throws GenericFileOperationFailedException {
loggedIn = false;
if (getOperations().isConnected()) {
- log.debug("Disconnecting from: {}", getEndpoint());
+ LOG.debug("Disconnecting from: {}", getEndpoint());
getOperations().disconnect();
}
}
@@ -116,11 +119,11 @@ public class RemoteFileProducer<T> extends GenericFileProducer<T> {
// mark as not logged in, since the noop failed
loggedIn = false;
}
- log.trace("preWriteCheck send noop success: {}", noop);
+ LOG.trace("preWriteCheck send noop success: {}", noop);
} else {
// okay send noop is disabled then we would regard the op as success
noop = true;
- log.trace("preWriteCheck send noop disabled");
+ LOG.trace("preWriteCheck send noop disabled");
}
}
@@ -142,22 +145,22 @@ public class RemoteFileProducer<T> extends GenericFileProducer<T> {
try {
boolean isLast = exchange.getProperty(Exchange.BATCH_COMPLETE, false, Boolean.class);
if (isLast && getEndpoint().isDisconnectOnBatchComplete()) {
- log.trace("postWriteCheck disconnect on batch complete from: {}", getEndpoint());
+ LOG.trace("postWriteCheck disconnect on batch complete from: {}", getEndpoint());
disconnect();
}
if (getEndpoint().isDisconnect()) {
- log.trace("postWriteCheck disconnect from: {}", getEndpoint());
+ LOG.trace("postWriteCheck disconnect from: {}", getEndpoint());
disconnect();
}
} catch (GenericFileOperationFailedException e) {
// ignore just log a warning
- log.warn("Exception occurred during disconnecting from: " + getEndpoint() + " " + e.getMessage());
+ LOG.warn("Exception occurred during disconnecting from: " + getEndpoint() + " " + e.getMessage());
}
}
@Override
protected void doStart() throws Exception {
- log.debug("Starting");
+ LOG.debug("Starting");
// do not connect when component starts, just wait until we process as we will
// connect at that time if needed
super.doStart();
@@ -168,20 +171,20 @@ public class RemoteFileProducer<T> extends GenericFileProducer<T> {
try {
disconnect();
} catch (Exception e) {
- log.debug("Exception occurred during disconnecting from: " + getEndpoint() + " " + e.getMessage());
+ LOG.debug("Exception occurred during disconnecting from: " + getEndpoint() + " " + e.getMessage());
}
super.doStop();
}
protected void connectIfNecessary(Exchange exchange) throws GenericFileOperationFailedException {
if (!loggedIn || !getOperations().isConnected()) {
- log.debug("Not already connected/logged in. Connecting to: {}", getEndpoint());
+ LOG.debug("Not already connected/logged in. Connecting to: {}", getEndpoint());
RemoteFileConfiguration config = getEndpoint().getConfiguration();
loggedIn = getOperations().connect(config, exchange);
if (!loggedIn) {
return;
}
- log.debug("Connected and logged in to: {}", getEndpoint());
+ LOG.debug("Connected and logged in to: {}", getEndpoint());
}
}
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java
index 8569234..b069399 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java
@@ -32,12 +32,16 @@ import org.apache.camel.util.FileUtil;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Secure FTP consumer
*/
public class SftpConsumer extends RemoteFileConsumer<SftpRemoteFile> {
+ private static final Logger LOG = LoggerFactory.getLogger(SftpConsumer.class);
+
private String endpointPath;
private transient String sftpConsumerToString;
@@ -55,13 +59,13 @@ public class SftpConsumer extends RemoteFileConsumer<SftpRemoteFile> {
try {
super.doStart();
if (endpoint.isAutoCreate()) {
- log.debug("Auto creating directory: {}", endpoint.getConfiguration().getDirectory());
+ LOG.debug("Auto creating directory: {}", endpoint.getConfiguration().getDirectory());
try {
connectIfNecessary();
operations.buildDirectory(endpoint.getConfiguration().getDirectory(), true);
} catch (GenericFileOperationFailedException e) {
// log a WARN as we want to start the consumer.
- log.warn("Error auto creating directory: " + endpoint.getConfiguration().getDirectory()
+ LOG.warn("Error auto creating directory: " + endpoint.getConfiguration().getDirectory()
+ " due " + e.getMessage() + ". This exception is ignored.", e);
}
}
@@ -103,7 +107,7 @@ public class SftpConsumer extends RemoteFileConsumer<SftpRemoteFile> {
@Override
protected boolean doPollDirectory(String absolutePath, String dirName, List<GenericFile<SftpRemoteFile>> fileList, int depth) {
- log.trace("doPollDirectory from absolutePath: {}, dirName: {}", absolutePath, dirName);
+ LOG.trace("doPollDirectory from absolutePath: {}, dirName: {}", absolutePath, dirName);
depth++;
@@ -121,7 +125,7 @@ public class SftpConsumer extends RemoteFileConsumer<SftpRemoteFile> {
dir = absolutePath;
}
- log.trace("Polling directory: {}", dir);
+ LOG.trace("Polling directory: {}", dir);
if (isUseList()) {
if (isStepwise()) {
files = operations.listFiles();
@@ -140,7 +144,7 @@ public class SftpConsumer extends RemoteFileConsumer<SftpRemoteFile> {
}
} catch (GenericFileOperationFailedException e) {
if (ignoreCannotRetrieveFile(null, null, e)) {
- log.debug("Cannot list files in directory {} due directory does not exists or file permission error.", dir);
+ LOG.debug("Cannot list files in directory {} due directory does not exists or file permission error.", dir);
} else {
throw e;
}
@@ -148,11 +152,11 @@ public class SftpConsumer extends RemoteFileConsumer<SftpRemoteFile> {
if (files == null || files.isEmpty()) {
// no files in this directory to poll
- log.trace("No files found in directory: {}", dir);
+ LOG.trace("No files found in directory: {}", dir);
return true;
} else {
// we found some files
- log.trace("Found {} in directory: {}", files.size(), dir);
+ LOG.trace("Found {} in directory: {}", files.size(), dir);
}
if (getEndpoint().isPreSort()) {
@@ -161,8 +165,8 @@ public class SftpConsumer extends RemoteFileConsumer<SftpRemoteFile> {
for (SftpRemoteFile file : files) {
- if (log.isTraceEnabled()) {
- log.trace("SftpFile[fileName={}, longName={}, dir={}]", file.getFilename(), file.getLongname(), file.isDirectory());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("SftpFile[fileName={}, longName={}, dir={}]", file.getFilename(), file.getLongname(), file.isDirectory());
}
// check if we can continue polling in files
@@ -205,7 +209,7 @@ public class SftpConsumer extends RemoteFileConsumer<SftpRemoteFile> {
}
}
- log.trace("Done file: {} does not exist", doneFileName);
+ LOG.trace("Done file: {} does not exist", doneFileName);
return false;
}
diff --git a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaProducer.java b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaProducer.java
index 24d6f7c..30e7489 100644
--- a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaProducer.java
+++ b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaProducer.java
@@ -22,9 +22,13 @@ import info.ganglia.gmetric4j.gmetric.GMetricType;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GangliaProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(GangliaProducer.class);
+
private final Publisher publisher;
private final GangliaEndpoint gangliaEndpoint;
@@ -82,15 +86,15 @@ public class GangliaProducer extends DefaultProducer {
String value = message.getBody(String.class);
if ((value == null || value.length() == 0)
&& (type == GMetricType.FLOAT || type == GMetricType.DOUBLE)) {
- log.debug("Metric {} string value was null, using NaN", metricName);
+ LOG.debug("Metric {} string value was null, using NaN", metricName);
value = "NaN";
}
- if (log.isDebugEnabled()) {
- log.debug("Sending metric {} to Ganglia: {}", metricName, value);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Sending metric {} to Ganglia: {}", metricName, value);
}
publisher.publish(groupName,
metricName, value, type, slope, tmax, dmax, units);
- log.trace("Sending metric done");
+ LOG.trace("Sending metric done");
}
}
diff --git a/components/camel-git/src/main/java/org/apache/camel/component/git/consumer/AbstractGitConsumer.java b/components/camel-git/src/main/java/org/apache/camel/component/git/consumer/AbstractGitConsumer.java
index 303d5e4..0fb735e 100644
--- a/components/camel-git/src/main/java/org/apache/camel/component/git/consumer/AbstractGitConsumer.java
+++ b/components/camel-git/src/main/java/org/apache/camel/component/git/consumer/AbstractGitConsumer.java
@@ -25,9 +25,13 @@ import org.apache.camel.support.ScheduledPollConsumer;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class AbstractGitConsumer extends ScheduledPollConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractGitConsumer.class);
+
private final GitEndpoint endpoint;
private Repository repo;
@@ -61,7 +65,7 @@ public abstract class AbstractGitConsumer extends ScheduledPollConsumer {
.findGitDir() // scan up the file system tree
.build();
} catch (IOException e) {
- log.error("There was an error, cannot open {} repository", endpoint.getLocalPath());
+ LOG.error("There was an error, cannot open {} repository", endpoint.getLocalPath());
throw e;
}
return repo;
diff --git a/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java b/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
index cc77803..3d5d5b9 100644
--- a/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
+++ b/components/camel-git/src/main/java/org/apache/camel/component/git/producer/GitProducer.java
@@ -47,9 +47,13 @@ import org.eclipse.jgit.transport.PushResult;
import org.eclipse.jgit.transport.RemoteConfig;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GitProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(GitProducer.class);
+
private final GitEndpoint endpoint;
private Repository repo;
@@ -208,7 +212,7 @@ public class GitProducer extends DefaultProducer {
throw new IllegalArgumentException("The local repository directory already exists");
}
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
} finally {
if (ObjectHelper.isNotEmpty(result)) {
@@ -228,7 +232,7 @@ public class GitProducer extends DefaultProducer {
git.checkout().setCreateBranch(true).setName(endpoint.getBranchName()).setStartPoint(endpoint.getTagName()).call();
}
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
}
@@ -241,7 +245,7 @@ public class GitProducer extends DefaultProducer {
try {
result = Git.init().setDirectory(new File(endpoint.getLocalPath(), "")).setBare(false).call();
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
} finally {
if (ObjectHelper.isNotEmpty(result)) {
@@ -263,7 +267,7 @@ public class GitProducer extends DefaultProducer {
}
git.add().addFilepattern(fileName).call();
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
}
@@ -281,7 +285,7 @@ public class GitProducer extends DefaultProducer {
}
git.rm().addFilepattern(fileName).call();
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
}
@@ -315,7 +319,7 @@ public class GitProducer extends DefaultProducer {
git.commit().setAllowEmpty(allowEmpty).setMessage(commitMessage).call();
}
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
}
@@ -349,7 +353,7 @@ public class GitProducer extends DefaultProducer {
git.commit().setAllowEmpty(allowEmpty).setAll(true).setMessage(commitMessage).call();
}
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
}
@@ -361,7 +365,7 @@ public class GitProducer extends DefaultProducer {
try {
git.branchCreate().setName(endpoint.getBranchName()).call();
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
}
@@ -373,7 +377,7 @@ public class GitProducer extends DefaultProducer {
try {
git.branchDelete().setBranchNames(endpoint.getBranchName()).call();
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
}
@@ -386,7 +390,7 @@ public class GitProducer extends DefaultProducer {
}
status = git.status().call();
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
updateExchange(exchange, status);
@@ -400,7 +404,7 @@ public class GitProducer extends DefaultProducer {
}
revCommit = git.log().call();
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
updateExchange(exchange, revCommit);
@@ -422,7 +426,7 @@ public class GitProducer extends DefaultProducer {
result = git.push().setRemote(endpoint.getRemoteName()).call();
}
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
updateExchange(exchange, result);
@@ -444,7 +448,7 @@ public class GitProducer extends DefaultProducer {
result = git.push().setRemote(endpoint.getRemoteName()).add(Constants.R_TAGS + endpoint.getTagName()).call();
}
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
updateExchange(exchange, result);
@@ -466,7 +470,7 @@ public class GitProducer extends DefaultProducer {
result = git.pull().setRemote(endpoint.getRemoteName()).call();
}
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
updateExchange(exchange, result);
@@ -483,7 +487,7 @@ public class GitProducer extends DefaultProducer {
git.checkout().setName("master").call();
result = git.merge().include(mergeBase).setFastForward(FastForwardMode.FF).setCommit(true).call();
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
updateExchange(exchange, result);
@@ -496,7 +500,7 @@ public class GitProducer extends DefaultProducer {
try {
git.tag().setName(endpoint.getTagName()).call();
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
}
@@ -508,7 +512,7 @@ public class GitProducer extends DefaultProducer {
try {
git.tagDelete().setTags(endpoint.getTagName()).call();
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
}
@@ -518,7 +522,7 @@ public class GitProducer extends DefaultProducer {
try {
result = git.branchList().setListMode(ListMode.ALL).call();
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
updateExchange(exchange, result);
@@ -529,7 +533,7 @@ public class GitProducer extends DefaultProducer {
try {
result = git.tagList().call();
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
updateExchange(exchange, result);
@@ -553,7 +557,7 @@ public class GitProducer extends DefaultProducer {
}
result = git.cherryPick().include(commit).call();
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
updateExchange(exchange, result);
@@ -567,7 +571,7 @@ public class GitProducer extends DefaultProducer {
}
result = git.clean().setCleanDirectories(true).call();
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
updateExchange(exchange, result);
@@ -578,7 +582,7 @@ public class GitProducer extends DefaultProducer {
try {
result = git.gc().call();
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
updateExchange(exchange, result);
@@ -598,7 +602,7 @@ public class GitProducer extends DefaultProducer {
remoteAddCommand.setName(endpoint.getRemoteName());
result = remoteAddCommand.call();
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
updateExchange(exchange, result);
@@ -609,7 +613,7 @@ public class GitProducer extends DefaultProducer {
try {
result = git.remoteList().call();
} catch (Exception e) {
- log.error("There was an error in Git {} operation", operation);
+ LOG.error("There was an error in Git {} operation", operation);
throw e;
}
updateExchange(exchange, result);
@@ -626,7 +630,7 @@ public class GitProducer extends DefaultProducer {
.findGitDir() // scan up the file system tree
.build();
} catch (IOException e) {
- log.error("There was an error, cannot open {} repository", endpoint.getLocalPath());
+ LOG.error("There was an error, cannot open {} repository", endpoint.getLocalPath());
throw e;
}
return repo;
diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryProducer.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryProducer.java
index 2415db1..b98938b 100644
--- a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryProducer.java
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryProducer.java
@@ -27,12 +27,16 @@ import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
import com.google.api.services.bigquery.model.TableRow;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultProducer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Generic BigQuery Producer
*/
public class GoogleBigQueryProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(GoogleBigQueryProducer.class);
+
private final GoogleBigQueryConfiguration configuration;
private Bigquery bigquery;
@@ -110,7 +114,7 @@ public class GoogleBigQueryProducer extends DefaultProducer {
}
if (totalProcessed == 0) {
- log.debug("The incoming message is either null or empty for exchange {}", exchange.getExchangeId());
+ LOG.debug("The incoming message is either null or empty for exchange {}", exchange.getExchangeId());
}
}
@@ -149,8 +153,8 @@ public class GoogleBigQueryProducer extends DefaultProducer {
apiRequest.set("template_suffix", suffix);
}
- if (log.isTraceEnabled()) {
- log.trace("Sending {} messages to bigquery table {}, suffix {}, partition {}",
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Sending {} messages to bigquery table {}, suffix {}, partition {}",
apiRequestRows.size(), tableId, suffix, partitionDecorator);
}
@@ -160,12 +164,12 @@ public class GoogleBigQueryProducer extends DefaultProducer {
throw new Exception("InsertAll into " + tableId + " failed: " + apiResponse.getInsertErrors());
}
- if (log.isTraceEnabled()) {
- log.trace("Sent {} messages to bigquery table {}, suffix {}, partition {}",
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Sent {} messages to bigquery table {}, suffix {}, partition {}",
apiRequestRows.size(), tableId, suffix, partitionDecorator);
}
- if (log.isDebugEnabled()) {
- log.debug("uploader thread/id: {} / {} . api call completed.", Thread.currentThread().getId(), exchangeId);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("uploader thread/id: {} / {} . api call completed.", Thread.currentThread().getId(), exchangeId);
}
return apiRequestData.size();
}
diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java
index 723e823..e209b35 100644
--- a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java
@@ -33,12 +33,16 @@ import org.apache.camel.Message;
import org.apache.camel.RuntimeExchangeException;
import org.apache.camel.component.google.bigquery.GoogleBigQueryConstants;
import org.apache.camel.support.DefaultProducer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Generic BigQuery Producer
*/
public class GoogleBigQuerySQLProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(GoogleBigQuerySQLProducer.class);
+
private final GoogleBigQuerySQLConfiguration configuration;
private Bigquery bigquery;
private String query;
@@ -69,7 +73,7 @@ public class GoogleBigQuerySQLProducer extends DefaultProducer {
Map<String, Object> queryParameters = extractParameters(exchange);
exchange.getMessage().setHeader(GoogleBigQueryConstants.TRANSLATED_QUERY, translatedQuery);
Long affectedRows = executeSQL(translatedQuery, queryParameters);
- log.debug("The query {} affected {} rows", query, affectedRows);
+ LOG.debug("The query {} affected {} rows", query, affectedRows);
exchange.getMessage().setBody(affectedRows);
}
@@ -80,8 +84,8 @@ public class GoogleBigQuerySQLProducer extends DefaultProducer {
setQueryParameters(queryParameters, apiQueryRequest);
- if (log.isTraceEnabled()) {
- log.trace("Sending query to bigquery standard sql: {}", translatedQuery);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Sending query to bigquery standard sql: {}", translatedQuery);
}
QueryResponse apiResponse = apiQuery.execute();
@@ -90,8 +94,8 @@ public class GoogleBigQuerySQLProducer extends DefaultProducer {
throw new Exception("Query " + translatedQuery + " failed: " + apiResponse.getErrors());
}
- if (log.isTraceEnabled()) {
- log.trace("Result of query {} is {}", translatedQuery, apiResponse.toPrettyString());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Result of query {} is {}", translatedQuery, apiResponse.toPrettyString());
}
return apiResponse.getNumDmlAffectedRows();
}
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConsumer.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConsumer.java
index 6434323..27f24dd 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConsumer.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConsumer.java
@@ -126,11 +126,8 @@ public class GoogleCalendarStreamConsumer extends ScheduledBatchPollingConsumer
// update pending number of exchanges
pendingExchanges = total - index - 1;
- getAsyncProcessor().process(exchange, new AsyncCallback() {
- @Override
- public void done(boolean doneSync) {
- log.trace("Processing exchange done");
- }
+ getAsyncProcessor().process(exchange, doneSync -> {
+ // noop
});
}
return total;
diff --git a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConsumer.java b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConsumer.java
index be0101b..6c51052 100644
--- a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConsumer.java
+++ b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraConsumer.java
@@ -88,8 +88,6 @@ public class GoraConsumer extends ScheduledPollConsumer {
//proceed with query
final Result result = query.execute();
- log.trace("Processing exchange [{}]...", exchange);
-
try {
getProcessor().process(exchange);
} finally {
diff --git a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcConsumer.java b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcConsumer.java
index 29f88f2..96e2c63 100644
--- a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcConsumer.java
+++ b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcConsumer.java
@@ -41,12 +41,16 @@ import org.apache.camel.spi.ClassResolver;
import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.support.ResourceHelper;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Represents gRPC server consumer implementation
*/
public class GrpcConsumer extends DefaultConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(GrpcConsumer.class);
+
protected final GrpcConfiguration configuration;
protected final GrpcEndpoint endpoint;
@@ -66,17 +70,17 @@ public class GrpcConsumer extends DefaultConsumer {
protected void doStart() throws Exception {
super.doStart();
if (server == null) {
- log.info("Starting the gRPC server");
+ LOG.info("Starting the gRPC server");
initializeServer();
server.start();
- log.info("gRPC server started and listening on port: {}", server.getPort());
+ LOG.info("gRPC server started and listening on port: {}", server.getPort());
}
}
@Override
protected void doStop() throws Exception {
if (server != null) {
- log.debug("Terminating gRPC server");
+ LOG.debug("Terminating gRPC server");
server.shutdown().shutdownNow();
server = null;
}
@@ -98,7 +102,7 @@ public class GrpcConsumer extends DefaultConsumer {
}
if (!ObjectHelper.isEmpty(configuration.getHost()) && !ObjectHelper.isEmpty(configuration.getPort())) {
- log.debug("Building gRPC server on {}:{}", configuration.getHost(), configuration.getPort());
+ LOG.debug("Building gRPC server on {}:{}", configuration.getHost(), configuration.getPort());
serverBuilder = NettyServerBuilder.forAddress(new InetSocketAddress(configuration.getHost(), configuration.getPort()));
} else {
throw new IllegalArgumentException("No server start properties (host, port) specified");
@@ -170,7 +174,7 @@ public class GrpcConsumer extends DefaultConsumer {
});
return false;
} else {
- log.warn("Consumer not ready to process exchanges. The exchange {} will be discarded", exchange);
+ LOG.warn("Consumer not ready to process exchanges. The exchange {} will be discarded", exchange);
callback.done(true);
return true;
}
diff --git a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcProducer.java b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcProducer.java
index 3e99b9c..0b8f9bc 100644
--- a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcProducer.java
+++ b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/GrpcProducer.java
@@ -40,12 +40,16 @@ import org.apache.camel.support.DefaultAsyncProducer;
import org.apache.camel.support.ResourceHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Represents asynchronous and synchronous gRPC producer implementations.
*/
public class GrpcProducer extends DefaultAsyncProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(GrpcProducer.class);
+
protected final GrpcConfiguration configuration;
protected final GrpcEndpoint endpoint;
private ManagedChannel channel;
@@ -107,10 +111,10 @@ public class GrpcProducer extends DefaultAsyncProducer {
}
if (endpoint.isSynchronous()) {
- log.debug("Getting synchronous method stub from channel");
+ LOG.debug("Getting synchronous method stub from channel");
grpcStub = GrpcUtils.constructGrpcBlockingStub(endpoint.getServicePackage(), endpoint.getServiceName(), channel, callCreds, endpoint.getCamelContext());
} else {
- log.debug("Getting asynchronous method stub from channel");
+ LOG.debug("Getting asynchronous method stub from channel");
grpcStub = GrpcUtils.constructGrpcAsyncStub(endpoint.getServicePackage(), endpoint.getServiceName(), channel, callCreds, endpoint.getCamelContext());
}
forwarder = GrpcExchangeForwarderFactory.createExchangeForwarder(configuration, grpcStub);
@@ -134,7 +138,7 @@ public class GrpcProducer extends DefaultAsyncProducer {
forwarder.shutdown();
forwarder = null;
- log.debug("Terminating channel to the remote gRPC server");
+ LOG.debug("Terminating channel to the remote gRPC server");
channel.shutdown().shutdownNow();
channel = null;
grpcStub = null;
@@ -147,7 +151,7 @@ public class GrpcProducer extends DefaultAsyncProducer {
NettyChannelBuilder channelBuilder;
if (!ObjectHelper.isEmpty(configuration.getHost()) && !ObjectHelper.isEmpty(configuration.getPort())) {
- log.info("Creating channel to the remote gRPC server {}:{}", configuration.getHost(), configuration.getPort());
+ LOG.info("Creating channel to the remote gRPC server {}:{}", configuration.getHost(), configuration.getPort());
channelBuilder = NettyChannelBuilder.forAddress(configuration.getHost(), configuration.getPort());
} else {
throw new IllegalArgumentException("No connection properties (host or port) specified");
diff --git a/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/GuavaEventBusConsumer.java b/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/GuavaEventBusConsumer.java
index 7bbb97e..f93b64f 100644
--- a/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/GuavaEventBusConsumer.java
+++ b/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/GuavaEventBusConsumer.java
@@ -33,6 +33,8 @@ import org.slf4j.LoggerFactory;
*/
public class GuavaEventBusConsumer extends DefaultConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(GuavaEventBusConsumer.class);
+
private final EventBus eventBus;
private final Object eventHandler;
@@ -54,13 +56,13 @@ public class GuavaEventBusConsumer extends DefaultConsumer {
@Override
protected void doStart() throws Exception {
super.doStart();
- log.debug("Registering event handler: {} to EventBus: {}", eventHandler, eventBus);
+ LOG.debug("Registering event handler: {} to EventBus: {}", eventHandler, eventBus);
eventBus.register(eventHandler);
}
@Override
protected void doStop() throws Exception {
- log.debug("Unregistering event handler: {} from EventBus: {}", eventHandler, eventBus);
+ LOG.debug("Unregistering event handler: {} from EventBus: {}", eventHandler, eventBus);
eventBus.unregister(eventHandler);
super.doStop();
}
diff --git a/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/GuavaEventBusProducer.java b/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/GuavaEventBusProducer.java
index 9c76389..1c4f083 100644
--- a/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/GuavaEventBusProducer.java
+++ b/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/GuavaEventBusProducer.java
@@ -20,6 +20,8 @@ import com.google.common.eventbus.EventBus;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultProducer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Guava EventBus (http://docs.guava-libraries.googlecode.com/git/javadoc/com/google/common/eventbus/EventBus.html)
@@ -27,6 +29,8 @@ import org.apache.camel.support.DefaultProducer;
*/
public class GuavaEventBusProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(GuavaEventBusProducer.class);
+
private final EventBus eventBus;
public GuavaEventBusProducer(Endpoint endpoint, EventBus eventBus) {
@@ -38,10 +42,10 @@ public class GuavaEventBusProducer extends DefaultProducer {
public void process(Exchange exchange) throws Exception {
Object body = exchange.getIn().getBody();
if (body != null) {
- log.debug("Posting: {} to EventBus: {}", body, eventBus);
+ LOG.debug("Posting: {} to EventBus: {}", body, eventBus);
eventBus.post(body);
} else {
- log.debug("Body is null, cannot post to EventBus");
+ LOG.debug("Body is null, cannot post to EventBus");
}
}
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueConsumer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueConsumer.java
index d0a9e34..256df91 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueConsumer.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueConsumer.java
@@ -91,10 +91,7 @@ public class HazelcastQueueConsumer extends HazelcastDefaultConsumer {
getExceptionHandler().handleException("Error during processing", exchange, e);
}
} catch (InterruptedException e) {
- if (log.isDebugEnabled()) {
- log.debug("Hazelcast Queue Consumer Interrupted: {}", e, e);
- continue;
- }
+ // ignore
}
}
}
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
index 070dcb0..dbb00b2 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
@@ -30,12 +30,16 @@ import org.apache.camel.Processor;
import org.apache.camel.support.AsyncProcessorConverterHelper;
import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.support.DefaultExchangeHolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Implementation of Hazelcast SEDA {@link Consumer} component.
*/
public class HazelcastSedaConsumer extends DefaultConsumer implements Runnable {
+ private static final Logger LOG = LoggerFactory.getLogger(HazelcastSedaConsumer.class);
+
private final HazelcastSedaEndpoint endpoint;
private final AsyncProcessor processor;
private ExecutorService executor;
@@ -80,7 +84,7 @@ public class HazelcastSedaConsumer extends DefaultConsumer implements Runnable {
transactionCtx = endpoint.getHazelcastInstance().newTransactionContext();
if (transactionCtx != null) {
- log.trace("Begin transaction: {}", transactionCtx.getTxnId());
+ LOG.trace("Begin transaction: {}", transactionCtx.getTxnId());
transactionCtx.beginTransaction();
queue = transactionCtx.getQueue(endpoint.getConfiguration().getQueueName());
}
@@ -111,28 +115,28 @@ public class HazelcastSedaConsumer extends DefaultConsumer implements Runnable {
}
} catch (Exception e) {
- log.error("Hzlq Exception caught: {}", e, e);
+ LOG.error("Hzlq Exception caught: {}", e, e);
// Rollback
if (transactionCtx != null) {
- log.trace("Rollback transaction: {}", transactionCtx.getTxnId());
+ LOG.trace("Rollback transaction: {}", transactionCtx.getTxnId());
transactionCtx.rollbackTransaction();
}
}
}
// It's OK, I commit
if (exchange.getException() == null && transactionCtx != null) {
- log.trace("Commit transaction: {}", transactionCtx.getTxnId());
+ LOG.trace("Commit transaction: {}", transactionCtx.getTxnId());
transactionCtx.commitTransaction();
}
} catch (InterruptedException e) {
- if (log.isDebugEnabled()) {
- log.debug("Hzlq Consumer Interrupted: {}", e, e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Hzlq Consumer Interrupted: {}", e, e);
}
continue;
} catch (Throwable e) {
// Rollback
if (transactionCtx != null) {
- log.trace("Rollback transaction: {}", transactionCtx.getTxnId());
+ LOG.trace("Rollback transaction: {}", transactionCtx.getTxnId());
try {
transactionCtx.rollbackTransaction();
} catch (Throwable ignore) {
diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java
index e5f29b2..aafb896 100644
--- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java
+++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseConsumer.java
@@ -41,12 +41,16 @@ import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.filter.Filter;
import org.apache.hadoop.hbase.filter.FilterList;
import org.apache.hadoop.hbase.filter.PageFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The HBase consumer.
*/
public class HBaseConsumer extends ScheduledBatchPollingConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(HBaseConsumer.class);
+
private final HBaseEndpoint endpoint;
private HBaseRow rowModel;
@@ -150,7 +154,7 @@ public class HBaseConsumer extends ScheduledBatchPollingConsumer {
// limit if needed
if (maxMessagesPerPoll > 0 && total > maxMessagesPerPoll) {
- log.debug("Limiting to maximum messages to poll {} as there were {} messages in this poll.", maxMessagesPerPoll, total);
+ LOG.debug("Limiting to maximum messages to poll {} as there were {} messages in this poll.", maxMessagesPerPoll, total);
total = maxMessagesPerPoll;
}
@@ -165,7 +169,7 @@ public class HBaseConsumer extends ScheduledBatchPollingConsumer {
// update pending number of exchanges
pendingExchanges = total - index - 1;
- log.trace("Processing exchange [{}]...", exchange);
+ LOG.trace("Processing exchange [{}]...", exchange);
getProcessor().process(exchange);
if (exchange.getException() != null) {
// if we failed then throw exception
diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepository.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepository.java
index e90dfee..03f8333 100644
--- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepository.java
+++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepository.java
@@ -32,9 +32,13 @@ import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class HBaseIdempotentRepository extends ServiceSupport implements IdempotentRepository {
+ private static final Logger LOG = LoggerFactory.getLogger(HBaseIdempotentRepository.class);
+
private final String tableName;
private final String family;
private final String qualifier;
@@ -63,7 +67,7 @@ public class HBaseIdempotentRepository extends ServiceSupport implements Idempot
table.put(put);
return true;
} catch (Exception e) {
- log.warn("Error adding object {} to HBase repository.", o);
+ LOG.warn("Error adding object {} to HBase repository.", o);
return false;
}
}
@@ -76,7 +80,7 @@ public class HBaseIdempotentRepository extends ServiceSupport implements Idempot
get.addColumn(HBaseHelper.getHBaseFieldAsBytes(family), HBaseHelper.getHBaseFieldAsBytes(qualifier));
return table.exists(get);
} catch (Exception e) {
- log.warn("Error reading object {} from HBase repository.", o);
+ LOG.warn("Error reading object {} from HBase repository.", o);
return false;
}
}
@@ -93,7 +97,7 @@ public class HBaseIdempotentRepository extends ServiceSupport implements Idempot
return false;
}
} catch (Exception e) {
- log.warn("Error removing object {} from HBase repository.", o);
+ LOG.warn("Error removing object {} from HBase repository.", o);
return false;
}
}
@@ -114,7 +118,7 @@ public class HBaseIdempotentRepository extends ServiceSupport implements Idempot
table.delete(d);
}
} catch (Exception e) {
- log.warn("Error clear HBase repository {}", table);
+ LOG.warn("Error clear HBase repository {}", table);
}
}
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConsumer.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConsumer.java
index 34f2fb3..df22168 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConsumer.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConsumer.java
@@ -39,9 +39,13 @@ import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class HdfsConsumer extends ScheduledPollConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(HdfsConsumer.class);
+
private final HdfsConfiguration endpointConfig;
private final StringBuilder hdfsPath;
private final Processor processor;
@@ -80,18 +84,18 @@ public final class HdfsConsumer extends ScheduledPollConsumer {
String hdfsFsDescription = endpointConfig.getFileSystemLabel(hdfsPath.toString());
// if we are starting up then log at info level, and if runtime then log at debug level to not flood the log
if (onStartup) {
- log.info("Connecting to hdfs file-system {} (may take a while if connection is not available)", hdfsFsDescription);
+ LOG.info("Connecting to hdfs file-system {} (may take a while if connection is not available)", hdfsFsDescription);
} else {
- log.debug("Connecting to hdfs file-system {} (may take a while if connection is not available)", hdfsFsDescription);
+ LOG.debug("Connecting to hdfs file-system {} (may take a while if connection is not available)", hdfsFsDescription);
}
// hadoop will cache the connection by default so its faster to get in the poll method
HdfsInfo answer = hdfsInfoFactory.newHdfsInfo(this.hdfsPath.toString());
if (onStartup) {
- log.info("Connected to hdfs file-system {}", hdfsFsDescription);
+ LOG.info("Connected to hdfs file-system {}", hdfsFsDescription);
} else {
- log.debug("Connected to hdfs file-system {}", hdfsFsDescription);
+ LOG.debug("Connected to hdfs file-system {}", hdfsFsDescription);
}
return answer;
}
@@ -140,16 +144,16 @@ public final class HdfsConsumer extends ScheduledPollConsumer {
.filter(Objects::nonNull)
.collect(Collectors.toList());
- log.info("Processing [{}] valid files out of [{}] available.", hdfsFiles.size(), fileStatuses.length);
+ LOG.info("Processing [{}] valid files out of [{}] available.", hdfsFiles.size(), fileStatuses.length);
for (int i = 0; i < hdfsFiles.size(); i++) {
HdfsInputStream hdfsFile = hdfsFiles.get(i);
try {
int messageCount = processHdfsInputStream(hdfsFile, totalMessageCount);
- log.debug("Processed [{}] files out of [{}].", i, hdfsFiles.size());
- log.debug("File [{}] was split to [{}] messages.", i, messageCount);
+ LOG.debug("Processed [{}] files out of [{}].", i, hdfsFiles.size());
+ LOG.debug("File [{}] was split to [{}] messages.", i, messageCount);
} finally {
- IOHelper.close(hdfsFile, "hdfs file", log);
+ IOHelper.close(hdfsFile, "hdfs file", LOG);
}
}
@@ -188,7 +192,7 @@ public final class HdfsConsumer extends ScheduledPollConsumer {
updateNewExchange(exchange, messageCount.get(), hdfsFile);
- log.debug("Processing file [{}]", fileName);
+ LOG.debug("Processing file [{}]", fileName);
try {
processor.process(exchange);
totalMessageCount.incrementAndGet();
@@ -218,8 +222,8 @@ public final class HdfsConsumer extends ScheduledPollConsumer {
private boolean hasMatchingOwner(FileStatus fileStatus) {
if (endpointConfig.getOwner() != null && !endpointConfig.getOwner().equals(fileStatus.getOwner())) {
- if (log.isDebugEnabled()) {
- log.debug("Skipping file: {} as not matching owner: {}", fileStatus.getPath(), endpointConfig.getOwner());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Skipping file: {} as not matching owner: {}", fileStatus.getPath(), endpointConfig.getOwner());
}
return false;
}
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsProducer.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsProducer.java
index 0877eef..ecfe3d1 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsProducer.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsProducer.java
@@ -31,9 +31,13 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class HdfsProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(HdfsProducer.class);
+
private final HdfsConfiguration config;
private final StringBuilder hdfsPath;
private final AtomicBoolean idle = new AtomicBoolean(false);
@@ -109,12 +113,12 @@ public class HdfsProducer extends DefaultProducer {
Optional<SplitStrategy> idleStrategy = tryFindIdleStrategy(config.getSplitStrategies());
if (idleStrategy.isPresent()) {
scheduler = getEndpoint().getCamelContext().getExecutorServiceManager().newSingleThreadScheduledExecutor(this, "HdfsIdleCheck");
- log.debug("Creating IdleCheck task scheduled to run every {} millis", config.getCheckIdleInterval());
+ LOG.debug("Creating IdleCheck task scheduled to run every {} millis", config.getCheckIdleInterval());
scheduler.scheduleAtFixedRate(new IdleCheck(idleStrategy.get()), config.getCheckIdleInterval(), config.getCheckIdleInterval(), TimeUnit.MILLISECONDS);
}
} catch (Exception e) {
- log.warn("Failed to start the HDFS producer. Caused by: [{}]", e.getMessage());
- log.debug("", e);
+ LOG.warn("Failed to start the HDFS producer. Caused by: [{}]", e.getMessage());
+ LOG.debug("", e);
throw new RuntimeCamelException(e);
} finally {
HdfsComponent.setJAASConfiguration(auth);
@@ -135,18 +139,18 @@ public class HdfsProducer extends DefaultProducer {
// if we are starting up then log at info level, and if runtime then log at debug level to not flood the log
if (onStartup) {
- log.info("Connecting to hdfs file-system {} (may take a while if connection is not available)", hdfsFsDescription);
+ LOG.info("Connecting to hdfs file-system {} (may take a while if connection is not available)", hdfsFsDescription);
} else {
- log.debug("Connecting to hdfs file-system {} (may take a while if connection is not available)", hdfsFsDescription);
+ LOG.debug("Connecting to hdfs file-system {} (may take a while if connection is not available)", hdfsFsDescription);
}
HdfsInfoFactory hdfsInfoFactory = new HdfsInfoFactory(config);
HdfsOutputStream answer = HdfsOutputStream.createOutputStream(actualPath.toString(), hdfsInfoFactory);
if (onStartup) {
- log.info("Connected to hdfs file-system {}", hdfsFsDescription);
+ LOG.info("Connected to hdfs file-system {}", hdfsFsDescription);
} else {
- log.debug("Connected to hdfs file-system {}", hdfsFsDescription);
+ LOG.debug("Connected to hdfs file-system {}", hdfsFsDescription);
}
return answer;
@@ -169,7 +173,7 @@ public class HdfsProducer extends DefaultProducer {
scheduler = null;
}
if (oStream != null) {
- IOHelper.close(oStream, "output stream", log);
+ IOHelper.close(oStream, "output stream", LOG);
oStream = null;
}
}
@@ -193,7 +197,7 @@ public class HdfsProducer extends DefaultProducer {
// if an explicit filename is specified, close any existing stream and append the filename to the hdfsPath
if (exchange.getIn().getHeader(Exchange.FILE_NAME) != null) {
if (oStream != null) {
- IOHelper.close(oStream, "output stream", log);
+ IOHelper.close(oStream, "output stream", LOG);
}
StringBuilder actualPath = getHdfsPathUsingFileNameHeader(exchange);
oStream = HdfsOutputStream.createOutputStream(actualPath.toString(), hdfsInfoFactory);
@@ -204,14 +208,14 @@ public class HdfsProducer extends DefaultProducer {
if (isSplitRequired(config.getSplitStrategies())) {
if (oStream != null) {
- IOHelper.close(oStream, "output stream", log);
+ IOHelper.close(oStream, "output stream", LOG);
}
StringBuilder actualPath = newFileName();
oStream = HdfsOutputStream.createOutputStream(actualPath.toString(), hdfsInfoFactory);
}
String path = oStream.getActualPath();
- log.trace("Writing body to hdfs-file {}", path);
+ LOG.trace("Writing body to hdfs-file {}", path);
oStream.append(key, body, exchange);
idle.set(false);
@@ -227,7 +231,7 @@ public class HdfsProducer extends DefaultProducer {
// if no idle checker then we need to explicit close the stream after usage
if (close) {
try {
- HdfsProducer.this.log.trace("Closing stream");
+ LOG.trace("Closing stream");
oStream.close();
oStream = null;
} catch (IOException e) {
@@ -235,14 +239,11 @@ public class HdfsProducer extends DefaultProducer {
}
}
- log.debug("Wrote body to hdfs-file {}", path);
+ LOG.debug("Wrote body to hdfs-file {}", path);
}
/**
* helper method to construct the hdfsPath from the CamelFileName String or Expression
- *
- * @param exchange
- * @return
*/
private StringBuilder getHdfsPathUsingFileNameHeader(Exchange exchange) {
StringBuilder actualPath = new StringBuilder(hdfsPath);
@@ -288,12 +289,12 @@ public class HdfsProducer extends DefaultProducer {
return;
}
- HdfsProducer.this.log.trace("IdleCheck running");
+ LOG.trace("IdleCheck running");
if (System.currentTimeMillis() - oStream.getLastAccess() > strategy.value && !idle.get() && !oStream.isBusy().get()) {
idle.set(true);
try {
- HdfsProducer.this.log.trace("Closing stream as idle");
+ LOG.trace("Closing stream as idle");
oStream.close();
} catch (IOException e) {
// ignore
diff --git a/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatComponent.java b/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatComponent.java
index 69392e0..c2e5772 100644
--- a/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatComponent.java
+++ b/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatComponent.java
@@ -24,6 +24,8 @@ import org.apache.camel.Endpoint;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
import org.apache.camel.util.URISupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Represents the component that manages {@link HipchatEndpoint}. Hipchat is an Atlassian software for team chat.
@@ -36,6 +38,8 @@ import org.apache.camel.util.URISupport;
@Component("hipchat")
public class HipchatComponent extends DefaultComponent {
+ private static final Logger LOG = LoggerFactory.getLogger(HipchatComponent.class);
+
public HipchatComponent() {
}
@@ -51,7 +55,7 @@ public class HipchatComponent extends DefaultComponent {
throw new HipchatException("OAuth 2 auth token must be specified");
}
parseUri(remaining, endpoint);
- log.debug("Using Hipchat API URL: {}", endpoint.getConfiguration().hipChatUrl());
+ LOG.debug("Using Hipchat API URL: {}", endpoint.getConfiguration().hipChatUrl());
return endpoint;
}
diff --git a/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatConsumer.java b/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatConsumer.java
index 9df0183..b7e90df 100644
--- a/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatConsumer.java
+++ b/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatConsumer.java
@@ -31,12 +31,17 @@ import org.apache.camel.support.ScheduledPollConsumer;
import org.apache.camel.util.URISupport;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The Hipchat consumer consumes messages from a list of users.
*/
public class HipchatConsumer extends ScheduledPollConsumer {
public static final long DEFAULT_CONSUMER_DELAY = 5 * 1000;
+
+ private static final Logger LOG = LoggerFactory.getLogger(HipchatConsumer.class);
+
private static final MapType MAP_TYPE = TypeFactory.defaultInstance().constructMapType(Map.class, String.class, Object.class);
private static final ObjectMapper MAPPER = new ObjectMapper();
@@ -59,7 +64,7 @@ public class HipchatConsumer extends ScheduledPollConsumer {
private void processExchangeForUser(String user, Exchange exchange) throws Exception {
String urlPath = String.format(getMostRecentMessageUrl(), user);
- log.debug("Polling HipChat Api " + urlPath + " for new messages at " + Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTime());
+ LOG.debug("Polling HipChat Api " + urlPath + " for new messages at " + Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTime());
HttpGet httpGet = new HttpGet(getConfig().hipChatUrl() + urlPath);
CloseableHttpResponse response = executeGet(httpGet);
exchange.getIn().setHeader(HipchatConstants.FROM_USER, user);
@@ -69,7 +74,7 @@ public class HipchatConsumer extends ScheduledPollConsumer {
private void processApiResponse(Exchange exchange, CloseableHttpResponse response) throws Exception {
try {
Map<String, Object> jsonMap = MAPPER.readValue(response.getEntity().getContent(), MAP_TYPE);
- log.debug("Hipchat response " + response + ", json: " + MAPPER.writeValueAsString(jsonMap));
+ LOG.debug("Hipchat response " + response + ", json: " + MAPPER.writeValueAsString(jsonMap));
if (jsonMap != null && jsonMap.size() > 0) {
List<Map<String, Object>> items = (List<Map<String, Object>>) jsonMap.get(HipchatApiConstants.API_ITEMS);
if (items != null && items.size() > 0) {
@@ -77,7 +82,7 @@ public class HipchatConsumer extends ScheduledPollConsumer {
Map<String, Object> item = items.get(0);
String date = (String) item.get(HipchatApiConstants.API_DATE);
String message = (String) item.get(HipchatApiConstants.API_MESSAGE);
- log.debug("Setting exchange body: " + message + ", header " + HipchatConstants.MESSAGE_DATE + ": " + date);
+ LOG.debug("Setting exchange body: " + message + ", header " + HipchatConstants.MESSAGE_DATE + ": " + date);
exchange.getIn().setHeader(HipchatConstants.FROM_USER_RESPONSE_STATUS, response.getStatusLine());
exchange.getIn().setHeader(HipchatConstants.MESSAGE_DATE, date);
exchange.getIn().setBody(message);
diff --git a/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatProducer.java b/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatProducer.java
index 64057d7..d2140e8 100644
--- a/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatProducer.java
+++ b/components/camel-hipchat/src/main/java/org/apache/camel/component/hipchat/HipchatProducer.java
@@ -31,6 +31,9 @@ import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.camel.util.UnsafeUriCharactersEncoder.encodeHttpURI;
@@ -39,6 +42,8 @@ import static org.apache.camel.util.UnsafeUriCharactersEncoder.encodeHttpURI;
*/
public class HipchatProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(HipchatProducer.class);
+
private static final ObjectMapper MAPPER = new ObjectMapper();
private transient String hipchatProducerToString;
@@ -67,18 +72,18 @@ public class HipchatProducer extends DefaultProducer {
if (backGroundColor != null) {
jsonParam.put(HipchatApiConstants.API_MESSAGE_COLOR, backGroundColor);
}
- log.info("Sending message to room: " + room + ", " + MAPPER.writeValueAsString(jsonParam));
+ LOG.info("Sending message to room: " + room + ", " + MAPPER.writeValueAsString(jsonParam));
StatusLine statusLine = post(encodeHttpURI(urlPath), jsonParam);
- log.debug("Response status for send room message: {}", statusLine);
+ LOG.debug("Response status for send room message: {}", statusLine);
return statusLine;
}
private StatusLine sendUserMessage(String user, Exchange exchange) throws IOException, InvalidPayloadException {
String urlPath = String.format(getConfig().withAuthToken(HipchatApiConstants.URI_PATH_USER_MESSAGE), user);
Map<String, String> jsonParam = getCommonHttpPostParam(exchange);
- log.info("Sending message to user: " + user + ", " + MAPPER.writeValueAsString(jsonParam));
+ LOG.info("Sending message to user: " + user + ", " + MAPPER.writeValueAsString(jsonParam));
StatusLine statusLine = post(urlPath, jsonParam);
- log.debug("Response status for send user message: {}", statusLine);
+ LOG.debug("Response status for send user message: {}", statusLine);
return statusLine;
}
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
index 3e5f7e4..471d17d 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
@@ -66,6 +66,8 @@ import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.protocol.HttpContext;
import org.apache.http.ssl.SSLContexts;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Defines the HTTP Component
@@ -74,6 +76,8 @@ import org.apache.http.ssl.SSLContexts;
@Component("http,https")
public class HttpComponent extends HttpCommonComponent implements RestProducerFactory, SSLContextParametersAware {
+ private static final Logger LOG = LoggerFactory.getLogger(HttpComponent.class);
+
@Metadata(label = "advanced", description = "To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used.")
protected HttpClientConfigurer httpClientConfigurer;
@Metadata(label = "advanced", description = "To use a custom and shared HttpClientConnectionManager to manage connections."
@@ -270,7 +274,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
// create the endpoint and set the http uri to be null
String endpointUriString = endpointUri.toString();
- log.debug("Creating endpoint uri {}", endpointUriString);
+ LOG.debug("Creating endpoint uri {}", endpointUriString);
final HttpClientConnectionManager localConnectionManager = createConnectionManager(parameters, sslContextParameters);
HttpEndpoint endpoint = new HttpEndpoint(endpointUriString, this, clientBuilder, localConnectionManager, configurer);
@@ -393,7 +397,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
if (localConnectionsPerRoute > 0) {
answer.setDefaultMaxPerRoute(localConnectionsPerRoute);
}
- log.info("Created ClientConnectionManager {}", answer);
+ LOG.info("Created ClientConnectionManager {}", answer);
return answer;
}
@@ -652,7 +656,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
public void doStop() throws Exception {
// shutdown connection manager
if (clientConnectionManager != null) {
- log.info("Shutting down ClientConnectionManager: {}", clientConnectionManager);
+ LOG.info("Shutting down ClientConnectionManager: {}", clientConnectionManager);
clientConnectionManager.shutdown();
clientConnectionManager = null;
}
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
index 315dd54..86dc5a1 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
@@ -49,6 +49,8 @@ import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.pool.ConnPoolControl;
import org.apache.http.pool.PoolStats;
import org.apache.http.protocol.HttpContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* For calling out to external HTTP servers using Apache HTTP Client 4.x.
@@ -58,6 +60,8 @@ import org.apache.http.protocol.HttpContext;
@ManagedResource(description = "Managed HttpEndpoint")
public class HttpEndpoint extends HttpCommonEndpoint {
+ private static final Logger LOG = LoggerFactory.getLogger(HttpEndpoint.class);
+
@UriParam(label = "security", description = "To configure security using SSLContextParameters."
+ " Important: Only one instance of org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent."
+ " If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need.")
@@ -203,7 +207,7 @@ public class HttpEndpoint extends HttpCommonEndpoint {
if (scheme == null) {
scheme = HttpHelper.isSecureConnection(getEndpointUri()) ? "https" : "http";
}
- log.debug("CamelContext properties http.proxyHost, http.proxyPort, and http.proxyScheme detected. Using http proxy host: {} port: {} scheme: {}", host, port, scheme);
+ LOG.debug("CamelContext properties http.proxyHost, http.proxyPort, and http.proxyScheme detected. Using http proxy host: {} port: {} scheme: {}", host, port, scheme);
HttpHost proxy = new HttpHost(host, port, scheme);
clientBuilder.setProxy(proxy);
}
@@ -226,7 +230,7 @@ public class HttpEndpoint extends HttpCommonEndpoint {
clientBuilder.setDefaultCookieStore(new NoopCookieStore());
}
- log.debug("Setup the HttpClientBuilder {}", clientBuilder);
+ LOG.debug("Setup the HttpClientBuilder {}", clientBuilder);
return clientBuilder.build();
}
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
index 716be67..500a153 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
@@ -72,11 +72,16 @@ import org.apache.http.protocol.BasicHttpContext;
import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static org.apache.http.HttpHeaders.HOST;
public class HttpProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(HttpProducer.class);
+
private HttpClient httpClient;
private HttpContext httpContext;
private boolean throwException;
@@ -190,12 +195,12 @@ public class HttpProducer extends DefaultProducer {
// lets store the result in the output message.
HttpResponse httpResponse = null;
try {
- if (log.isDebugEnabled()) {
- log.debug("Executing http {} method: {}", httpRequest.getMethod(), httpRequest.getURI());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Executing http {} method: {}", httpRequest.getMethod(), httpRequest.getURI());
}
httpResponse = executeMethod(httpRequest);
int responseCode = httpResponse.getStatusLine().getStatusCode();
- log.debug("Http responseCode: {}", responseCode);
+ LOG.debug("Http responseCode: {}", responseCode);
if (!throwException) {
// if we do not use failed exception then populate response for all response codes
@@ -427,7 +432,7 @@ public class HttpProducer extends DefaultProducer {
}
throw ex;
} finally {
- IOHelper.close(is, "Extracting response body", log);
+ IOHelper.close(is, "Extracting response body", LOG);
}
}
@@ -459,14 +464,14 @@ public class HttpProducer extends DefaultProducer {
method = new HttpGetWithBodyMethod(url, requestEntity);
}
- log.trace("Using URL: {} with method: {}", url, method);
+ LOG.trace("Using URL: {} with method: {}", url, method);
if (methodToUse.isEntityEnclosing()) {
// only create entity for http payload if the HTTP method carries payload (such as POST)
HttpEntity requestEntity = createRequestEntity(exchange);
((HttpEntityEnclosingRequestBase) method).setEntity(requestEntity);
if (requestEntity != null && requestEntity.getContentType() == null) {
- log.debug("No Content-Type provided for URL: {} with exchange: {}", url, exchange);
+ LOG.debug("No Content-Type provided for URL: {} with exchange: {}", url, exchange);
}
}
diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/metrics/HystrixEventStreamService.java b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/metrics/HystrixEventStreamService.java
index c1b4aa3..9956e20 100644
--- a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/metrics/HystrixEventStreamService.java
+++ b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/metrics/HystrixEventStreamService.java
@@ -27,6 +27,8 @@ import org.apache.camel.api.management.ManagedOperation;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.component.hystrix.metrics.servlet.HystrixEventStreamServlet;
import org.apache.camel.support.service.ServiceSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* To gather hystrix metrics and offer the metrics over JMX and Java APIs.
@@ -37,6 +39,8 @@ import org.apache.camel.support.service.ServiceSupport;
@ManagedResource(description = "Managed Hystrix EventStreamService")
public class HystrixEventStreamService extends ServiceSupport implements StaticService, HystrixMetricsPoller.MetricsAsJsonPollerListener {
+ private static final Logger LOG = LoggerFactory.getLogger(HystrixEventStreamService.class);
+
public static final int METRICS_QUEUE_SIZE = 1000;
private int delay = 500;
@@ -109,7 +113,7 @@ public class HystrixEventStreamService extends ServiceSupport implements StaticS
@Override
protected void doStart() throws Exception {
- log.info("Starting HystrixMetricsPoller with delay: {} and queue size: {}", delay, queueSize);
+ LOG.info("Starting HystrixMetricsPoller with delay: {} and queue size: {}", delay, queueSize);
queue = new LinkedBlockingQueue<>(queueSize);
poller = new HystrixMetricsPoller(this, delay);
poller.start();
@@ -118,19 +122,19 @@ public class HystrixEventStreamService extends ServiceSupport implements StaticS
@Override
protected void doStop() throws Exception {
if (poller != null) {
- log.info("Shutting down HystrixMetricsPoller");
+ LOG.info("Shutting down HystrixMetricsPoller");
poller.shutdown();
}
}
@Override
public void handleJsonMetric(String json) {
- log.debug("handleJsonMetric: {}", json);
+ LOG.debug("handleJsonMetric: {}", json);
// ensure there is space on the queue by polling until at least single slot is free
int drain = queue.size() - queueSize + 1;
if (drain > 0) {
- log.debug("Draining queue to make room: {}", drain);
+ LOG.debug("Draining queue to make room: {}", drain);
for (int i = 0; i < drain; i++) {
queue.poll();
}
diff --git a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecComponent.java b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecComponent.java
index 51954dc..5ccb58b 100644
--- a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecComponent.java
+++ b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/AbstractIecComponent.java
@@ -25,11 +25,16 @@ import org.apache.camel.Endpoint;
import org.apache.camel.component.iec60870.client.ClientOptions;
import org.apache.camel.support.DefaultComponent;
import org.eclipse.neoscada.protocol.iec60870.ProtocolOptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import static java.util.Objects.requireNonNull;
public abstract class AbstractIecComponent<T1, T2 extends BaseOptions<T2>> extends DefaultComponent {
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractIecComponent.class);
+
private final Map<ConnectionId, T1> connections = new HashMap<>();
private final Class<T2> connectionOptionsClazz;
@@ -71,7 +76,7 @@ public abstract class AbstractIecComponent<T1, T2 extends BaseOptions<T2>> exten
@Override
protected Endpoint createEndpoint(final String uri, final String remaining, final Map<String, Object> parameters) throws Exception {
- log.info("Create endpoint - uri: {}, remaining: {}, parameters: {}", uri, remaining, parameters);
+ LOG.info("Create endpoint - uri: {}, remaining: {}, parameters: {}", uri, remaining, parameters);
final T1 connection = lookupConnection(uri, parameters);
final ObjectAddress address = parseAddress(uri);
@@ -121,7 +126,7 @@ public abstract class AbstractIecComponent<T1, T2 extends BaseOptions<T2>> exten
private T1 lookupConnection(final String fullUri, final Map<String, Object> parameters) throws Exception {
- log.debug("parse connection - '{}'", fullUri);
+ LOG.debug("parse connection - '{}'", fullUri);
if (fullUri == null || fullUri.isEmpty()) {
throw new IllegalArgumentException("Invalid URI: " + fullUri);
@@ -129,18 +134,18 @@ public abstract class AbstractIecComponent<T1, T2 extends BaseOptions<T2>> exten
final ConnectionId id = parseConnectionId(fullUri, parameters);
- log.debug("parse connection - fullUri: {} -> {}", fullUri, id);
+ LOG.debug("parse connection - fullUri: {} -> {}", fullUri, id);
synchronized (this) {
- log.debug("Locating connection - {}", id);
+ LOG.debug("Locating connection - {}", id);
T1 connection = this.connections.get(id);
- log.debug("Result - {} -> {}", id, connection);
+ LOG.debug("Result - {} -> {}", id, connection);
if (connection == null) {
final T2 options = parseOptions(id, parameters);
- log.debug("Creating new connection: {}", options);
+ LOG.debug("Creating new connection: {}", options);
connection = createConnection(id, options);
this.connections.put(id, connection);
diff --git a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientComponent.java b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientComponent.java
index 66fd0e2..acf4c27 100644
--- a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientComponent.java
+++ b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientComponent.java
@@ -52,8 +52,6 @@ public class ClientComponent extends AbstractIecComponent<ClientConnectionMultip
@Override
protected ClientConnectionMultiplexor createConnection(final ConnectionId id, final ClientOptions options) {
- log.debug("Create new connection - id: {}", id);
-
return new ClientConnectionMultiplexor(new ClientConnection(id.getHost(), id.getPort(), options));
}
diff --git a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConsumer.java b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConsumer.java
index 70fe201..43a80d2 100644
--- a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConsumer.java
+++ b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConsumer.java
@@ -25,9 +25,13 @@ import org.apache.camel.component.iec60870.ObjectAddress;
import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.support.DefaultMessage;
import org.eclipse.neoscada.protocol.iec60870.asdu.types.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ClientConsumer extends DefaultConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(ClientConsumer.class);
+
private final ClientConnection connection;
private final ClientEndpoint endpoint;
@@ -54,9 +58,9 @@ public class ClientConsumer extends DefaultConsumer {
try {
final Exchange exchange = getEndpoint().createExchange();
exchange.setIn(mapMessage(value));
- getAsyncProcessor().process(exchange);
+ getProcessor().process(exchange);
} catch (final Exception e) {
- log.debug("Failed to process message", e);
+ LOG.debug("Failed to process message", e);
}
}
diff --git a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerComponent.java b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerComponent.java
index 64274c4..2e0b66a 100644
--- a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerComponent.java
+++ b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerComponent.java
@@ -48,8 +48,6 @@ public class ServerComponent extends AbstractIecComponent<ServerConnectionMultip
@Override
protected ServerConnectionMultiplexor createConnection(final ConnectionId id, final ServerOptions options) {
- log.debug("Create new server - id: {}", id);
-
try {
return new ServerConnectionMultiplexor(new ServerInstance(id.getHost(), id.getPort(), options));
} catch (final UnknownHostException e) {
diff --git a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerConsumer.java b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerConsumer.java
index be11ca3..2444361 100644
--- a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerConsumer.java
+++ b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/server/ServerConsumer.java
@@ -26,9 +26,13 @@ import org.apache.camel.component.iec60870.ObjectAddress;
import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.support.DefaultMessage;
import org.eclipse.neoscada.protocol.iec60870.server.data.model.WriteModel.Request;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ServerConsumer extends DefaultConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(ServerConsumer.class);
+
private final ServerInstance server;
private final ServerEndpoint endpoint;
@@ -73,7 +77,7 @@ public class ServerConsumer extends DefaultConsumer {
// we failed triggering the process
- log.debug("Failed to process message", e);
+ LOG.debug("Failed to process message", e);
// create a future
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheContinuousQueryConsumer.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheContinuousQueryConsumer.java
index 4150e80..15c762e 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheContinuousQueryConsumer.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/cache/IgniteCacheContinuousQueryConsumer.java
@@ -31,12 +31,16 @@ import org.apache.camel.support.DefaultConsumer;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.query.ContinuousQuery;
import org.apache.ignite.cache.query.QueryCursor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A consumer that generates {@link Exchange}s for items received from a continuous query.
*/
public class IgniteCacheContinuousQueryConsumer extends DefaultConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(IgniteCacheContinuousQueryConsumer.class);
+
private IgniteCacheEndpoint endpoint;
private IgniteCache<Object, Object> cache;
@@ -55,18 +59,18 @@ public class IgniteCacheContinuousQueryConsumer extends DefaultConsumer {
launchContinuousQuery();
- log.info("Started Ignite Cache Continuous Query consumer for cache {} with query: {}.", cache.getName(), endpoint.getQuery());
+ LOG.info("Started Ignite Cache Continuous Query consumer for cache {} with query: {}.", cache.getName(), endpoint.getQuery());
maybeFireExistingQueryResults();
}
private void maybeFireExistingQueryResults() {
if (!endpoint.isFireExistingQueryResults()) {
- log.info(String.format("Skipping existing cache results for cache name = %s.", endpoint.getCacheName()));
+ LOG.info(String.format("Skipping existing cache results for cache name = %s.", endpoint.getCacheName()));
return;
}
- log.info(String.format("Processing existing cache results for cache name = %s.", endpoint.getCacheName()));
+ LOG.info(String.format("Processing existing cache results for cache name = %s.", endpoint.getCacheName()));
for (Entry<Object, Object> entry : cursor) {
Exchange exchange = createExchange(entry.getValue());
@@ -94,8 +98,8 @@ public class IgniteCacheContinuousQueryConsumer extends DefaultConsumer {
continuousQuery.setLocalListener(new CacheEntryUpdatedListener<Object, Object>() {
@Override
public void onUpdated(Iterable<CacheEntryEvent<? extends Object, ? extends Object>> events) throws CacheEntryListenerException {
- if (log.isTraceEnabled()) {
- log.info("Processing Continuous Query event(s): {}.", events);
+ if (LOG.isTraceEnabled()) {
+ LOG.info("Processing Continuous Query event(s): {}.", events);
}
if (!endpoint.isOneExchangePerUpdate()) {
@@ -122,7 +126,7 @@ public class IgniteCacheContinuousQueryConsumer extends DefaultConsumer {
cursor.close();
- log.info("Stopped Ignite Cache Continuous Query consumer for cache {} with query: {}.", cache.getName(), endpoint.getQuery());
+ LOG.info("Stopped Ignite Cache Continuous Query consumer for cache {} with query: {}.", cache.getName(), endpoint.getQuery());
}
private void fireSingleExchange(CacheEntryEvent<? extends Object, ? extends Object> entry) {
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsConsumer.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsConsumer.java
index d0177a8..82482ba 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsConsumer.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsConsumer.java
@@ -28,12 +28,16 @@ import org.apache.camel.support.DefaultConsumer;
import org.apache.ignite.IgniteEvents;
import org.apache.ignite.events.Event;
import org.apache.ignite.lang.IgnitePredicate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Ignite Events consumer.
*/
public class IgniteEventsConsumer extends DefaultConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(IgniteEventsConsumer.class);
+
private IgniteEventsEndpoint endpoint;
private IgniteEvents events;
private int[] eventTypes = new int[0];
@@ -47,8 +51,8 @@ public class IgniteEventsConsumer extends DefaultConsumer {
Message in = exchange.getIn();
in.setBody(event);
try {
- if (log.isTraceEnabled()) {
- log.trace("Processing Ignite Event: {}.", event);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Processing Ignite Event: {}.", event);
}
getAsyncProcessor().process(exchange, new AsyncCallback() {
@Override
@@ -57,7 +61,7 @@ public class IgniteEventsConsumer extends DefaultConsumer {
}
});
} catch (Exception e) {
- log.error(String.format("Exception while processing Ignite Event: %s.", event), e);
+ LOG.error(String.format("Exception while processing Ignite Event: %s.", event), e);
}
return true;
}
@@ -82,7 +86,7 @@ public class IgniteEventsConsumer extends DefaultConsumer {
events.localListen(predicate, eventTypes);
- log.info("Started local Ignite Events consumer for events: {}.", Arrays.asList(eventTypes));
+ LOG.info("Started local Ignite Events consumer for events: {}.", Arrays.asList(eventTypes));
}
@Override
@@ -91,7 +95,7 @@ public class IgniteEventsConsumer extends DefaultConsumer {
events.stopLocalListen(predicate, eventTypes);
- log.info("Stopped local Ignite Events consumer for events: {}.", Arrays.asList(eventTypes));
+ LOG.info("Stopped local Ignite Events consumer for events: {}.", Arrays.asList(eventTypes));
}
}
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsEndpoint.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsEndpoint.java
index b173b09..586af7c 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsEndpoint.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/events/IgniteEventsEndpoint.java
@@ -36,6 +36,8 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteEvents;
import org.apache.ignite.cluster.ClusterGroup;
import org.apache.ignite.events.EventType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The Ignite Events endpoint is one of camel-ignite endpoints which allows you to
@@ -48,6 +50,8 @@ import org.apache.ignite.events.EventType;
consumerOnly = true)
public class IgniteEventsEndpoint extends AbstractIgniteEndpoint {
+ private static final Logger LOG = LoggerFactory.getLogger(IgniteEventsEndpoint.class);
+
@UriPath
private String endpointId;
@@ -73,7 +77,7 @@ public class IgniteEventsEndpoint extends AbstractIgniteEndpoint {
IgniteEventsConsumer consumer = new IgniteEventsConsumer(this, processor, events);
configureConsumer(consumer);
- log.info("Created Ignite Events consumer for event types: {}.", events);
+ LOG.info("Created Ignite Events consumer for event types: {}.", events);
return consumer;
}
@@ -82,11 +86,11 @@ public class IgniteEventsEndpoint extends AbstractIgniteEndpoint {
Ignite ignite = ignite();
IgniteEvents events;
if (clusterGroupExpression == null) {
- log.info("Ignite Events endpoint for event types {} using no Cluster Group.", this.events);
+ LOG.info("Ignite Events endpoint for event types {} using no Cluster Group.", this.events);
events = ignite.events();
} else {
ClusterGroup group = clusterGroupExpression.getClusterGroup(ignite);
- log.info("Ignite Events endpoint for event types {} using Cluster Group: {}.", this.events, group);
+ LOG.info("Ignite Events endpoint for event types {} using Cluster Group: {}.", this.events, group);
events = ignite.events(group);
}
return events;
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java
index d05dafb..d3e5b98 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/idgen/IgniteIdGenEndpoint.java
@@ -28,6 +28,8 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.util.ObjectHelper;
import org.apache.ignite.IgniteAtomicSequence;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The Ignite ID Generator endpoint is one of camel-ignite endpoints which allows you to interact with
@@ -37,6 +39,8 @@ import org.apache.ignite.IgniteAtomicSequence;
@UriEndpoint(firstVersion = "2.17.0", scheme = "ignite-idgen", title = "Ignite ID Generator", syntax = "ignite-idgen:name", label = "nosql,cache,compute", producerOnly = true)
public class IgniteIdGenEndpoint extends AbstractIgniteEndpoint {
+ private static final Logger LOG = LoggerFactory.getLogger(IgniteIdGenEndpoint.class);
+
@UriPath
@Metadata(required = true)
private String name;
@@ -63,7 +67,7 @@ public class IgniteIdGenEndpoint extends AbstractIgniteEndpoint {
if (atomicSeq == null) {
atomicSeq = ignite().atomicSequence(name, initialValue, true);
- log.info("Created AtomicSequence of ID Generator with name {}.", name);
+ LOG.info("Created AtomicSequence of ID Generator with name {}.", name);
}
if (batchSize != null) {
diff --git a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/messaging/IgniteMessagingConsumer.java b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/messaging/IgniteMessagingConsumer.java
index 8065b0d..3fd767c 100644
--- a/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/messaging/IgniteMessagingConsumer.java
+++ b/components/camel-ignite/src/main/java/org/apache/camel/component/ignite/messaging/IgniteMessagingConsumer.java
@@ -26,12 +26,16 @@ import org.apache.camel.component.ignite.IgniteConstants;
import org.apache.camel.support.DefaultConsumer;
import org.apache.ignite.IgniteMessaging;
import org.apache.ignite.lang.IgniteBiPredicate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Ignite Messaging consumer.
*/
public class IgniteMessagingConsumer extends DefaultConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(IgniteMessagingConsumer.class);
+
private IgniteMessagingEndpoint endpoint;
private IgniteMessaging messaging;
@@ -46,12 +50,12 @@ public class IgniteMessagingConsumer extends DefaultConsumer {
in.setHeader(IgniteConstants.IGNITE_MESSAGING_TOPIC, endpoint.getTopic());
in.setHeader(IgniteConstants.IGNITE_MESSAGING_UUID, uuid);
try {
- if (log.isTraceEnabled()) {
- log.trace("Processing Ignite message for subscription {} with payload {}.", uuid, payload);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Processing Ignite message for subscription {} with payload {}.", uuid, payload);
}
getProcessor().process(exchange);
} catch (Exception e) {
- log.error(String.format("Exception while processing Ignite Message from topic %s", endpoint.getTopic()), e);
+ LOG.error(String.format("Exception while processing Ignite Message from topic %s", endpoint.getTopic()), e);
}
return true;
}
@@ -69,7 +73,7 @@ public class IgniteMessagingConsumer extends DefaultConsumer {
messaging.localListen(endpoint.getTopic(), predicate);
- log.info("Started Ignite Messaging consumer for topic {}.", endpoint.getTopic());
+ LOG.info("Started Ignite Messaging consumer for topic {}.", endpoint.getTopic());
}
@Override
@@ -78,7 +82,7 @@ public class IgniteMessagingConsumer extends DefaultConsumer {
messaging.stopLocalListen(endpoint.getTopic(), predicate);
- log.info("Stopped Ignite Messaging consumer for topic {}.", endpoint.getTopic());
+ LOG.info("Stopped Ignite Messaging consumer for topic {}.", endpoint.getTopic());
}
}
diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanComponent.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanComponent.java
index 2d404a0..91ada25 100644
--- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanComponent.java
+++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanComponent.java
@@ -27,9 +27,14 @@ import org.apache.camel.support.DefaultComponent;
import org.infinispan.commons.api.BasicCacheContainer;
import org.infinispan.configuration.global.GlobalConfigurationBuilder;
import org.infinispan.manager.DefaultCacheManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Component("infinispan")
public class InfinispanComponent extends DefaultComponent {
+
+ private static final Logger LOG = LoggerFactory.getLogger(InfinispanComponent.class);
+
@Metadata(description = "Default configuration")
private InfinispanConfiguration configuration;
@Metadata(description = "Default Cache container")
@@ -81,7 +86,7 @@ public class InfinispanComponent extends DefaultComponent {
new org.infinispan.configuration.cache.ConfigurationBuilder().build());
setCacheFromComponent = false;
- log.debug("Default cacheContainer has been created");
+ LOG.debug("Default cacheContainer has been created");
}
conf.setCacheContainer(cacheContainer);
diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConsumer.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConsumer.java
index 5dc7066..c6d2588 100644
--- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConsumer.java
+++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConsumer.java
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class InfinispanConsumer extends DefaultConsumer {
- private static final transient Logger LOGGER = LoggerFactory.getLogger(InfinispanProducer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(InfinispanProducer.class);
private final InfinispanConfiguration configuration;
private final InfinispanManager manager;
private final String cacheName;
@@ -65,7 +65,7 @@ public class InfinispanConsumer extends DefaultConsumer {
try {
getProcessor().process(exchange);
} catch (Exception e) {
- LOGGER.error("Error processing event ", e);
+ LOG.error("Error processing event ", e);
}
}
diff --git a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbEndpoint.java b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbEndpoint.java
index d1f5c7c..cb69a11 100644
--- a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbEndpoint.java
+++ b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbEndpoint.java
@@ -26,6 +26,8 @@ import org.apache.camel.spi.UriPath;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.DefaultEndpoint;
import org.influxdb.InfluxDB;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The influxdb component allows you to interact with <a href="https://influxdata.com/time-series-platform/influxdb/">InfluxDB</a>, a time series database.
@@ -33,6 +35,8 @@ import org.influxdb.InfluxDB;
@UriEndpoint(firstVersion = "2.18.0", scheme = "influxdb", title = "InfluxDB", syntax = "influxdb:connectionBean", label = "database", producerOnly = true)
public class InfluxDbEndpoint extends DefaultEndpoint {
+ private static final Logger LOG = LoggerFactory.getLogger(InfluxDbEndpoint.class);
+
private InfluxDB influxDB;
@UriPath
@@ -66,7 +70,7 @@ public class InfluxDbEndpoint extends DefaultEndpoint {
@Override
protected void doStart() throws Exception {
influxDB = CamelContextHelper.mandatoryLookup(getCamelContext(), connectionBean, InfluxDB.class);
- log.debug("Resolved the connection with the name {} as {}", connectionBean, influxDB);
+ LOG.debug("Resolved the connection with the name {} as {}", connectionBean, influxDB);
super.doStart();
}
diff --git a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbProducer.java b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbProducer.java
index 29ab60e..e2ab8e6 100644
--- a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbProducer.java
+++ b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbProducer.java
@@ -27,6 +27,8 @@ import org.influxdb.dto.Point;
import org.influxdb.dto.Pong;
import org.influxdb.dto.Query;
import org.influxdb.dto.QueryResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Producer for the InfluxDB components
@@ -34,6 +36,8 @@ import org.influxdb.dto.QueryResult;
*/
public class InfluxDbProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(InfluxDbProducer.class);
+
InfluxDbEndpoint endpoint;
InfluxDB connection;
@@ -79,10 +83,10 @@ public class InfluxDbProducer extends DefaultProducer {
Point p = exchange.getIn().getMandatoryBody(Point.class);
try {
- log.debug("Writing point {}", p.lineProtocol());
+ LOG.debug("Writing point {}", p.lineProtocol());
if (!connection.databaseExists(dataBaseName)) {
- log.debug("Database {} doesn't exist. Creating it...", dataBaseName);
+ LOG.debug("Database {} doesn't exist. Creating it...", dataBaseName);
connection.createDatabase(dataBaseName);
}
connection.write(dataBaseName, retentionPolicy, p);
@@ -93,7 +97,7 @@ public class InfluxDbProducer extends DefaultProducer {
BatchPoints batchPoints = exchange.getIn().getMandatoryBody(BatchPoints.class);
try {
- log.debug("Writing BatchPoints {}", batchPoints.lineProtocol());
+ LOG.debug("Writing BatchPoints {}", batchPoints.lineProtocol());
connection.write(batchPoints);
} catch (Exception ex) {
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
index 47e2be9..9376297 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
@@ -28,6 +28,8 @@ import org.apache.camel.support.jsse.SSLContextParameters;
import org.schwering.irc.lib.IRCConnection;
import org.schwering.irc.lib.IRCEventListener;
import org.schwering.irc.lib.ssl.SSLIRCConnection;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Defines the <a href="http://camel.apache.org/irc.html">IRC Component</a>
@@ -35,6 +37,8 @@ import org.schwering.irc.lib.ssl.SSLIRCConnection;
@Component("irc,ircs")
public class IrcComponent extends DefaultComponent implements SSLContextParametersAware {
+ private static final Logger LOG = LoggerFactory.getLogger(IrcComponent.class);
+
private final transient Map<String, IRCConnection> connectionCache = new HashMap<>();
@Metadata(label = "security", defaultValue = "false")
@@ -57,8 +61,8 @@ public class IrcComponent extends DefaultComponent implements SSLContextParamete
public synchronized IRCConnection getIRCConnection(IrcConfiguration configuration) {
final IRCConnection connection;
if (connectionCache.containsKey(configuration.getCacheKey())) {
- if (log.isDebugEnabled()) {
- log.debug("Returning Cached Connection to {}:{}", configuration.getHostname(), configuration.getNickname());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Returning Cached Connection to {}:{}", configuration.getHostname(), configuration.getNickname());
}
connection = connectionCache.get(configuration.getCacheKey());
} else {
@@ -74,8 +78,8 @@ public class IrcComponent extends DefaultComponent implements SSLContextParamete
if (configuration.getUsingSSL()) {
- if (log.isDebugEnabled()) {
- log.debug("Creating SSL Connection to {} destination(s): {} nick: {} user: {}",
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Creating SSL Connection to {} destination(s): {} nick: {} user: {}",
new Object[]{configuration.getHostname(), configuration.getSpaceSeparatedChannelNames(), configuration.getNickname(), configuration.getUsername()});
}
@@ -96,8 +100,8 @@ public class IrcComponent extends DefaultComponent implements SSLContextParamete
conn = sconn;
}
} else {
- if (log.isDebugEnabled()) {
- log.debug("Creating Connection to {} destination(s): {} nick: {} user: {}",
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Creating Connection to {} destination(s): {} nick: {} user: {}",
new Object[]{configuration.getHostname(), configuration.getSpaceSeparatedChannelNames(), configuration.getNickname(), configuration.getUsername()});
}
@@ -108,8 +112,8 @@ public class IrcComponent extends DefaultComponent implements SSLContextParamete
conn.setColors(configuration.isColors());
conn.setPong(true);
- if (log.isDebugEnabled()) {
- log.debug("Adding IRC event logging listener");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Adding IRC event logging listener");
ircLogger = createIrcLogger(configuration.getHostname());
conn.addIRCEventListener(ircLogger);
}
@@ -127,7 +131,7 @@ public class IrcComponent extends DefaultComponent implements SSLContextParamete
connection.doQuit();
connection.close();
} catch (Exception e) {
- log.warn("Error during closing connection.", e);
+ LOG.warn("Error during closing connection.", e);
}
}
@@ -143,7 +147,7 @@ public class IrcComponent extends DefaultComponent implements SSLContextParamete
}
protected IRCEventListener createIrcLogger(String hostname) {
- return new IrcLogger(log, hostname);
+ return new IrcLogger(LOG, hostname);
}
@Override
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java
index 4292219..596da1c 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java
@@ -24,9 +24,13 @@ import org.schwering.irc.lib.IRCConnection;
import org.schwering.irc.lib.IRCEventAdapter;
import org.schwering.irc.lib.IRCModeParser;
import org.schwering.irc.lib.IRCUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class IrcConsumer extends DefaultConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(IrcConsumer.class);
+
private final IrcConfiguration configuration;
private final IrcEndpoint endpoint;
private final IRCConnection connection;
@@ -43,7 +47,7 @@ public class IrcConsumer extends DefaultConsumer {
protected void doStop() throws Exception {
if (connection != null) {
for (IrcChannel channel : endpoint.getConfiguration().getChannelList()) {
- log.debug("Parting: {}", channel);
+ LOG.debug("Parting: {}", channel);
connection.doPart(channel.getName());
}
connection.removeIRCEventListener(listener);
@@ -57,7 +61,7 @@ public class IrcConsumer extends DefaultConsumer {
listener = getListener();
connection.addIRCEventListener(listener);
- log.debug("Sleeping for {} seconds before sending commands.", configuration.getCommandTimeout() / 1000);
+ LOG.debug("Sleeping for {} seconds before sending commands.", configuration.getCommandTimeout() / 1000);
// sleep for a few seconds as the server sometimes takes a moment to fully connect, print banners, etc after connection established
try {
Thread.sleep(configuration.getCommandTimeout());
@@ -65,7 +69,7 @@ public class IrcConsumer extends DefaultConsumer {
// ignore
}
if (ObjectHelper.isNotEmpty(configuration.getNickPassword())) {
- log.debug("Identifying and enforcing nick with NickServ.");
+ LOG.debug("Identifying and enforcing nick with NickServ.");
// Identify nick and enforce, https://meta.wikimedia.org/wiki/IRC/Instructions#Register_your_nickname.2C_identify.2C_and_enforce
connection.doPrivmsg("nickserv", "identify " + configuration.getNickPassword());
connection.doPrivmsg("nickserv", "set enforce on");
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
index 3b2c860f..302e6c4 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
@@ -28,6 +28,8 @@ import org.schwering.irc.lib.IRCConnection;
import org.schwering.irc.lib.IRCConstants;
import org.schwering.irc.lib.IRCModeParser;
import org.schwering.irc.lib.IRCUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The irc component implements an <a href="https://en.wikipedia.org/wiki/Internet_Relay_Chat">IRC</a> (Internet Relay Chat) transport.
@@ -41,6 +43,8 @@ import org.schwering.irc.lib.IRCUser;
label = "chat")
public class IrcEndpoint extends DefaultEndpoint {
+ private static final Logger LOG = LoggerFactory.getLogger(IrcEndpoint.class);
+
@UriParam
private IrcConfiguration configuration;
private IrcBinding binding;
@@ -174,9 +178,9 @@ public class IrcEndpoint extends DefaultEndpoint {
// hackish but working approach to prevent an endless loop. Abort after 4 nick attempts.
if (nick.endsWith("----")) {
- log.error("Unable to set nick: {} disconnecting", nick);
+ LOG.error("Unable to set nick: {} disconnecting", nick);
} else {
- log.warn("Unable to set nick: " + nick + " Retrying with " + nick + "-");
+ LOG.warn("Unable to set nick: " + nick + " Retrying with " + nick + "-");
connection.doNick(nick);
// if the nick failure was doing startup channels weren't joined. So join
// the channels now. It's a no-op if the channels are already joined.
@@ -205,13 +209,13 @@ public class IrcEndpoint extends DefaultEndpoint {
String key = channel.getKey();
if (ObjectHelper.isNotEmpty(key)) {
- if (log.isDebugEnabled()) {
- log.debug("Joining: {} using {} with secret key", channel, connection.getClass().getName());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Joining: {} using {} with secret key", channel, connection.getClass().getName());
}
connection.doJoin(chn, key);
} else {
- if (log.isDebugEnabled()) {
- log.debug("Joining: {} using {}", channel, connection.getClass().getName());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Joining: {} using {}", channel, connection.getClass().getName());
}
connection.doJoin(chn);
}
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java
index fd2f1bb..c0858e4 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcProducer.java
@@ -22,12 +22,16 @@ import org.apache.camel.support.DefaultProducer;
import org.schwering.irc.lib.IRCConnection;
import org.schwering.irc.lib.IRCEventAdapter;
import org.schwering.irc.lib.IRCUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class IrcProducer extends DefaultProducer {
public static final String[] COMMANDS = new String[] {"AWAY", "INVITE", "ISON", "JOIN", "KICK", "LIST", "NAMES",
"PRIVMSG", "MODE", "NICK", "NOTICE", "PART", "PONG", "QUIT", "TOPIC", "WHO", "WHOIS", "WHOWAS", "USERHOST"};
+ private static final Logger LOG = LoggerFactory.getLogger(IrcProducer.class);
+
private final IrcConfiguration configuration;
private IRCConnection connection;
private IrcEndpoint endpoint;
@@ -51,14 +55,14 @@ public class IrcProducer extends DefaultProducer {
if (msg != null) {
if (isMessageACommand(msg)) {
- log.debug("Sending command: {}", msg);
+ LOG.debug("Sending command: {}", msg);
connection.send(msg);
} else if (sendTo != null) {
- log.debug("Sending to: {} message: {}", sendTo, msg);
+ LOG.debug("Sending to: {} message: {}", sendTo, msg);
connection.doPrivmsg(sendTo, msg);
} else {
for (IrcChannel channel : endpoint.getConfiguration().getChannelList()) {
- log.debug("Sending to: {} message: {}", channel, msg);
+ LOG.debug("Sending to: {} message: {}", channel, msg);
connection.doPrivmsg(channel.getName(), msg);
}
}
@@ -70,7 +74,7 @@ public class IrcProducer extends DefaultProducer {
super.doStart();
listener = getListener();
connection.addIRCEventListener(listener);
- log.debug("Sleeping for {} seconds before sending commands.", configuration.getCommandTimeout() / 1000);
+ LOG.debug("Sleeping for {} seconds before sending commands.", configuration.getCommandTimeout() / 1000);
// sleep for a few seconds as the server sometimes takes a moment to fully connect, print banners, etc after connection established
try {
Thread.sleep(configuration.getCommandTimeout());
@@ -84,7 +88,7 @@ public class IrcProducer extends DefaultProducer {
protected void doStop() throws Exception {
if (connection != null) {
for (IrcChannel channel : endpoint.getConfiguration().getChannelList()) {
- log.debug("Parting: {}", channel);
+ LOG.debug("Parting: {}", channel);
connection.doPart(channel.getName());
}
connection.removeIRCEventListener(listener);
diff --git a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConsumer.java b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConsumer.java
index 414edaf..89350bb 100644
--- a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConsumer.java
+++ b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConsumer.java
@@ -31,12 +31,16 @@ import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.ScheduledBatchPollingConsumer;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The IronMQ consumer.
*/
public class IronMQConsumer extends ScheduledBatchPollingConsumer {
+ private static final Logger LOG = LoggerFactory.getLogger(IronMQConsumer.class);
+
private final io.iron.ironmq.Queue ironQueue;
public IronMQConsumer(Endpoint endpoint, Processor processor, io.iron.ironmq.Queue ironQueue) {
@@ -51,15 +55,15 @@ public class IronMQConsumer extends ScheduledBatchPollingConsumer {
pendingExchanges = 0;
try {
Messages messages = null;
- log.trace("Receiving messages with request [messagePerPoll {}, timeout {}]...", getMaxMessagesPerPoll(), getEndpoint().getConfiguration().getTimeout());
+ LOG.trace("Receiving messages with request [messagePerPoll {}, timeout {}]...", getMaxMessagesPerPoll(), getEndpoint().getConfiguration().getTimeout());
messages = this.ironQueue.reserve(getMaxMessagesPerPoll(), getEndpoint().getConfiguration().getTimeout(), getEndpoint().getConfiguration().getWait());
- log.trace("Received {} messages", messages.getSize());
+ LOG.trace("Received {} messages", messages.getSize());
Queue<Exchange> exchanges = createExchanges(messages.getMessages());
int noProcessed = processBatch(CastUtils.cast(exchanges));
// delete all processed messages in one batch;
if (getEndpoint().getConfiguration().isBatchDelete()) {
- log.trace("Batch deleting {} messages", messages.getSize());
+ LOG.trace("Batch deleting {} messages", messages.getSize());
this.ironQueue.deleteMessages(messages);
}
return noProcessed;
@@ -69,7 +73,7 @@ public class IronMQConsumer extends ScheduledBatchPollingConsumer {
}
protected Queue<Exchange> createExchanges(Message[] messages) {
- log.trace("Received {} messages in this poll", messages.length);
+ LOG.trace("Received {} messages in this poll", messages.length);
Queue<Exchange> answer = new LinkedList<>();
for (Message message : messages) {
@@ -116,7 +120,7 @@ public class IronMQConsumer extends ScheduledBatchPollingConsumer {
});
}
- log.trace("Processing exchange [{}]...", exchange);
+ LOG.trace("Processing exchange [{}]...", exchange);
getProcessor().process(exchange);
}
@@ -131,9 +135,9 @@ public class IronMQConsumer extends ScheduledBatchPollingConsumer {
*/
protected void processCommit(Exchange exchange, String messageid, String reservationId) {
try {
- log.trace("Deleting message with messageId {} and reservationId {}...", messageid, reservationId);
+ LOG.trace("Deleting message with messageId {} and reservationId {}...", messageid, reservationId);
this.ironQueue.deleteMessage(messageid, reservationId);
- log.trace("Message deleted");
+ LOG.trace("Message deleted");
} catch (Exception e) {
getExceptionHandler().handleException("Error occurred during delete of message. This exception is ignored.", exchange, e);
}
@@ -147,9 +151,9 @@ public class IronMQConsumer extends ScheduledBatchPollingConsumer {
protected void processRollback(Exchange exchange) {
Exception cause = exchange.getException();
if (cause != null) {
- log.warn("Exchange failed, so rolling back message status: {}", exchange, cause);
+ LOG.warn("Exchange failed, so rolling back message status: {}", exchange, cause);
} else {
- log.warn("Exchange failed, so rolling back message status: {}", exchange);
+ LOG.warn("Exchange failed, so rolling back message status: {}", exchange);
}
}
diff --git a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQEndpoint.java b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQEndpoint.java
index b413251..56fdd2f 100644
--- a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQEndpoint.java
+++ b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQEndpoint.java
@@ -30,6 +30,8 @@ import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.DefaultScheduledPollConsumerScheduler;
import org.apache.camel.support.ScheduledPollEndpoint;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The ironmq provides integration with <a href="https://www.iron.io/">IronMQ</a> an elastic and durable hosted message queue as a service.
@@ -37,6 +39,8 @@ import org.apache.camel.support.ScheduledPollEndpoint;
@UriEndpoint(firstVersion = "2.17.0", scheme = "ironmq", syntax = "ironmq:queueName", title = "IronMQ", label = "cloud,messaging")
public class IronMQEndpoint extends ScheduledPollEndpoint {
+ private static final Logger LOG = LoggerFactory.getLogger(IronMQEndpoint.class);
+
@UriParam
private IronMQConfiguration configuration;
@@ -117,7 +121,7 @@ public class IronMQEndpoint extends ScheduledPollEndpoint {
cloud = new Cloud(configuration.getIronMQCloud());
} catch (MalformedURLException e) {
cloud = Cloud.ironAWSUSEast;
- log.warn("Unable to parse ironMQCloud {} will use {}", configuration.getIronMQCloud(), cloud.getHost());
+ LOG.warn("Unable to parse ironMQCloud {} will use {}", configuration.getIronMQCloud(), cloud.getHost());
}
client = new Client(configuration.getProjectId(), configuration.getToken(), cloud);
return client;
diff --git a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQProducer.java b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQProducer.java
index 61e61e1..d1d9d90 100644
--- a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQProducer.java
+++ b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQProducer.java
@@ -21,12 +21,16 @@ import org.apache.camel.Exchange;
import org.apache.camel.InvalidPayloadException;
import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The IronMQ producer.
*/
public class IronMQProducer extends DefaultProducer {
+ private static final Logger LOG = LoggerFactory.getLogger(IronMQProducer.class);
+
private final Queue ironQueue;
public IronMQProducer(IronMQEndpoint endpoint, Queue ironQueue) {
@@ -52,8 +56,8 @@ public class IronMQProducer extends DefaultProducer {
} else {
throw new InvalidPayloadException(exchange, String.class);
}
- log.trace("Send request [{}] from exchange [{}]...", body, exchange);
- log.trace("Received messageId [{}]", messageId);
+ LOG.trace("Send request [{}] from exchange [{}]...", body, exchange);
+ LOG.trace("Received messageId [{}]", messageId);
Message message = getMessageForResponse(exchange);
message.setHeader(IronMQConstants.MESSAGE_ID, messageId);
}
diff --git a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
index 2c50391..505ef69 100644
--- a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
+++ b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
@@ -44,6 +44,8 @@ import org.apache.camel.spi.annotations.Dataformat;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.ObjectHelper;
import org.apache.camel.support.service.ServiceSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A <a href="http://camel.apache.org/data-format.html">data format</a>
@@ -53,6 +55,8 @@ import org.apache.camel.support.service.ServiceSupport;
@Dataformat("json-jackson")
public class JacksonDataFormat extends ServiceSupport implements DataFormat, DataFormatName, CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(JacksonDataFormat.class);
+
private CamelContext camelContext;
private ObjectMapper objectMapper;
private boolean useDefaultObjectMapper = true;
@@ -498,18 +502,18 @@ public class JacksonDataFormat extends ServiceSupport implements DataFormat, Dat
Set<ObjectMapper> set = camelContext.getRegistry().findByType(ObjectMapper.class);
if (set.size() == 1) {
objectMapper = set.iterator().next();
- log.info("Found single ObjectMapper in Registry to use: {}", objectMapper);
+ LOG.info("Found single ObjectMapper in Registry to use: {}", objectMapper);
objectMapperFoundRegistry = true;
} else if (set.size() > 1) {
- log.debug("Found {} ObjectMapper in Registry cannot use as default as there are more than one instance.", set.size());
+ LOG.debug("Found {} ObjectMapper in Registry cannot use as default as there are more than one instance.", set.size());
}
} else {
- log.warn("The option autoDiscoverObjectMapper is set to false, Camel won't search in the registry");
+ LOG.warn("The option autoDiscoverObjectMapper is set to false, Camel won't search in the registry");
}
}
if (objectMapper == null) {
objectMapper = new ObjectMapper();
- log.debug("Creating new ObjectMapper to use: {}", objectMapper);
+ LOG.debug("Creating new ObjectMapper to use: {}", objectMapper);
}
}
@@ -517,7 +521,7 @@ public class JacksonDataFormat extends ServiceSupport implements DataFormat, Dat
if (enableJaxbAnnotationModule) {
// Enables JAXB processing
JaxbAnnotationModule module = new JaxbAnnotationModule();
- log.debug("Registering JaxbAnnotationModule: {}", module);
+ LOG.debug("Registering JaxbAnnotationModule: {}", module);
objectMapper.registerModule(module);
}
@@ -583,7 +587,7 @@ public class JacksonDataFormat extends ServiceSupport implements DataFormat, Dat
if (modules != null) {
for (Module module : modules) {
- log.debug("Registering module: {}", module);
+ LOG.debug("Registering module: {}", module);
objectMapper.registerModules(module);
}
}
@@ -593,7 +597,7 @@ public class JacksonDataFormat extends ServiceSupport implements DataFormat, Dat
String name = o.toString();
Class<Module> clazz = camelContext.getClassResolver().resolveMandatoryClass(name, Module.class);
Module module = camelContext.getInjector().newInstance(clazz);
- log.debug("Registering module: {} -> {}", name, module);
+ LOG.debug("Registering module: {} -> {}", name, module);
objectMapper.registerModule(module);
}
}
@@ -605,16 +609,16 @@ public class JacksonDataFormat extends ServiceSupport implements DataFormat, Dat
name = name.substring(1);
}
Module module = CamelContextHelper.mandatoryLookup(camelContext, name, Module.class);
- log.debug("Registering module: {} -> {}", name, module);
+ LOG.debug("Registering module: {} -> {}", name, module);
objectMapper.registerModule(module);
}
}
if (org.apache.camel.util.ObjectHelper.isNotEmpty(timezone)) {
- log.debug("Setting timezone to Object Mapper: {}", timezone);
+ LOG.debug("Setting timezone to Object Mapper: {}", timezone);
objectMapper.setTimeZone(timezone);
}
} else {
- log.warn("The objectMapper was already found in the registry, no customizations will be applied");
+ LOG.warn("The objectMapper was already found in the registry, no customizations will be applied");
}
}
diff --git a/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLDataFormat.java b/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLDataFormat.java
index c9964c0..8f8286e 100644
--- a/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLDataFormat.java
+++ b/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/JacksonXMLDataFormat.java
@@ -43,6 +43,8 @@ import org.apache.camel.spi.annotations.Dataformat;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.ObjectHelper;
import org.apache.camel.support.service.ServiceSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A <a href="http://camel.apache.org/data-format.html">data format</a>
@@ -52,6 +54,8 @@ import org.apache.camel.support.service.ServiceSupport;
@Dataformat("jacksonxml")
public class JacksonXMLDataFormat extends ServiceSupport implements DataFormat, DataFormatName, CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(JacksonXMLDataFormat.class);
+
private CamelContext camelContext;
private XmlMapper xmlMapper;
private Class<? extends Collection> collectionType;
@@ -472,7 +476,7 @@ public class JacksonXMLDataFormat extends ServiceSupport implements DataFormat,
if (enableJaxbAnnotationModule) {
// Enables JAXB processing
JaxbAnnotationModule module = new JaxbAnnotationModule();
- log.info("Registering module: {}", module);
+ LOG.info("Registering module: {}", module);
xmlMapper.registerModule(module);
}
@@ -538,7 +542,7 @@ public class JacksonXMLDataFormat extends ServiceSupport implements DataFormat,
if (modules != null) {
for (Module module : modules) {
- log.info("Registering module: {}", module);
+ LOG.info("Registering module: {}", module);
xmlMapper.registerModules(module);
}
}
@@ -548,7 +552,7 @@ public class JacksonXMLDataFormat extends ServiceSupport implements DataFormat,
String name = o.toString();
Class<Module> clazz = camelContext.getClassResolver().resolveMandatoryClass(name, Module.class);
Module module = camelContext.getInjector().newInstance(clazz);
- log.info("Registering module: {} -> {}", name, module);
+ LOG.info("Registering module: {} -> {}", name, module);
xmlMapper.registerModule(module);
}
}
@@ -560,12 +564,12 @@ public class JacksonXMLDataFormat extends ServiceSupport implements DataFormat,
name = name.substring(1);
}
Module module = CamelContextHelper.mandatoryLookup(camelContext, name, Module.class);
- log.info("Registering module: {} -> {}", name, module);
+ LOG.info("Registering module: {} -> {}", name, module);
xmlMapper.registerModule(module);
}
}
if (org.apache.camel.util.ObjectHelper.isNotEmpty(timezone)) {
- log.debug("Setting timezone to XML Mapper: {}", timezone);
+ LOG.debug("Setting timezone to XML Mapper: {}", timezone);
xmlMapper.setTimeZone(timezone);
}
}
diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
index 1a0a0ea..de1c442 100644
--- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
+++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
@@ -48,6 +48,8 @@ import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
import org.apache.camel.CamelContext;
@@ -72,6 +74,8 @@ import org.apache.camel.util.ObjectHelper;
@Dataformat("jaxb")
public class JaxbDataFormat extends ServiceSupport implements DataFormat, DataFormatName, CamelContextAware {
+ private static final Logger LOG = LoggerFactory.getLogger(JaxbDataFormat.class);
+
private static final BlockingQueue<SchemaFactory> SCHEMA_FACTORY_POOL = new LinkedBlockingQueue<>();
private SchemaFactory schemaFactory;
@@ -160,8 +164,8 @@ public class JaxbDataFormat extends ServiceSupport implements DataFormat, DataFo
}
if (customProperties != null) {
for (Entry<String, Object> property : customProperties.entrySet()) {
- if (log.isDebugEnabled()) {
- log.debug("Using JAXB Provider Property {}={}", property.getKey(), property.getValue());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Using JAXB Provider Property {}={}", property.getKey(), property.getValue());
}
marshaller.setProperty(property.getKey(), property.getValue());
}
@@ -247,7 +251,7 @@ public class JaxbDataFormat extends ServiceSupport implements DataFormat, DataFo
throw e;
}
- log.debug("Unable to create JAXBElement object for type " + element.getClass() + " due to " + e.getMessage(), e);
+ LOG.debug("Unable to create JAXBElement object for type " + element.getClass() + " due to " + e.getMessage(), e);
}
}
}
@@ -255,8 +259,8 @@ public class JaxbDataFormat extends ServiceSupport implements DataFormat, DataFo
// cannot marshal
if (!mustBeJAXBElement) {
// write the graph as is to the output stream
- if (log.isDebugEnabled()) {
- log.debug("Attempt to marshalling non JAXBElement with type {} as InputStream", ObjectHelper.classCanonicalName(graph));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Attempt to marshalling non JAXBElement with type {} as InputStream", ObjectHelper.classCanonicalName(graph));
}
InputStream is = exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class, exchange, graph);
IOHelper.copyAndCloseInput(is, stream);
@@ -524,7 +528,7 @@ public class JaxbDataFormat extends ServiceSupport implements DataFormat, DataFo
cachedSchema = createSchema(getSources());
}
- log.debug("JaxbDataFormat [prettyPrint={}, objectFactory={}]", prettyPrint, objectFactory);
+ LOG.debug("JaxbDataFormat [prettyPrint={}, objectFactory={}]", prettyPrint, objectFactory);
}
@Override
@@ -540,14 +544,14 @@ public class JaxbDataFormat extends ServiceSupport implements DataFormat, DataFo
// load the class which has been JAXB annotated
ClassLoader cl = camelContext.getApplicationContextClassLoader();
if (cl != null) {
- log.debug("Creating JAXBContext with contextPath: " + contextPath + " and ApplicationContextClassLoader: " + cl);
+ LOG.debug("Creating JAXBContext with contextPath: " + contextPath + " and ApplicationContextClassLoader: " + cl);
return JAXBContext.newInstance(contextPath, cl);
} else {
- log.debug("Creating JAXBContext with contextPath: {}", contextPath);
+ LOG.debug("Creating JAXBContext with contextPath: {}", contextPath);
return JAXBContext.newInstance(contextPath);
}
} else {
- log.debug("Creating JAXBContext");
+ LOG.debug("Creating JAXBContext");
return JAXBContext.newInstance();
}
}
diff --git a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheConsumer.java b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheConsumer.java
index 96ffbbb..3921358 100644
--- a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheConsumer.java
+++ b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheConsumer.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
* The JCache consumer.
*/
public class JCacheConsumer extends DefaultConsumer {
- private static final Logger LOGGER = LoggerFactory.getLogger(JCacheConsumer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JCacheConsumer.class);
private CacheEntryListenerConfiguration<Object, Object> entryListenerConfiguration;
@@ -96,7 +96,7 @@ public class JCacheConsumer extends DefaultConsumer {
try {
getProcessor().process(exchange);
} catch (Exception e) {
- LOGGER.error("Error processing event ", e);
+ LOG.error("Error processing event ", e);
}
}
}
diff --git a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepository.java b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepository.java
index 7fb8af9..2896ea2 100644
--- a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepository.java
+++ b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/processor/aggregate/JCacheAggregationRepository.java
@@ -33,9 +33,13 @@ import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.DefaultExchangeHolder;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JCacheAggregationRepository extends ServiceSupport implements OptimisticLockingAggregationRepository {
+ private static final Logger LOG = LoggerFactory.getLogger(JCacheAggregationRepository.class);
+
private JCacheConfiguration configuration;
... 11483 lines suppressed ...
[camel] 05/05: Upgrade groovy
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 78fab1d72b1361be220fd0954dd86c59c67046a6
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 23 06:07:19 2020 +0100
Upgrade groovy
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 935db06..7915c1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
<errorprone-version>2.5</errorprone-version>
<mycila-license-version>3.0</mycila-license-version>
<gmavenplus-plugin-version>1.6.2</gmavenplus-plugin-version>
- <groovy-version>2.5.8</groovy-version>
+ <groovy-version>2.5.9</groovy-version>
</properties>
<!-- Comment out the snapshot repositories as we don't need them now -->
[camel] 04/05: CAMEL-14421: optimize core - ServiceSupport should
not have instance logger. Use static logger instead.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a409da0a7fd909433a57319bdc4c306b5c71fef1
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 23 05:54:42 2020 +0100
CAMEL-14421: optimize core - ServiceSupport should not have instance logger. Use static logger instead.
---
.../modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
index 2c8eb66..eff3c37 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
@@ -107,6 +107,27 @@ See the xref:message-history.adoc[Message History] documentation for how to enab
=== API changes
+==== log changed to private static LOG
+
+The `ServiceSupport` class has changed its logging from instance to static, which means any inherited class that
+uses `log` would need to change the code to compile. This may happen in custom Camel components.
+
+Before you may have:
+
+[source,java]
+----
+ log.debug("Sending message to foobar service: {}", messageId);
+----
+
+You then need to migrate the logging to also be static:
+
+[source,java]
+----
+ private static final Logger LOG = LoggerFactory.getLogger(FooBarProducer.class);
+
+ LOG.debug("Sending message to foobar service: {}", messageId);
+----
+
==== Exchange
The `Exchange` API has been modified slightly as part of an optimization effort.